Project

General

Profile

Revision 8223

prep for 2.2.0 release. include configuration value for metacatui deployment context.

View differences:

lib/metacat.properties.metadata.xml
317 317
		<helpFile>docs/metacat-properties.html#application-solr-home</helpFile>
318 318
	</config>
319 319
	
320
	<config>
321
		<key>ui.context</key>
322
		<label>UI Context</label>
323
		<group>3</group>
324
		<index>12</index>
325
		<description>
326
			The context name for the deployed Metacat UI webapp.
327
		</description>
328
		<helpFile>docs/metacat-properties.html#ui-context</helpFile>
329
	</config>
330
	
320 331
	<!-- START Data Manager configuration -->
321 332
	<config>
322 333
		<key>datamanager.server</key>
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.1.1
25
application.metacatVersion=2.2.0
26 26
application.metacatReleaseInfo=-1
27 27

  
28 28
application.deployDir=
......
82 82
database.upgradeVersion.2.0.8=upgrade-db-to-2.0.8
83 83
database.upgradeVersion.2.1.0=upgrade-db-to-2.1.0
84 84
database.upgradeVersion.2.1.1=upgrade-db-to-2.1.1
85
database.upgradeVersion.2.2.0=upgrade-db-to-2.2.0
85 86
## for running java-based utilities
86 87
database.upgradeUtility.1.5.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade1_5_0
87 88
database.upgradeUtility.2.0.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_0_0
......
381 382
######## Skins  #########################################
382 383

  
383 384
skin.names=default,metacatui,nceas,esa,knb,kepler,lter,ltss,obfs,nrs,sanparks,saeon,first,parc,dataone
385

  
386
############# UI Section ###########################################
387
ui.context=metacatui
388

  
384 389
######## Document Section  #########################################
385 390

  
386 391
#The flag to indicate if invalidated eml 201 documents were corrected.
......
636 641
#solr.systeminfo.urlappendix=/admin/system
637 642
#Solr-home for the http solr server is used to store some files. It can be not really solr home.
638 643
#solr.homeDir=/var/metacat/solr-home
644

  
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.1.1',1,CURRENT_DATE);
95
  VALUES ('2.2.0',1,CURRENT_DATE);
src/upgrade-db-to-2.2.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.2.0', 1, CURRENT_DATE);
0 8

  
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.1.1',1,CURRENT_DATE);
95
  VALUES ('2.2.0',1,CURRENT_DATE);
src/upgrade-db-to-2.2.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.2.0', 1, CURRENT_DATE);
0 8

  
docs/user/metacat/source/conf.py
45 45
# built documents.
46 46
#
47 47
# The short X.Y version.
48
version = '2.0'
48
version = '2.2'
49 49
# The full version, including alpha/beta/rc tags.
50
release = '2.1.1'
50
release = '2.2.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.1.1) 
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.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.1.1).
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.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.1.1
5
.. sidebar:: Version: 2.2.0
6 6

  
7 7
    .. image:: themes/metacatui/static/metacat-logo-darkgray.png
8 8
       :height: 130pt
......
13 13

  
14 14
    License: GPL
15 15
    
16
    Release Date: July, 2013
16
    Release Date: September, 2013
17 17

  
18 18
Metacat is a repository for data and metadata (documentation about data) that helps 
19 19
scientists find, understand and effectively use data sets they manage or that 
......
26 26
- Download Metacat
27 27

  
28 28
    - Binary Distribution (A war file installation)
29
        - GZIP File: metacat-bin-2.1.1.tar.gz_
30
        - ZIP File: metacat-bin-2.1.1.zip_
29
        - GZIP File: metacat-bin-2.2.0.tar.gz_
30
        - ZIP File: metacat-bin-2.2.0.zip_
31 31
    - Source Distribution (Full source, requiring build)
32
        - GZIP File: metacat-src-2.1.1.tar.gz_
33
        - ZIP File: metacat-src-2.1.1.zip_
32
        - GZIP File: metacat-src-2.2.0.tar.gz_
33
        - ZIP File: metacat-src-2.2.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.1.1.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.1.1.tar.gz
42
.. _metacat-bin-2.2.0.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.2.0.tar.gz
43 43

  
44
.. _metacat-bin-2.1.1.zip: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.1.1.zip
44
.. _metacat-bin-2.2.0.zip: http://knb.ecoinformatics.org/software/dist/metacat-bin-2.2.0.zip
45 45

  
46
.. _metacat-src-2.1.1.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-src-2.1.1.tar.gz
46
.. _metacat-src-2.2.0.tar.gz: http://knb.ecoinformatics.org/software/dist/metacat-src-2.2.0.tar.gz
47 47

  
48
.. _metacat-src-2.1.1.zip: http://knb.ecoinformatics.org/software/dist/metacat-src-2.1.1.zip
48
.. _metacat-src-2.2.0.zip: http://knb.ecoinformatics.org/software/dist/metacat-src-2.2.0.zip
49 49

  
50 50
.. _Older versions: http://knb.ecoinformatics.org/software/dist/
51 51

  
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.1.1
5
metacat.version=2.2.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.1.1</version>
7
    <version>2.2.0</version>
8 8
    <name>metacat</name>
9 9
    <packaging>war</packaging>
10 10
    <url>http://maven.apache.org</url>
README
8 8
Metacat: XML Metadata and Data Management System
9 9
------------------------------------------------                      
10 10

  
11
Version: 2.1.1 Release
11
Version: 2.2.0 Release
12 12

  
13 13
Send feedback and bugs to: metacat-dev@ecoinformatics.org
14 14
                           http://bugzilla.ecoinformatics.org
......
30 30
              Chris Barteau (barteau@nceas.ucsb.edu)
31 31
              Shaun Walbridge (walbridge@nceas.ucsb.edu)
32 32
              Michael Daigle (daigle@nceas.ucsb.edu) 
33
              Lauren Walker (walker@nceas.ucsb.edu) 
33 34

  
34 35
Patch contributors:
35 36
              Andrea Chadden (chadden@nceas.ucsb.edu)
......
53 54
See the file "docs/install.html" for detailed instructions
54 55
for your OS.
55 56

  
57
Release Notes for 2.2.0:
58
------------------------
59
This is a major release of Metacat that includes a new customizable UI and 
60
improved LDAP account management features
61

  
56 62
Release Notes for 2.1.1:
57 63
------------------------
58 64
This is a minor patch release of Metacat that addresses

Also available in: Unified diff