Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[266] trunk/oai-pmh_data_provider/data_provider_web
|
From: <yo...@us...> - 2009-11-12 20:55:04
|
Revision: 266
http://treebase.svn.sourceforge.net/treebase/?rev=266&view=rev
Author: youjun
Date: 2009-11-12 20:54:50 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
code submission
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListMetadataFormats.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/idDoesNotExist.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/Identify.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListMetadataFormats.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/WEB-INF/identify.properties
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/applicationContext.xml
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/idDoesNotExist.vm
trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/command/Identify.class
trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/util/IdentifyUtil.class
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.util.IdentifyUtilTest.xml
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.IdentifyTest.txt
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.OAIPMHCommandTest.txt
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.controller.OAIPMHControllerTest.txt
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.util.IdentifyUtilTest.txt
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/Identify.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListMetadataFormats.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListSet.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/WEB-INF/identify.properties
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/applicationContext.xml
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/idDoesNotExist.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/OAIPMHControllerTest.class
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java 2009-11-12 20:54:50 UTC (rev 266)
@@ -14,14 +14,8 @@
public class Identify {
- public String getGranularityPattern() {
- return granularityPattern;
- }
- public void setGranularityPattern(String granularityPattern) {
- this.granularityPattern = granularityPattern;
- }
- private String baseRUL;
+ private String baseURL;
private String repositoryName;
private String protocolVersion;
private String adminEmail;
@@ -31,8 +25,38 @@
private String granularityPattern;
private String repositoryIdentifier;
private String sampleIdentifier;
+ private String dryadPerfix;
+ private String identifierDelimiter;
+ private String dublinPerfix;
+ public String getGranularityPattern() {
+ return granularityPattern;
+ }
+ public void setGranularityPattern(String granularityPattern) {
+ this.granularityPattern = granularityPattern;
+ }
+
+
+ public String getIdentifierDelimiter() {
+ return identifierDelimiter;
+ }
+ public void setIdentifierDelimiter(String identifierDelimiter) {
+ this.identifierDelimiter = identifierDelimiter;
+ }
+ public String getDublinPerfix() {
+ return dublinPerfix;
+ }
+ public void setDublinPerfix(String dublinPerfix) {
+ this.dublinPerfix = dublinPerfix;
+ }
+ public String getDryadPerfix() {
+ return dryadPerfix;
+ }
+ public void setDryadPerfix(String dryadPerfix) {
+ this.dryadPerfix = dryadPerfix;
+ }
+
public String getRepositoryIdentifier() {
return repositoryIdentifier;
}
@@ -46,11 +70,11 @@
this.sampleIdentifier = sampleIdentifier;
}
- public String getBaseRUL() {
- return baseRUL;
+ public String getBaseURL() {
+ return baseURL;
}
- public void setBaseRUL(String baseRUL) {
- this.baseRUL = baseRUL;
+ public void setBaseURL(String baseRUL) {
+ this.baseURL = baseRUL;
}
public String getRepositoryName() {
return repositoryName;
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java 2009-11-12 20:54:50 UTC (rev 266)
@@ -19,7 +19,7 @@
// check if the MetadataPrefix in the params is supported by the service
public static boolean badMetadataPrefix(OAIPMHCommand params){
- if (params.getMetadataPrefix().toLowerCase()=="dc")
+ if (params.getMetadataPrefix().toLowerCase()=="oai_dc")
return false;
if (params.getMetadataPrefix().toLowerCase()=="dryad")
return false;
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml 2009-11-12 20:54:50 UTC (rev 266)
@@ -20,7 +20,7 @@
</bean>
<bean id="top.identify" class="org.treebase.oai.web.command.Identify">
- <property name="baseRUL" value="${identify.baseRUL}" />
+ <property name="baseURL" value="${identify.baseURL}" />
<property name="repositoryName" value="${identify.repositoryName}" />
<property name="protocolVersion" value="${identify.protocolVersion}" />
<property name="adminEmail" value="${identify.adminEmail}" />
@@ -29,9 +29,12 @@
<property name="granularity" value="${identify.granularity}" />
<property name="granularityPattern" value="${identify.granularityPattern}" />
<property name="repositoryIdentifier" value="${identify.repositoryIdentifier}" />
- <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
+ <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
+ <property name="identifierDelimiter" value="${identify.identifierDelimiter}" />
+ <property name="dublinPerfix" value="${identify.dublinPerfix}" />
+ <property name="dryadPerfix" value="${identify.dryadPerfix}" />
</bean>
-
+
<!-- ========================================================== -->
<!-- LIST OF DWR beans/methods -->
<!-- ========================================================== -->
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,10 +1,13 @@
-identify.baseRUL=www.***/top.edu
-identify.repositoryName=org.treebase.oai
+identify.baseURL=www.***.***:port/top
+identify.repositoryName=treebase repository
identify.protocolVersion=2.0
identify.adminEmail=you...@ya...
identify.earliestDatestamp=1995-11-04T00:00:00Z
identify.deletedRecord=transient
identify.granularity=YYYY-MM-DDThh:mm:ssZ
identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z'
-identify.sampleIdentifier=***
-identify.repositoryIdentifier=***
\ No newline at end of file
+identify.sampleIdentifier=treebase.org/study/TB2:s6705
+identify.repositoryIdentifier=treebase.org
+identify.identifierDelimiter=:
+identify.dublinPerfix=oai_dc
+identify.dryadPerfix=dryad
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -7,7 +7,7 @@
<request verb="Identify">${model.identify.baseRUL}</request>
<Identify>
<repositoryName>${model.identify.repositoryName}</repositoryName>
- <baseURL>${model.identify.baseRUL}</baseURL>
+ <baseURL>${model.identify.baseURL}</baseURL>
<protocolVersion>${model.identify.protocolVersion}</protocolVersion>
<adminEmail>${model.identify.adminEmail}</adminEmail>
<earliestDatestamp>${model.identify.earliestDatestamp}</earliestDatestamp>
@@ -23,7 +23,7 @@
http://www.openarchives.org/OAI/2.0/oai-identifier.xsd">
<scheme>oai</scheme>
<repositoryIdentifier>${model.identify.repositoryIdentifier}</repositoryIdentifier>
- <delimiter>:</delimiter>
+ <delimiter>${model.identify.identifierDelimiter}</delimiter>
<sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
</oai-identifier>
</description>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListMetadataFormats.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListMetadataFormats.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListMetadataFormats.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
+ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
+
+ <responseDate>${model.identify.getResponseDate()}</responseDate>
+ <request verb="ListMetadataFormats"
+ identifier="${model.params.identifier}">${model.identify.baseURL}</request>
+ <ListMetadataFormats>
+ <metadataFormat>
+ <metadataPrefix>oai_dc</metadataPrefix>
+ <schema>http://www.openarchives.org/OAI/2.0/oai_dc.xsd
+ </schema>
+ <metadataNamespace>http://www.openarchives.org/OAI/2.0/oai_dc/
+ </metadataNamespace>
+ </metadataFormat>
+
+ <metadataFormat>
+ <metadataPrefix>dryad</metadataPrefix>
+ <schema>http://ils.unc.edu/mrc/dryad/version1_0/dryad_1_0.xsd</schema>
+ <metadataNamespace>http://ils.unc.edu/mrc/dryad/
+ </metadataNamespace>
+ </metadataFormat>
+
+ </ListMetadataFormats>
+</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -3,9 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
- <responseDate>${identify.responseDate}</responseDate>
- <request verb="ListSets">
- ${identify.baseURL}</request>
+ <responseDate>${model.identify.responseDate}</responseDate>
+ <request verb="ListSets">${model.identify.baseURL}</request>
<error code="noSetHierarchy">This repository does not
support sets</error>
</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/idDoesNotExist.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/idDoesNotExist.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/idDoesNotExist.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -0,0 +1 @@
+id not exist
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-12 20:54:50 UTC (rev 266)
@@ -99,7 +99,38 @@
ModelAndView mav=controller.Identify(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
+ System.out.println("--------test Identify---------");
System.out.print(result);
}
+
+ public void testListSet() {
+
+ OAIPMHCommand params=new OAIPMHCommand();
+ params.setVerb("ListSet");
+ Map model=new HashMap();
+ model.put("identify",identify );
+ ModelAndView mav=controller.ListSet(params, model);
+ String result=vu.runTemplate(mav);
+ this.assertNotNull(result);
+ System.out.println("---------test ListSet---------");
+ System.out.print(result);
+
+ }
+
+ public void testListMetadataFormats() {
+
+ OAIPMHCommand params=new OAIPMHCommand();
+ params.setVerb("ListMetadataFormats");
+ params.setIdentifier("treebase.org/study/TB2:s169");
+ Map model=new HashMap();
+ model.put("identify",identify );
+ model.put("params", params);
+ ModelAndView mav=controller.ListMetadataFormats(params, model);
+ String result=vu.runTemplate(mav);
+ this.assertNotNull(result);
+ System.out.println("---------test ListMetadataFormats---------");
+ System.out.print(result);
+
+ }
}
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/Identify.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/Identify.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/Identify.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -7,7 +7,7 @@
<request verb="Identify">${model.identify.baseRUL}</request>
<Identify>
<repositoryName>${model.identify.repositoryName}</repositoryName>
- <baseURL>${model.identify.baseRUL}</baseURL>
+ <baseURL>${model.identify.baseURL}</baseURL>
<protocolVersion>${model.identify.protocolVersion}</protocolVersion>
<adminEmail>${model.identify.adminEmail}</adminEmail>
<earliestDatestamp>${model.identify.earliestDatestamp}</earliestDatestamp>
@@ -23,7 +23,7 @@
http://www.openarchives.org/OAI/2.0/oai-identifier.xsd">
<scheme>oai</scheme>
<repositoryIdentifier>${model.identify.repositoryIdentifier}</repositoryIdentifier>
- <delimiter>:</delimiter>
+ <delimiter>${model.identify.identifierDelimiter}</delimiter>
<sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
</oai-identifier>
</description>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListMetadataFormats.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListMetadataFormats.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListMetadataFormats.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
+ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
+
+ <responseDate>${model.identify.getResponseDate()}</responseDate>
+ <request verb="ListMetadataFormats"
+ identifier="${model.params.identifier}">${model.identify.baseURL}</request>
+ <ListMetadataFormats>
+ <metadataFormat>
+ <metadataPrefix>oai_dc</metadataPrefix>
+ <schema>http://www.openarchives.org/OAI/2.0/oai_dc.xsd
+ </schema>
+ <metadataNamespace>http://www.openarchives.org/OAI/2.0/oai_dc/
+ </metadataNamespace>
+ </metadataFormat>
+
+ <metadataFormat>
+ <metadataPrefix>dryad</metadataPrefix>
+ <schema>http://ils.unc.edu/mrc/dryad/version1_0/dryad_1_0.xsd</schema>
+ <metadataNamespace>http://ils.unc.edu/mrc/dryad/
+ </metadataNamespace>
+ </metadataFormat>
+
+ </ListMetadataFormats>
+</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -3,9 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
- <responseDate>${identify.responseDate}</responseDate>
- <request verb="ListSets">
- ${identify.baseURL}</request>
+ <responseDate>${model.identify.responseDate}</responseDate>
+ <request verb="ListSets">${model.identify.baseURL}</request>
<error code="noSetHierarchy">This repository does not
support sets</error>
</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/WEB-INF/identify.properties
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/WEB-INF/identify.properties 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/WEB-INF/identify.properties 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,10 +1,13 @@
-identify.baseRUL=www.***/top.edu
-identify.repositoryName=org.treebase.oai
+identify.baseURL=www.***.***:port/top
+identify.repositoryName=treebase repository
identify.protocolVersion=2.0
identify.adminEmail=you...@ya...
identify.earliestDatestamp=1995-11-04T00:00:00Z
identify.deletedRecord=transient
identify.granularity=YYYY-MM-DDThh:mm:ssZ
identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z'
-identify.sampleIdentifier=***
-identify.repositoryIdentifier=***
\ No newline at end of file
+identify.sampleIdentifier=treebase.org/study/TB2:s6705
+identify.repositoryIdentifier=treebase.org
+identify.identifierDelimiter=:
+identify.dublinPerfix=oai_dc
+identify.dryadPerfix=dryad
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/applicationContext.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/applicationContext.xml 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/applicationContext.xml 2009-11-12 20:54:50 UTC (rev 266)
@@ -20,7 +20,7 @@
</bean>
<bean id="top.identify" class="org.treebase.oai.web.command.Identify">
- <property name="baseRUL" value="${identify.baseRUL}" />
+ <property name="baseURL" value="${identify.baseURL}" />
<property name="repositoryName" value="${identify.repositoryName}" />
<property name="protocolVersion" value="${identify.protocolVersion}" />
<property name="adminEmail" value="${identify.adminEmail}" />
@@ -29,9 +29,12 @@
<property name="granularity" value="${identify.granularity}" />
<property name="granularityPattern" value="${identify.granularityPattern}" />
<property name="repositoryIdentifier" value="${identify.repositoryIdentifier}" />
- <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
+ <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
+ <property name="identifierDelimiter" value="${identify.identifierDelimiter}" />
+ <property name="dublinPerfix" value="${identify.dublinPerfix}" />
+ <property name="dryadPerfix" value="${identify.dryadPerfix}" />
</bean>
-
+
<!-- ========================================================== -->
<!-- LIST OF DWR beans/methods -->
<!-- ========================================================== -->
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/idDoesNotExist.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/idDoesNotExist.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/idDoesNotExist.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -0,0 +1 @@
+id not exist
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/command/Identify.class
===================================================================
(Binary files differ)
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/util/IdentifyUtil.class
===================================================================
(Binary files differ)
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.109" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
+<testsuite failures="0" time="0.062" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
<properties>
<property name="java.vendor" value="Sun Microsystems Inc."/>
<property name="localRepository" value="C:\Documents and Settings\youjun/.m2/repository"/>
@@ -18,7 +18,7 @@
<property name="user.name" value="youjun"/>
<property name="user.language" value="en"/>
<property name="sun.boot.library.path" value="C:\Java\sdk\jdk\jre\bin"/>
- <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3142349244246216166.tmp"/>
+ <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf5561131778124697519.tmp"/>
<property name="java.version" value="1.6.0_16"/>
<property name="env.PROCESSOR_IDENTIFIER" value="x86 Family 15 Model 3 Stepping 4, GenuineIntel"/>
<property name="user.timezone" value="America/New_York"/>
@@ -101,5 +101,5 @@
<property name="java.specification.version" value="1.6"/>
<property name="env.PROCESSOR_LEVEL" value="15"/>
</properties>
- <testcase time="0.109" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
+ <testcase time="0.062" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
</testsuite>
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0" errors="0" skipped="0" tests="2" name="org.treebase.oai.web.command.OAIPMHCommandTest">
+<testsuite failures="0" time="0.032" errors="0" skipped="0" tests="2" name="org.treebase.oai.web.command.OAIPMHCommandTest">
<properties>
<property name="java.vendor" value="Sun Microsystems Inc."/>
<property name="localRepository" value="C:\Documents and Settings\youjun/.m2/repository"/>
@@ -18,7 +18,7 @@
<property name="user.name" value="youjun"/>
<property name="user.language" value="en"/>
<property name="sun.boot.library.path" value="C:\Java\sdk\jdk\jre\bin"/>
- <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3142349244246216166.tmp"/>
+ <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf5561131778124697519.tmp"/>
<property name="java.version" value="1.6.0_16"/>
<property name="env.PROCESSOR_IDENTIFIER" value="x86 Family 15 Model 3 Stepping 4, GenuineIntel"/>
<property name="user.timezone" value="America/New_York"/>
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="17.875" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.controller.OAIPMHControllerTest">
+<testsuite failures="0" time="14.375" errors="0" skipped="0" tests="3" name="org.treebase.oai.web.controller.OAIPMHControllerTest">
<properties>
<property name="java.vendor" value="Sun Microsystems Inc."/>
<property name="localRepository" value="C:\Documents and Settings\youjun/.m2/repository"/>
@@ -18,7 +18,7 @@
<property name="user.name" value="youjun"/>
<property name="user.language" value="en"/>
<property name="sun.boot.library.path" value="C:\Java\sdk\jdk\jre\bin"/>
- <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3142349244246216166.tmp"/>
+ <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf5561131778124697519.tmp"/>
<property name="java.version" value="1.6.0_16"/>
<property name="env.PROCESSOR_IDENTIFIER" value="x86 Family 15 Model 3 Stepping 4, GenuineIntel"/>
<property name="user.timezone" value="America/New_York"/>
@@ -101,5 +101,7 @@
<property name="java.specification.version" value="1.6"/>
<property name="env.PROCESSOR_LEVEL" value="15"/>
</properties>
- <testcase time="16.86" classname="org.treebase.oai.web.controller.OAIPMHControllerTest" name="testIdentify"/>
+ <testcase time="12.391" classname="org.treebase.oai.web.controller.OAIPMHControllerTest" name="testIdentify"/>
+ <testcase time="0.031" classname="org.treebase.oai.web.controller.OAIPMHControllerTest" name="testListSet"/>
+ <testcase time="0.984" classname="org.treebase.oai.web.controller.OAIPMHControllerTest" name="testListMetadataFormats"/>
</testsuite>
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.util.IdentifyUtilTest.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.util.IdentifyUtilTest.xml 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.util.IdentifyUtilTest.xml 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.047" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.util.IdentifyUtilTest">
+<testsuite failures="0" time="0.062" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.util.IdentifyUtilTest">
<properties>
<property name="java.vendor" value="Sun Microsystems Inc."/>
<property name="localRepository" value="C:\Documents and Settings\youjun/.m2/repository"/>
@@ -18,7 +18,7 @@
<property name="user.name" value="youjun"/>
<property name="user.language" value="en"/>
<property name="sun.boot.library.path" value="C:\Java\sdk\jdk\jre\bin"/>
- <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3142349244246216166.tmp"/>
+ <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf5561131778124697519.tmp"/>
<property name="java.version" value="1.6.0_16"/>
<property name="env.PROCESSOR_IDENTIFIER" value="x86 Family 15 Model 3 Stepping 4, GenuineIntel"/>
<property name="user.timezone" value=""/>
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.IdentifyTest.txt
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.IdentifyTest.txt 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.IdentifyTest.txt 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.treebase.oai.web.command.IdentifyTest
-------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.125 sec
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.078 sec
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.OAIPMHCommandTest.txt
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.OAIPMHCommandTest.txt 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.command.OAIPMHCommandTest.txt 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.treebase.oai.web.command.OAIPMHCommandTest
-------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.032 sec
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.controller.OAIPMHControllerTest.txt
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.controller.OAIPMHControllerTest.txt 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.controller.OAIPMHControllerTest.txt 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.treebase.oai.web.controller.OAIPMHControllerTest
-------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.89 sec
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.375 sec
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.util.IdentifyUtilTest.txt
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.util.IdentifyUtilTest.txt 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.util.IdentifyUtilTest.txt 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.treebase.oai.web.util.IdentifyUtilTest
-------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.078 sec
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.093 sec
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/Identify.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/Identify.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/Identify.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -7,7 +7,7 @@
<request verb="Identify">${model.identify.baseRUL}</request>
<Identify>
<repositoryName>${model.identify.repositoryName}</repositoryName>
- <baseURL>${model.identify.baseRUL}</baseURL>
+ <baseURL>${model.identify.baseURL}</baseURL>
<protocolVersion>${model.identify.protocolVersion}</protocolVersion>
<adminEmail>${model.identify.adminEmail}</adminEmail>
<earliestDatestamp>${model.identify.earliestDatestamp}</earliestDatestamp>
@@ -23,7 +23,7 @@
http://www.openarchives.org/OAI/2.0/oai-identifier.xsd">
<scheme>oai</scheme>
<repositoryIdentifier>${model.identify.repositoryIdentifier}</repositoryIdentifier>
- <delimiter>:</delimiter>
+ <delimiter>${model.identify.identifierDelimiter}</delimiter>
<sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
</oai-identifier>
</description>
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListMetadataFormats.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListMetadataFormats.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListMetadataFormats.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
+ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
+
+ <responseDate>${model.identify.getResponseDate()}</responseDate>
+ <request verb="ListMetadataFormats"
+ identifier="${model.params.identifier}">${model.identify.baseURL}</request>
+ <ListMetadataFormats>
+ <metadataFormat>
+ <metadataPrefix>oai_dc</metadataPrefix>
+ <schema>http://www.openarchives.org/OAI/2.0/oai_dc.xsd
+ </schema>
+ <metadataNamespace>http://www.openarchives.org/OAI/2.0/oai_dc/
+ </metadataNamespace>
+ </metadataFormat>
+
+ <metadataFormat>
+ <metadataPrefix>dryad</metadataPrefix>
+ <schema>http://ils.unc.edu/mrc/dryad/version1_0/dryad_1_0.xsd</schema>
+ <metadataNamespace>http://ils.unc.edu/mrc/dryad/
+ </metadataNamespace>
+ </metadataFormat>
+
+ </ListMetadataFormats>
+</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListSet.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListSet.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListSet.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -3,9 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
- <responseDate>${identify.responseDate}</responseDate>
- <request verb="ListSets">
- ${identify.baseURL}</request>
+ <responseDate>${model.identify.responseDate}</responseDate>
+ <request verb="ListSets">${model.identify.baseURL}</request>
<error code="noSetHierarchy">This repository does not
support sets</error>
</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/WEB-INF/identify.properties
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/WEB-INF/identify.properties 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/WEB-INF/identify.properties 2009-11-12 20:54:50 UTC (rev 266)
@@ -1,10 +1,13 @@
-identify.baseRUL=www.***/top.edu
-identify.repositoryName=org.treebase.oai
+identify.baseURL=www.***.***:port/top
+identify.repositoryName=treebase repository
identify.protocolVersion=2.0
identify.adminEmail=you...@ya...
identify.earliestDatestamp=1995-11-04T00:00:00Z
identify.deletedRecord=transient
identify.granularity=YYYY-MM-DDThh:mm:ssZ
identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z'
-identify.sampleIdentifier=***
-identify.repositoryIdentifier=***
\ No newline at end of file
+identify.sampleIdentifier=treebase.org/study/TB2:s6705
+identify.repositoryIdentifier=treebase.org
+identify.identifierDelimiter=:
+identify.dublinPerfix=oai_dc
+identify.dryadPerfix=dryad
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/applicationContext.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/applicationContext.xml 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/applicationContext.xml 2009-11-12 20:54:50 UTC (rev 266)
@@ -20,7 +20,7 @@
</bean>
<bean id="top.identify" class="org.treebase.oai.web.command.Identify">
- <property name="baseRUL" value="${identify.baseRUL}" />
+ <property name="baseURL" value="${identify.baseURL}" />
<property name="repositoryName" value="${identify.repositoryName}" />
<property name="protocolVersion" value="${identify.protocolVersion}" />
<property name="adminEmail" value="${identify.adminEmail}" />
@@ -29,9 +29,12 @@
<property name="granularity" value="${identify.granularity}" />
<property name="granularityPattern" value="${identify.granularityPattern}" />
<property name="repositoryIdentifier" value="${identify.repositoryIdentifier}" />
- <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
+ <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
+ <property name="identifierDelimiter" value="${identify.identifierDelimiter}" />
+ <property name="dublinPerfix" value="${identify.dublinPerfix}" />
+ <property name="dryadPerfix" value="${identify.dryadPerfix}" />
</bean>
-
+
<!-- ========================================================== -->
<!-- LIST OF DWR beans/methods -->
<!-- ========================================================== -->
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/idDoesNotExist.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/idDoesNotExist.vm 2009-11-10 20:34:36 UTC (rev 265)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/idDoesNotExist.vm 2009-11-12 20:54:50 UTC (rev 266)
@@ -0,0 +1 @@
+id not exist
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/OAIPMHControllerTest.class
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
