Revision 8339
Added by ben leinfelder about 11 years ago
src/upgrade-db-to-2.2.2-oracle.sql | ||
---|---|---|
1 |
/* |
|
2 |
* update the database version |
|
3 |
*/ |
|
4 |
UPDATE db_version SET status=0; |
|
5 |
|
|
6 |
INSERT INTO db_version (version, status, date_created) |
|
7 |
VALUES ('2.2.2', 1, CURRENT_DATE); |
src/upgrade-db-to-2.2.2-postgres.sql | ||
---|---|---|
1 |
/* |
|
2 |
* update the database version |
|
3 |
*/ |
|
4 |
UPDATE db_version SET status=0; |
|
5 |
|
|
6 |
INSERT INTO db_version (version, status, date_created) |
|
7 |
VALUES ('2.2.2', 1, CURRENT_DATE); |
src/edu/ucsb/nceas/metacat/admin/upgrade/Upgrade2_2_2.java | ||
---|---|---|
1 |
/** |
|
2 |
* '$RCSfile$' |
|
3 |
* Copyright: 2013 Regents of the University of California and the |
|
4 |
* National Center for Ecological Analysis and Synthesis |
|
5 |
* |
|
6 |
* '$Author: tao $' |
|
7 |
* '$Date: 2012-02-08 10:44:45 -0800 (Wed, 08 Feb 2012) $' |
|
8 |
* '$Revision: 6996 $' |
|
9 |
* |
|
10 |
* This program is free software; you can redistribute it and/or modify |
|
11 |
* it under the terms of the GNU General Public License as published by |
|
12 |
* the Free Software Foundation; either version 2 of the License, or |
|
13 |
* (at your option) any later version. |
|
14 |
* |
|
15 |
* This program is distributed in the hope that it will be useful, |
|
16 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
17 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
18 |
* GNU General Public License for more details. |
|
19 |
* |
|
20 |
* You should have received a copy of the GNU General Public License |
|
21 |
* along with this program; if not, write to the Free Software |
|
22 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
23 |
*/ |
|
24 |
|
|
25 |
package edu.ucsb.nceas.metacat.admin.upgrade; |
|
26 |
|
|
27 |
import java.io.IOException; |
|
28 |
import java.security.NoSuchAlgorithmException; |
|
29 |
|
|
30 |
import edu.ucsb.nceas.metacat.admin.AdminException; |
|
31 |
import edu.ucsb.nceas.metacat.admin.upgrade.solr.SolrSchemaModificationException; |
|
32 |
import edu.ucsb.nceas.metacat.admin.upgrade.solr.SolrSchemaUpgrader; |
|
33 |
import edu.ucsb.nceas.metacat.shared.ServiceException; |
|
34 |
import edu.ucsb.nceas.utilities.PropertyNotFoundException; |
|
35 |
|
|
36 |
|
|
37 |
|
|
38 |
/** |
|
39 |
* Upgrade the application to version 2.2.2. |
|
40 |
* @author tao |
|
41 |
* |
|
42 |
*/ |
|
43 |
public class Upgrade2_2_2 implements UpgradeUtilityInterface { |
|
44 |
|
|
45 |
public boolean upgrade() throws AdminException { |
|
46 |
boolean success = true; |
|
47 |
try { |
|
48 |
SolrSchemaUpgrader upgrader = new SolrSchemaUpgrader(); |
|
49 |
upgrader.upgrade(); |
|
50 |
} catch (PropertyNotFoundException e) { |
|
51 |
throw new AdminException(e.getMessage()); |
|
52 |
} catch (IOException e){ |
|
53 |
throw new AdminException(e.getMessage()); |
|
54 |
} catch(NoSuchAlgorithmException e) { |
|
55 |
throw new AdminException(e.getMessage()); |
|
56 |
} catch (ServiceException e) { |
|
57 |
throw new AdminException(e.getMessage()); |
|
58 |
} catch ( SolrSchemaModificationException e) { |
|
59 |
throw e; |
|
60 |
} |
|
61 |
return success; |
|
62 |
} |
|
63 |
|
|
64 |
} |
metacat-index/pom.xml | ||
---|---|---|
4 | 4 |
<groupId>edu.ucsb.nceas.metacat.index</groupId> |
5 | 5 |
<artifactId>metacat-index</artifactId> |
6 | 6 |
<packaging>war</packaging> |
7 |
<version>2.2.2-SNAPSHOT</version>
|
|
7 |
<version>2.3.0-SNAPSHOT</version>
|
|
8 | 8 |
<name>metacat-index</name> |
9 | 9 |
<url>http://maven.apache.org</url> |
10 | 10 |
|
... | ... | |
32 | 32 |
<dependency> |
33 | 33 |
<groupId>edu.ucsb.nceas.metacat.common</groupId> |
34 | 34 |
<artifactId>metacat-common</artifactId> |
35 |
<version>2.2.2-SNAPSHOT</version>
|
|
35 |
<version>2.3.0-SNAPSHOT</version>
|
|
36 | 36 |
<type>jar</type> |
37 | 37 |
</dependency> |
38 | 38 |
<dependency> |
metacat-common/pom.xml | ||
---|---|---|
4 | 4 |
<groupId>edu.ucsb.nceas.metacat.common</groupId> |
5 | 5 |
<artifactId>metacat-common</artifactId> |
6 | 6 |
<packaging>jar</packaging> |
7 |
<version>2.2.2-SNAPSHOT</version>
|
|
7 |
<version>2.3.0-SNAPSHOT</version>
|
|
8 | 8 |
<name>metacat-common</name> |
9 | 9 |
<url>http://maven.apache.org</url> |
10 | 10 |
<properties> |
lib/metacat.properties | ||
---|---|---|
22 | 22 |
############### Application Values ############ |
23 | 23 |
|
24 | 24 |
## one of the few places where we use ANT tokens |
25 |
application.metacatVersion=2.2.2
|
|
25 |
application.metacatVersion=2.3.0
|
|
26 | 26 |
application.metacatReleaseInfo=-1 |
27 | 27 |
|
28 | 28 |
application.deployDir= |
... | ... | |
84 | 84 |
database.upgradeVersion.2.1.1=upgrade-db-to-2.1.1 |
85 | 85 |
database.upgradeVersion.2.2.0=upgrade-db-to-2.2.0 |
86 | 86 |
database.upgradeVersion.2.2.1=upgrade-db-to-2.2.1 |
87 |
database.upgradeVersion.2.2.2=upgrade-db-to-2.2.2
|
|
87 |
database.upgradeVersion.2.3.0=upgrade-db-to-2.3.0
|
|
88 | 88 |
## for running java-based utilities |
89 | 89 |
database.upgradeUtility.1.5.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade1_5_0 |
90 | 90 |
database.upgradeUtility.2.0.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_0_0 |
91 |
database.upgradeUtility.2.2.2=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_2_2
|
|
91 |
database.upgradeUtility.2.3.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_3_0
|
|
92 | 92 |
database.initialConnections=5 |
93 | 93 |
database.incrementConnections=5 |
94 | 94 |
# be sure to increase SQL connection limits accordingly: |
src/loaddtdschema-postgres.sql | ||
---|---|---|
92 | 92 |
INSERT INTO xml_catalog (entry_type, public_id, system_id) |
93 | 93 |
VALUES ('Schema', 'http://ecoinformatics.org/registryentry-1.0.0', '/schema/RegistryService/RegistryEntryType.xsd'); |
94 | 94 |
INSERT INTO db_version (version, status, date_created) |
95 |
VALUES ('2.2.2',1,CURRENT_DATE); |
|
95 |
VALUES ('2.3.0',1,CURRENT_DATE); |
src/upgrade-db-to-2.3.0-postgres.sql | ||
---|---|---|
1 |
/* |
|
2 |
* update the database version |
|
3 |
*/ |
|
4 |
UPDATE db_version SET status=0; |
|
5 |
|
|
6 |
INSERT INTO db_version (version, status, date_created) |
|
7 |
VALUES ('2.3.0', 1, CURRENT_DATE); |
src/loaddtdschema-oracle.sql | ||
---|---|---|
92 | 92 |
INSERT INTO xml_catalog (entry_type, public_id, system_id) |
93 | 93 |
VALUES ('Schema', '/schema/RegistryService/RegistryEntryType.xsd', '/schema/RegistryService/RegistryEntryType.xsd'); |
94 | 94 |
INSERT INTO db_version (version, status, date_created) |
95 |
VALUES ('2.2.2',1,CURRENT_DATE); |
|
95 |
VALUES ('2.3.0',1,CURRENT_DATE); |
src/upgrade-db-to-2.3.0-oracle.sql | ||
---|---|---|
1 |
/* |
|
2 |
* update the database version |
|
3 |
*/ |
|
4 |
UPDATE db_version SET status=0; |
|
5 |
|
|
6 |
INSERT INTO db_version (version, status, date_created) |
|
7 |
VALUES ('2.3.0', 1, CURRENT_DATE); |
src/edu/ucsb/nceas/metacat/admin/upgrade/Upgrade2_3_0.java | ||
---|---|---|
1 |
/** |
|
2 |
* '$RCSfile$' |
|
3 |
* Copyright: 2013 Regents of the University of California and the |
|
4 |
* National Center for Ecological Analysis and Synthesis |
|
5 |
* |
|
6 |
* '$Author: tao $' |
|
7 |
* '$Date: 2012-02-08 10:44:45 -0800 (Wed, 08 Feb 2012) $' |
|
8 |
* '$Revision: 6996 $' |
|
9 |
* |
|
10 |
* This program is free software; you can redistribute it and/or modify |
|
11 |
* it under the terms of the GNU General Public License as published by |
|
12 |
* the Free Software Foundation; either version 2 of the License, or |
|
13 |
* (at your option) any later version. |
|
14 |
* |
|
15 |
* This program is distributed in the hope that it will be useful, |
|
16 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
17 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
18 |
* GNU General Public License for more details. |
|
19 |
* |
|
20 |
* You should have received a copy of the GNU General Public License |
|
21 |
* along with this program; if not, write to the Free Software |
|
22 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
23 |
*/ |
|
24 |
|
|
25 |
package edu.ucsb.nceas.metacat.admin.upgrade; |
|
26 |
|
|
27 |
import java.io.IOException; |
|
28 |
import java.security.NoSuchAlgorithmException; |
|
29 |
|
|
30 |
import edu.ucsb.nceas.metacat.admin.AdminException; |
|
31 |
import edu.ucsb.nceas.metacat.admin.upgrade.solr.SolrSchemaModificationException; |
|
32 |
import edu.ucsb.nceas.metacat.admin.upgrade.solr.SolrSchemaUpgrader; |
|
33 |
import edu.ucsb.nceas.metacat.shared.ServiceException; |
|
34 |
import edu.ucsb.nceas.utilities.PropertyNotFoundException; |
|
35 |
|
|
36 |
|
|
37 |
|
|
38 |
/** |
|
39 |
* Upgrade the application to version 2.3.0. |
|
40 |
* @author tao |
|
41 |
* |
|
42 |
*/ |
|
43 |
public class Upgrade2_3_0 implements UpgradeUtilityInterface { |
|
44 |
|
|
45 |
public boolean upgrade() throws AdminException { |
|
46 |
boolean success = true; |
|
47 |
try { |
|
48 |
SolrSchemaUpgrader upgrader = new SolrSchemaUpgrader(); |
|
49 |
upgrader.upgrade(); |
|
50 |
} catch (PropertyNotFoundException e) { |
|
51 |
throw new AdminException(e.getMessage()); |
|
52 |
} catch (IOException e){ |
|
53 |
throw new AdminException(e.getMessage()); |
|
54 |
} catch(NoSuchAlgorithmException e) { |
|
55 |
throw new AdminException(e.getMessage()); |
|
56 |
} catch (ServiceException e) { |
|
57 |
throw new AdminException(e.getMessage()); |
|
58 |
} catch ( SolrSchemaModificationException e) { |
|
59 |
throw e; |
|
60 |
} |
|
61 |
return success; |
|
62 |
} |
|
63 |
|
|
64 |
} |
docs/user/metacat/source/submitting.rst | ||
---|---|---|
351 | 351 |
+--------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |
352 | 352 |
| squery | Perform a structured query. For an example, please see Searching Metacat. | |
353 | 353 |
| | | |
354 |
| | ``query`` - the text of the pathquery document sent to the server |
|
|
354 |
| | ``query`` - the text of the pathquery document sent to the server |
|
|
355 | 355 |
| | ``qformat`` - the format to return the results in. Possible values are: ``xml``, or the name of the a skin. | |
356 | 356 |
+--------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |
357 | 357 |
| update | Overwrite an XML document with a new one and give the new one the same docid but with | |
docs/user/metacat/source/conf.py | ||
---|---|---|
45 | 45 |
# built documents. |
46 | 46 |
# |
47 | 47 |
# The short X.Y version. |
48 |
version = '2.2'
|
|
48 |
version = '2.3'
|
|
49 | 49 |
# The full version, including alpha/beta/rc tags. |
50 |
release = '2.2.2'
|
|
50 |
release = '2.3.0'
|
|
51 | 51 |
|
52 | 52 |
# The language for content autogenerated by Sphinx. Refer to documentation |
53 | 53 |
# for a list of supported languages. |
docs/user/metacat/source/install.rst | ||
---|---|---|
83 | 83 |
Downloading the Metacat Installer is the simplest way to get started with the |
84 | 84 |
application. To download the installer: |
85 | 85 |
|
86 |
1. Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the "GZIP file" (the link should look like: metacat-bin-X.X.X.tar.gz, where X.X.X is the latest version of Metacat e.g., 2.2.2)
|
|
86 |
1. Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the "GZIP file" (the link should look like: metacat-bin-X.X.X.tar.gz, where X.X.X is the latest version of Metacat e.g., 2.3.0)
|
|
87 | 87 |
2. Save the file locally. |
88 | 88 |
3. Extract the Metacat package files by typing: |
89 | 89 |
|
... | ... | |
115 | 115 |
............................ |
116 | 116 |
To get the Metacat source distribution: |
117 | 117 |
|
118 |
1. Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the Metacat Source code (it will look something like this: metacat-src-X.X.X.tar.gz, where X.X.X is the latest version of Metacat, e.g., 2.2.2).
|
|
118 |
1. Browse to the `Metacat Download Page`_. In the Metacat section, select the link to the Metacat Source code (it will look something like this: metacat-src-X.X.X.tar.gz, where X.X.X is the latest version of Metacat, e.g., 2.3.0).
|
|
119 | 119 |
2. Save the file locally. |
120 | 120 |
3. Extract the Metacat package files by typing (replace X.X.X with the current version number): |
121 | 121 |
|
docs/user/metacat/source/index.rst | ||
---|---|---|
2 | 2 |
Metacat Administrator's Guide |
3 | 3 |
============================= |
4 | 4 |
|
5 |
.. sidebar:: Version: 2.2.2
|
|
5 |
.. sidebar:: Version: 2.3.0
|
|
6 | 6 |
|
7 | 7 |
.. image:: themes/metacatui/static/metacat-logo-darkgray.png |
8 | 8 |
:height: 130pt |
... | ... | |
26 | 26 |
- Download Metacat |
27 | 27 |
|
28 | 28 |
- Binary Distribution (A war file installation) |
29 |
- GZIP File: metacat-bin-2.2.2.tar.gz_
|
|
30 |
- ZIP File: metacat-bin-2.2.2.zip_
|
|
29 |
- GZIP File: metacat-bin-2.3.0.tar.gz_
|
|
30 |
- ZIP File: metacat-bin-2.3.0.zip_
|
|
31 | 31 |
- Source Distribution (Full source, requiring build) |
32 |
- GZIP File: metacat-src-2.2.2.tar.gz_
|
|
33 |
- ZIP File: metacat-src-2.2.2.zip_
|
|
32 |
- GZIP File: metacat-src-2.3.0.tar.gz_
|
|
33 |
- ZIP File: metacat-src-2.3.0.zip_
|
|
34 | 34 |
- `Older versions`_ |
35 | 35 |
|
36 | 36 |
- For Developers: Metacat `API documentation`_ |
... | ... | |
39 | 39 |
|
40 | 40 |
.. _API documentation: ./api/index.html |
41 | 41 |
|
42 |
.. _metacat-bin-2.2.2.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.2.2.tar.gz
|
|
42 |
.. _metacat-bin-2.3.0.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.3.0.tar.gz
|
|
43 | 43 |
|
44 |
.. _metacat-bin-2.2.2.zip: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.2.2.zip
|
|
44 |
.. _metacat-bin-2.3.0.zip: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.3.0.zip
|
|
45 | 45 |
|
46 |
.. _metacat-src-2.2.2.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-src-2.2.2.tar.gz
|
|
46 |
.. _metacat-src-2.3.0.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-src-2.3.0.tar.gz
|
|
47 | 47 |
|
48 |
.. _metacat-src-2.2.2.zip: http://knb.ecoinformatics.org/software/dist/metacat-src-2.2.2.zip
|
|
48 |
.. _metacat-src-2.3.0.zip: http://knb.ecoinformatics.org/software/dist/metacat-src-2.3.0.zip
|
|
49 | 49 |
|
50 | 50 |
.. _Older versions: http://knb.ecoinformatics.org/software/dist/ |
51 | 51 |
|
docs/user/metacat/source/configuration.rst | ||
---|---|---|
240 | 240 |
To use the new MetacatUI theming system, select ``metacatui`` and click the |
241 | 241 |
``Make metacatui default`` radio button. Metacat will open a list of options |
242 | 242 |
that apply to the Registry interface. For more information about creating |
243 |
custom themes, see the section called :doc:`themes </Modifying and Creating Themes>`.
|
|
243 |
custom themes, see the section called :doc:`themes`. |
|
244 | 244 |
|
245 | 245 |
.. figure:: images/screenshots/image070.png |
246 | 246 |
:align: center |
... | ... | |
259 | 259 |
|
260 | 260 |
Once you have selected a skin, Metacat will open a list of options that apply to the Registry |
261 | 261 |
interface. For more information about creating skins, see the Creating a Custom Skin |
262 |
section in :doc:`themes </Modifying and Creating Themes>`.
|
|
262 |
section in :doc:`themes`. |
|
263 | 263 |
|
264 | 264 |
.. figure:: images/screenshots/image023.png |
265 | 265 |
:align: center |
build.properties | ||
---|---|---|
2 | 2 |
|
3 | 3 |
#Version of this build. This needs to be a dotted numeric version. For |
4 | 4 |
#instance 1.9.1 is okay. 1.9.1_rc1 is not. |
5 |
metacat.version=2.2.2
|
|
5 |
metacat.version=2.3.0
|
|
6 | 6 |
|
7 | 7 |
#This is for packaging purposes. leave it blank for final production release. |
8 | 8 |
metacat.releaseCandidate= |
pom.xml | ||
---|---|---|
4 | 4 |
<modelVersion>4.0.0</modelVersion> |
5 | 5 |
<groupId>org.ecoinformatics</groupId> |
6 | 6 |
<artifactId>metacat</artifactId> |
7 |
<version>2.2.2-SNAPSHOT</version>
|
|
7 |
<version>2.3.0-SNAPSHOT</version>
|
|
8 | 8 |
<name>metacat</name> |
9 | 9 |
<packaging>war</packaging> |
10 | 10 |
<url>http://maven.apache.org</url> |
... | ... | |
13 | 13 |
<d1_libclient_version>1.2.4</d1_libclient_version> |
14 | 14 |
<d1_common_java_version>1.1.3</d1_common_java_version> |
15 | 15 |
<d1_portal_version>1.2.0</d1_portal_version> |
16 |
<metacat_common_version>2.2.2-SNAPSHOT</metacat_common_version>
|
|
16 |
<metacat_common_version>2.3.0-SNAPSHOT</metacat_common_version>
|
|
17 | 17 |
</properties> |
18 | 18 |
<repositories> |
19 | 19 |
<repository> |
README | ||
---|---|---|
8 | 8 |
Metacat: XML Metadata and Data Management System |
9 | 9 |
------------------------------------------------ |
10 | 10 |
|
11 |
Version: 2.2.2 Release
|
|
11 |
Version: 2.3.0 Release
|
|
12 | 12 |
|
13 | 13 |
Send feedback and bugs to: metacat-dev@ecoinformatics.org |
14 | 14 |
http://bugzilla.ecoinformatics.org |
... | ... | |
54 | 54 |
See the file "docs/install.html" for detailed instructions |
55 | 55 |
for your OS. |
56 | 56 |
|
57 |
Release Notes for 2.2.2:
|
|
57 |
Release Notes for 2.3.0:
|
|
58 | 58 |
------------------------ |
59 | 59 |
This release adds additional solr indexing features to metacat-index. |
60 | 60 |
|
Also available in: Unified diff
use 2.3.0 for this next release of metacat.