Skip to content

Commit

Permalink
Merge pull request #1355 from NCEAS/dev-2.10
Browse files Browse the repository at this point in the history
Dev 2.10
  • Loading branch information
taojing2002 authored Jun 3, 2019
2 parents c2cda44 + e8a4ccd commit cd7e6a8
Show file tree
Hide file tree
Showing 38 changed files with 2,479 additions and 423 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Metacat: Data Preservation and Discovery System

Version: 2.10.2 Release
Version: 2.10.3 Release

Send feedback and bugs to: [email protected]
http://github.com/NCEAS/metacat
Expand Down Expand Up @@ -67,6 +67,15 @@ for the next release.

## Release Notes

### Release Notes for 2.10.3:
New features and bugs fixed in this release:
* Update DOI registrations for EML objects with complete metadata
* Can't update DOI metadata on the Metacat admin page if the doi is an SID
* Make Solr field "replicationAllowed" to be searchable
* Add an Metacat admin method to clear cached the style sheets
* Add a DataONE method to display the size of the index queue
* Not check if the new index pathes were added during the Metacat startup

### Release Notes for 2.10.2:
New features and bugs fixed in this release:
* Allow POSTs to the query service
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#Version of this build. This needs to be a dotted numeric version. For
#instance 1.9.1 is okay. 1.9.1_rc1 is not.
metacat.version=2.10.2
metacat.version=2.10.3

#This is for packaging purposes. leave it blank for final production release.
metacat.releaseCandidate=
Expand Down
6 changes: 5 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<project name="metacat" default="jar" basedir="."
xmlns:artifact="antlib:org.apache.maven.artifact.ant">

<property name="metacatui-tag" value="2.5.1" />
<property name="metacatui-tag" value="2.6.2" />
<property name="eml2-style-tag" value="RELEASE_EML_UTILS_1_1_2" />
<property name="seek-tag" value="tags/ECOGRID_1_2_3" />

Expand Down Expand Up @@ -1229,6 +1229,10 @@
</fileset>
</batchtest>
</junit>
<tstamp>
<format property="NOW" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
<echo>Tests completed at ${NOW}</echo>
</target>

<target name="runonetest" depends="testprep"
Expand Down
2 changes: 2 additions & 0 deletions lib/admin/metacat-configuration.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,8 @@
%>
<div class="alert alert-success"><i class="icon-thumbs-up"></i>Configuration of Metacat is complete. Please restart Tomcat so that the webapps are initialized with these settings.
Note that this may take some time while the system initializes with the new configuration values.</div>
<div class="alert alert-success">All objects on this server need to be re-indexed because this Metacat release modified the schema file of the Solr server.
The details of re-indexing can be found in the documentation.</div>
<%
}
}
Expand Down
13 changes: 10 additions & 3 deletions lib/metacat.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ server.internalPort=80
############### Application Values ############

## one of the few places where we use ANT tokens
application.metacatVersion=2.10.2
application.metacatVersion=2.10.3
application.metacatReleaseInfo=-1
application.readOnlyMode=false

Expand Down Expand Up @@ -112,6 +112,7 @@ database.upgradeVersion.2.9.0=upgrade-db-to-2.9.0
database.upgradeVersion.2.10.0=upgrade-db-to-2.10.0
database.upgradeVersion.2.10.1=upgrade-db-to-2.10.1
database.upgradeVersion.2.10.2=upgrade-db-to-2.10.2
database.upgradeVersion.2.10.3=upgrade-db-to-2.10.3
## for running java-based utilities
database.upgradeUtility.1.5.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade1_5_0
database.upgradeUtility.2.0.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_0_0
Expand All @@ -123,6 +124,7 @@ database.upgradeUtility.2.7.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_7_0
database.upgradeUtility.2.8.1=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_8_1
database.upgradeUtility.2.10.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_10_0
database.upgradeUtility.2.10.1=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_10_1
database.upgradeUtility.2.10.3=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade2_10_3
database.initialConnections=5
database.incrementConnections=5
# be sure to increase SQL connection limits accordingly:
Expand Down Expand Up @@ -175,6 +177,8 @@ dbquery.extendedQueryRunTimeWarnLimit=60000
dbquery.storeReturnFieldTimeWarnLimit=60000
#the time in milliseconds to totally process return fields before metacat logs a warning
dbquery.totalReturnFieldTimeWarnLimit=120000
#when the servlet initializes, if we need to check to see if new paths were added
dbquery.init.check.newpath=false

######## Datamanager section #######################################
datamanager.adapter=PostgresAdapter
Expand Down Expand Up @@ -236,6 +240,7 @@ ldap.nextuid.storing.attributename=description
ldap.nextuid.maxattempt=300
ldap.recaptcha.publickey=yourPublicKey
ldap.recaptcha.privatekey=yourPrivateKey
ldap.web.startTLS=false

# LDAP templates
ldap.templates.stage=initregister
Expand Down Expand Up @@ -712,12 +717,14 @@ guid.ezid.doishoulder.1=doi:10.5072/FK2
#guid.ezid.doishoulder.1=doi:10.5072/FK2/KNB/
#guid.ezid.doishoulder.3=doi:10.5072/FK2/PISCO/
#guid.ezid.doishoulder.6=doi:10.5072/FK2/LTER/
#The factory classes can generate the datacite document. It should be sperator by ';' if it has multiple values.
guid.ezid.datacite.factories=edu.ucsb.nceas.metacat.doi.datacite.EML2DataCiteFactory

############# Index Section ###########################################
#The md5 hash numbers for the schema.xml in previous releases. It should be sperator by ';' if it has multiple values.
index.schema.previous.hash=714457a3cdd05e034e5df46589b3bfa9;ba7dc67bbf749b02e03d7b7cc6a31def;ebf5b20f9cd18d31c3a6057749ba9397;fb1f63a36f2c742f1ba144d559c37075;2acacecbb55721806b7e92d7a115c35a;3418ed9d10bbc70f1e8020233d954f83;a54e667426384f89106405263df77373;8fc703ec01ef6d4cb413d9c2fbced532;25f1b66f3a25e1c80adf86e48f1838bb;1a0f05c01c5714737a1efc992b262e7e
index.schema.previous.hash=714457a3cdd05e034e5df46589b3bfa9;ba7dc67bbf749b02e03d7b7cc6a31def;ebf5b20f9cd18d31c3a6057749ba9397;fb1f63a36f2c742f1ba144d559c37075;2acacecbb55721806b7e92d7a115c35a;3418ed9d10bbc70f1e8020233d954f83;a54e667426384f89106405263df77373;8fc703ec01ef6d4cb413d9c2fbced532;25f1b66f3a25e1c80adf86e48f1838bb;1a0f05c01c5714737a1efc992b262e7e;8b18d7ed4a5364159adeb507f004e5de
#The md5 hash number for the schema.xml in this release
index.schema.current.hash=1a0f05c01c5714737a1efc992b262e7e
index.schema.current.hash=8b18d7ed4a5364159adeb507f004e5de
index.configFile.released.hash=076e8c421c95f6c1aceb1c0e3dd3042b;09adcfa08f96179dfddf9e43899b9181
index.configFile.current.hash=09adcfa08f96179dfddf9e43899b9181
index.context=metacat-index
Expand Down
29 changes: 19 additions & 10 deletions lib/style/skins/metacatui/iso19115/iso-md.xsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:gmd="http://www.isotc211.org/2005/gmd"
xmlns:gml="http://www.opengis.net/gml"
xmlns:gco="http://www.isotc211.org/2005/gco"
Expand Down Expand Up @@ -188,10 +188,10 @@
<xsl:value-of select="./*/gml:identifier/text()" />
<xsl:value-of select="./*/gml:name/text()" />
</xsl:template>
<!-- gmd:MD_Distribution
<!-- gmd:MD_Distribution
- gmd:distributionFormat, 0-inf ( just grab gmd:MD_Format/gmd:name for each)
- gmd:distributor/gmd:MD_Distributor... hold off on this for now?
- gmd:transferOptions 0-inf /
- gmd:transferOptions 0-inf /
gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL/text()
and
gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:function/gmd:URL/gmd:CI_OnLineFunctionCode/text()
Expand All @@ -205,17 +205,17 @@
</tr>
</thead>
<tbody>
<xsl:for-each select="./gmd:distributionFormat/gmd:MD_Format/gmd:name">
<xsl:for-each select="./gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine">
<tr>
<!-- Here I pop back up to the gmd:MD_Distribution to grab the
linkage. I'm doing this because the format and linkage aren't
<!-- Here I pop back up to the gmd:MD_Distribution to grab the
linkage. I'm doing this because the format and linkage aren't
connected in ISO but I'm choosing to assume the first name pairs
with the first linkage.
Also note the use of position() to grab the nth URL for the
nth format. -->
<td>
<xsl:variable name="url" select="../../../gmd:transferOptions[position()]/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL/text()" />
<xsl:variable name="url" select="./gmd:CI_OnlineResource/gmd:linkage/gmd:URL/text()" />
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:value-of select="$url" />
Expand All @@ -224,7 +224,16 @@
<xsl:value-of select="$url" />
</xsl:element>
</td>
<td><xsl:value-of select="./gco:CharacterString/text()" /></td>
<xsl:choose>
<!-- Show the distribution format if it exists -->
<xsl:when test="../../../gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString">
<td><xsl:value-of select="../../../gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString/text()" /></td>
</xsl:when>
<xsl:otherwise>
<!-- Otherwise show the distribution name -->
<td><xsl:value-of select="./gmd:CI_OnlineResource/gmd:name/gco:CharacterString/text()" /></td>
</xsl:otherwise>
</xsl:choose>
</tr>
</xsl:for-each>
</tbody>
Expand Down
24 changes: 12 additions & 12 deletions lib/style/skins/metacatui/iso19115/isoroot.xsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:gmd="http://www.isotc211.org/2005/gmd"
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:gmd="http://www.isotc211.org/2005/gmd"
xmlns:gco="http://www.isotc211.org/2005/gco" version="1.0">
<xsl:import href="iso-md.xsl"/>
<xsl:import href="iso-ci.xsl"/>
Expand All @@ -15,17 +15,17 @@
<form class="form-horizontal">
<div class="control-group entity">
<!-- distributionInfo is kind tricky: You have to go pretty deep
to find out if there's actually any useful information.
Here I'm making a choice to look for at least one format
to find out if there's actually any useful information.
Here I'm making a choice to look for at least one format
with a name to check whether we should show this section at
all.
Also, the distribution format isn't tied explicitly to
all.
Also, the distribution format isn't tied explicitly to
the transfer options so I've made a decision to assume that
the first format is for the first transfer option and so on
-->
<!-- PANGAEA's way of doing gmd:distributionInfo -->
<xsl:if test="./gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:name">
<!-- PANGAEA's and IEDA's way of doing gmd:distributionInfo -->
<xsl:if test="./gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions">
<h4>Distribution</h4>
<xsl:apply-templates select="./gmd:distributionInfo/gmd:MD_Distribution" />
</xsl:if>
Expand Down Expand Up @@ -72,7 +72,7 @@
<xsl:variable name="code">
<xsl:value-of select=".//gmd:code/gco:CharacterString/text()" />
</xsl:variable>

<xsl:choose>
<xsl:when test="starts-with($code, 'http')">
<xsl:element name="a">
Expand All @@ -89,7 +89,7 @@
</div>
</xsl:if>
</xsl:for-each>

<!-- Abstract 0:∞ Only shown if the abstract has content -->
<xsl:for-each select="./gmd:identificationInfo/*/gmd:abstract">
<xsl:if test="normalize-space(./gco:CharacterString/text()) != ''">
Expand Down
2 changes: 1 addition & 1 deletion metacat-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>edu.ucsb.nceas.metacat.common</groupId>
<artifactId>metacat-common</artifactId>
<packaging>jar</packaging>
<version>2.10.2</version>
<version>2.10.3</version>
<name>metacat-common</name>
<url>http://maven.apache.org</url>
<properties>
Expand Down
14 changes: 7 additions & 7 deletions metacat-common/src/main/resources/solr-home/conf/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -217,18 +217,18 @@ but may be good for SKUs. Can insert dashes in the wrong place and still match.
<field name="formatId" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="formatType" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="size" type="slong" indexed="true" stored="true" multiValued="false"/>
<field name="checksum" type="string" indexed="false" stored="true" multiValued="false"/>
<field name="checksum" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="archived" type="boolean" indexed="true" stored="true" multiValued="false"/>
<field name="checksumAlgorithm" type="string" indexed="false" stored="true"/>
<field name="checksumAlgorithm" type="string" indexed="true" stored="true"/>
<field name="dateUploaded" type="date" indexed="true" stored="true" multiValued="false"/>
<field name="dateModified" type="date" indexed="true" stored="true" multiValued="false"/>
<field name="submitter" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="rightsHolder" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="authoritativeMN" type="string" indexed="false" stored="true" multiValued="false"/>
<field name="replicationAllowed" type="boolean" indexed="false" stored="true" multiValued="false"/>
<field name="numberReplicas" type="integer" indexed="false" stored="true" multiValued="false"/>
<field name="preferredReplicationMN" type="string" indexed="false" stored="true" multiValued="true"/>
<field name="blockedReplicationMN" type="string" indexed="false" stored="true" multiValued="true"/>
<field name="authoritativeMN" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="replicationAllowed" type="boolean" indexed="true" stored="true" multiValued="false"/>
<field name="numberReplicas" type="integer" indexed="true" stored="true" multiValued="false"/>
<field name="preferredReplicationMN" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="blockedReplicationMN" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="replicaMN" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="replicationStatus" type="string" indexed="true" stored="true" multiValued="true"/>
<field name="replicaVerifiedDate" type="date" indexed="true" stored="true" multiValued="true"/>
Expand Down
4 changes: 2 additions & 2 deletions metacat-index/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<groupId>edu.ucsb.nceas.metacat.index</groupId>
<artifactId>metacat-index</artifactId>
<packaging>war</packaging>
<version>2.10.2</version>
<version>2.10.3</version>
<name>metacat-index</name>
<url>http://maven.apache.org</url>

<properties>
<d1_cn_index_processor_version>2.3.8</d1_cn_index_processor_version>
<metacat_common_version>2.10.2</metacat_common_version>
<metacat_common_version>2.10.3</metacat_common_version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@
<bean id="isotc.pubDate" class="org.dataone.cn.indexer.parser.SolrField">
<constructor-arg name="name" value="pubDate" />
<constructor-arg name="xpath"
value="(//gmd:dateStamp/gco:Date/text() | //gmd:dateStamp/gco:DateTime/text())[1]" />
value="//gmd:identificationInfo/*/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date[following-sibling::gmd:dateType/gmd:CI_DateTypeCode/text() = 'publication']/gco:Date/text()
| //gmd:identificationInfo/*/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[1]/text()
| //gmd:identificationInfo/*/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date[following-sibling::gmd:dateType/gmd:CI_DateTypeCode/text() = 'publication']/gco:DateTime/text()
| //gmd:identificationInfo/*/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:DateTime[1]/text()" />
<property name="converter" ref="dateConverter" />
</bean>

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ecoinformatics</groupId>
<artifactId>metacat</artifactId>
<version>2.10.2</version>
<version>2.10.3</version>
<name>metacat</name>
<packaging>war</packaging>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<d1_libclient_version>2.3.1</d1_libclient_version>
<d1_portal_version>2.3.1</d1_portal_version>
<metacat_common_version>2.10.2</metacat_common_version>
<metacat_common_version>2.10.3</metacat_common_version>
</properties>
<repositories>
<repository>
Expand Down Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>org.ecoinformatics.eml</groupId>
<artifactId>datamanager</artifactId>
<version>0.9.0</version>
<version>0.9.2</version>
</dependency>
<dependency>
<groupId>gov.loc</groupId>
Expand Down
Loading

0 comments on commit cd7e6a8

Please sign in to comment.