Menu
▾
▴
treebase-guts — Commit and tracker messages
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
(14) |
May
(36) |
Jun
(148) |
Jul
(33) |
Aug
(2) |
Sep
(17) |
Oct
(42) |
Nov
(137) |
Dec
(88) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(89) |
Feb
(80) |
Mar
(217) |
Apr
(76) |
May
(5) |
Jun
(39) |
Jul
(35) |
Aug
(4) |
Sep
(7) |
Oct
(14) |
Nov
(12) |
Dec
(9) |
| 2011 |
Jan
(6) |
Feb
(4) |
Mar
(11) |
Apr
(55) |
May
(90) |
Jun
(39) |
Jul
(15) |
Aug
(15) |
Sep
(23) |
Oct
(12) |
Nov
(17) |
Dec
(20) |
| 2012 |
Jan
(22) |
Feb
(63) |
Mar
|
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(3) |
Feb
(6) |
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <yo...@us...> - 2009-11-17 21:08:16
|
Revision: 277
http://treebase.svn.sourceforge.net/treebase/?rev=277&view=rev
Author: youjun
Date: 2009-11-17 21:08:07 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
update target fold
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/command/OAIPMHCommand.class
trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/controller/OAIPMHController.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/ListSets.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/oai_dc_ListIdentifiers.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/OAIPMHControllerTest$VelocityUtil.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/OAIPMHControllerTest.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/top-servlet.xml
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/validator/OAIPMHValidator.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/error.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/head.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/oai_dc_record.vm
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/command/OAIPMHCommand.class
===================================================================
(Binary files differ)
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/controller/OAIPMHController.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)
Added: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/validator/OAIPMHValidator.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/validator/OAIPMHValidator.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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-17 21:03:35 UTC (rev 276)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-17 21:08:07 UTC (rev 277)
@@ -1,98 +1,105 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.031" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
+<testsuite failures="0" time="0.063" 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"/>
+ <property name="localRepository" value="C:\Documents and Settings\youjun/.m2/repository"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.management.compiler" value="HotSpot Client Compiler"/>
<property name="env.PROMPT" value="$P$G"/>
<property name="os.name" value="Windows XP"/>
<property name="env.FP_NO_HOST_CHECK" value="NO"/>
- <property name="sun.boot.class.path" value="C:\Program Files\Java\jre1.6.0_07\lib\resources.jar;C:\Program Files\Java\jre1.6.0_07\lib\rt.jar;C:\Program Files\Java\jre1.6.0_07\lib\sunrsasign.jar;C:\Program Files\Java\jre1.6.0_07\lib\jsse.jar;C:\Program Files\Java\jre1.6.0_07\lib\jce.jar;C:\Program Files\Java\jre1.6.0_07\lib\charsets.jar;C:\Program Files\Java\jre1.6.0_07\classes"/>
- <property name="env.COMPUTERNAME" value="NEWDELL"/>
+ <property name="sun.boot.class.path" value="C:\Java\sdk\jdk\jre\lib\resources.jar;C:\Java\sdk\jdk\jre\lib\rt.jar;C:\Java\sdk\jdk\jre\lib\sunrsasign.jar;C:\Java\sdk\jdk\jre\lib\jsse.jar;C:\Java\sdk\jdk\jre\lib\jce.jar;C:\Java\sdk\jdk\jre\lib\charsets.jar;C:\Java\sdk\jdk\jre\classes"/>
+ <property name="env.COMPUTERNAME" value="YALE-LD6ICZM0YC"/>
<property name="env.ALLUSERSPROFILE" value="C:\Documents and Settings\All Users"/>
<property name="sun.desktop" value="windows"/>
<property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="java.runtime.version" value="1.6.0_07-b06"/>
+ <property name="java.runtime.version" value="1.6.0_16-b01"/>
<property name="env.HOMEPATH" value="\Documents and Settings\youjun"/>
<property name="user.name" value="youjun"/>
<property name="user.language" value="en"/>
- <property name="sun.boot.library.path" value="C:\Program Files\Java\jre1.6.0_07\bin"/>
- <property name="classworlds.conf" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3421515046292235680.tmp"/>
- <property name="java.version" value="1.6.0_07"/>
- <property name="env.PROCESSOR_IDENTIFIER" value="x86 Family 6 Model 23 Stepping 6, GenuineIntel"/>
+ <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\m2conf963159189806682849.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"/>
+ <property name="env.INCLUDE" value="C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\include\;C:\Program Files\Microsoft Visual Studio\VC98\atl\include;C:\Program Files\Microsoft Visual Studio\VC98\mfc\include;C:\Program Files\Microsoft Visual Studio\VC98\include"/>
<property name="env.CLIENTNAME" value="Console"/>
<property name="env.TEMP" value="C:\DOCUME~1\youjun\LOCALS~1\Temp"/>
<property name="sun.arch.data.model" value="32"/>
- <property name="java.endorsed.dirs" value="C:\Program Files\Java\jre1.6.0_07\lib\endorsed"/>
- <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/>
+ <property name="env.AXISCLASSPATH" value="C:\Java\axis-1_2RC2\lib\axis.jar;C:\Java\axis-1_2RC2\lib\commons-discovery.jar;C:\Java\axis-1_2RC2\lib\commons-logging.jar;C:\Java\axis-1_2RC2\lib\jaxrpc.jar;C:\Java\axis-1_2RC2\lib\saaj.jar;C:\Java\axis-1_2RC2\lib\log4j-1.2.8.jar;C:\Java\axis-1_2RC2\lib\xml-apis.jar;C:\Java\axis-1_2RC2\lib\xercesImpl.jar"/>
+ <property name="java.endorsed.dirs" value="C:\Java\sdk\jdk\jre\lib\endorsed"/>
+ <property name="sun.cpu.isalist" value=""/>
<property name="env.HOMEDRIVE" value="C:"/>
- <property name="sun.jnu.encoding" value="GBK"/>
+ <property name="sun.jnu.encoding" value="Cp1252"/>
<property name="file.encoding.pkg" value="sun.io"/>
<property name="file.separator" value="\"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.class.version" value="50.0"/>
<property name="user.country" value="US"/>
- <property name="java.home" value="C:\Program Files\Java\jre1.6.0_07"/>
+ <property name="java.home" value="C:\Java\sdk\jdk\jre"/>
<property name="env.APPDATA" value="C:\Documents and Settings\youjun\Application Data"/>
- <property name="java.vm.info" value="mixed mode, sharing"/>
+ <property name="java.vm.info" value="mixed mode"/>
<property name="env.ComSpec" value="C:\WINDOWS\system32\cmd.exe"/>
<property name="env.OS" value="Windows_NT"/>
<property name="env.CommonProgramFiles" value="C:\Program Files\Common Files"/>
<property name="os.version" value="5.1"/>
<property name="path.separator" value=";"/>
- <property name="java.vm.version" value="10.0-b23"/>
+ <property name="java.vm.version" value="14.2-b01"/>
<property name="user.variant" value=""/>
<property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
+ <property name="env.LIB" value="C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Lib\;C:\Program Files\Microsoft Visual Studio\VC98\mfc\lib;C:\Program Files\Microsoft Visual Studio\VC98\lib"/>
<property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
+ <property name="env.JAVA_HOME" value="C:\Java\sdk\jdk\jre\bin"/>
<property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
<property name="env.TMP" value="C:\DOCUME~1\youjun\LOCALS~1\Temp"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
+ <property name="env.MSDevDir" value="C:\Program Files\Microsoft Visual Studio\Common\MSDev98"/>
<property name="user.home" value="C:\Documents and Settings\youjun"/>
<property name="env.SESSIONNAME" value="Console"/>
<property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="env.RoxioCentral" value="C:\Program Files\Common Files\Roxio Shared\9.0\Roxio Central33\"/>
+ <property name="env.CLASSPATH" value=".;C:\Java\axis-1_2RC2\lib\axis.jar;C:\Java\axis-1_2RC2\lib\commons-discovery.jar;C:\Java\axis-1_2RC2\lib\commons-logging.jar;C:\Java\axis-1_2RC2\lib\jaxrpc.jar;C:\Java\axis-1_2RC2\lib\saaj.jar;C:\Java\axis-1_2RC2\lib\log4j-1.2.8.jar;C:\Java\axis-1_2RC2\lib\xml-apis.jar;C:\Java\axis-1_2RC2\lib\xercesImpl.jar"/>
<property name="env.NUMBER_OF_PROCESSORS" value="2"/>
- <property name="java.library.path" value="C:\Program Files\Java\jre1.6.0_07\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI.ACE\;C:\Program Files\Common Files\Roxio Shared\DLLShared\;C:\Program Files\Common Files\Roxio Shared\9.0\DLLShared\;C:\Program Files\Common Files\Adobe\AGL;C:\Program Files\MySQL\MySQL Server 5.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Java\SDK\bin"/>
+ <property name="java.library.path" value="C:\Java\sdk\jdk\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Java\jdk1.5.0_02\bin;C:\Program Files\Common Files\Adobe\AGL;"C:\Program Files\Zone Labs\ZoneAlarm\MailFrontier";C:\Java\sdk5\bin;C:\Java\sdk\bin;C:\Program Files\Microsoft Visual Studio\Common\Tools\WinNT;C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin;C:\Program Files\Microsoft Visual Studio\Common\Tools;C:\Program Files\Microsoft Visual Studio\VC98\bin"/>
<property name="java.vendor.url" value="http://java.sun.com/"/>
<property name="java.vm.vendor" value="Sun Microsystems Inc."/>
<property name="maven.home" value="EMBEDDED"/>
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="java.class.path" value="/C:/eclipse/plugins/org.maven.ide.components.maven_embedder_2.1.0.20080530-2300/jars/plexus-classworlds-1.2-alpha-12.jar"/>
+ <property name="java.class.path" value="/C:/eclipse/jee/plugins/org.maven.ide.components.maven_embedder_2.1.0.20080530-2300/jars/plexus-classworlds-1.2-alpha-12.jar"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="env.LOGONSERVER" value="\\NEWDELL"/>
+ <property name="env.LOGONSERVER" value="\\YALE-LD6ICZM0YC"/>
<property name="env.windir" value="C:\WINDOWS"/>
<property name="java.vm.specification.version" value="1.0"/>
<property name="env.PROCESSOR_ARCHITECTURE" value="x86"/>
- <property name="m2eclipse.workspace.state" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\workspacestate.properties"/>
+ <property name="m2eclipse.workspace.state" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\workspacestate.properties"/>
+ <property name="sun.os.patch.level" value="Service Pack 3"/>
<property name="sun.cpu.endian" value="little"/>
- <property name="sun.os.patch.level" value="Service Pack 3"/>
- <property name="surefire.test.class.path" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web\target\test-classes;C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web\target\classes;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring\2.0.7\spring-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\commons-logging\commons-logging\1.1\commons-logging-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\log4j\log4j\1.2.13\log4j-1.2.13.jar;C:\Documents and Settings\youjun\.m2\repository\logkit\logkit\1.0.1\logkit-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\servlet-api\2.4\servlet-api-2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-mock\2.0.7\spring-mock-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\jstl\1.1.2\jstl-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\mail\mail\1.4\mail-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\javax\activation\activation\1.1\activation-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\xalan\xalan\2.7.0\xalan-2.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\xml-apis\xml-apis\1.0.b2\xml-apis-1.0.b2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-beanutils\commons-beanutils\1.7.0\commons-beanutils-1.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\commons-validator\commons-validator\1.1.4\commons-validator-1.1.4.jar;C:\Documents and Settings\youjun\.m2\repository\commons-lang\commons-lang\2.3\commons-lang-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\standard\1.1.2\standard-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\string\1.1.0\string-1.1.0.jar;C:\Documents and Settings\youjun\.m2\repository\struts\struts\1.2.9\struts-1.2.9.jar;C:\Documents and Settings\youjun\.m2\repository\opensymphony\sitemesh\2.3\sitemesh-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\displaytag\displaytag\1.1.1\displaytag-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-collections\commons-collections\3.1\commons-collections-3.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\lowagie\itext\1.3\itext-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\jcl104-over-slf4j\1.4.2\jcl104-over-slf4j-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-log4j12\1.4.2\slf4j-log4j12-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-api\1.4.2\slf4j-api-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\struts-menu\struts-menu\2.3\struts-menu-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\commons-digester\commons-digester\1.5\commons-digester-1.5.jar;C:\Documents and Settings\youjun\.m2\repository\hsqldb\hsqldb\1.7.1\hsqldb-1.7.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\acegisecurity\acegi-security\1.0.1\acegi-security-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-codec\commons-codec\1.3\commons-codec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\oro\oro\2.0.8\oro-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\springmodules\springmodules-validator\0.1\springmodules-validator-0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-fileupload\commons-fileupload\1.2\commons-fileupload-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-io\commons-io\1.3\commons-io-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\directwebremoting\dwr\2.0.rc2\dwr-2.0.rc2.jar;C:\Documents and Settings\youjun\.m2\repository\jmock\jmock\1.0.1\jmock-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\soap\saaj-api\1.3\saaj-api-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\zing\z3950\org\cql-java\1.0\cql-java-1.0.jar;C:\Documents and Settings\youjun\workspace\treebase\treebase-core\target\classes;C:\Documents and Settings\youjun\.m2\repository\postgresql\postgresql\8.3-603.jdbc3\postgresql-8.3-603.jdbc3.jar;C:\Documents and Settings\youjun\.m2\repository\c3p0\c3p0\0.9.1.2\c3p0-0.9.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\nexml\model\nexml\1.5-SNAPSHOT\nexml-1.5-SNAPSHOT.jar;C:\Documents and Settings\youjun\.m2\repository\xerces\xercesImpl\2.4.0\xercesImpl-2.4.0.jar;C:\Documents and Settings\youjun\.m2\repository\mesquite\mesquite\2.01.tb\mesquite-2.01.tb.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-annotations\3.3.1.GA\hibernate-annotations-3.3.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate\3.2.6.ga\hibernate-3.2.6.ga.jar;C:\Documents and Settings\youjun\.m2\repository\net\sf\ehcache\ehcache\1.2.3\ehcache-1.2.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\transaction\jta\1.0.1B\jta-1.0.1B.jar;C:\Documents and Settings\youjun\.m2\repository\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\antlr\antlr\2.7.6\antlr-2.7.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-commons-annotations\3.0.0.ga\hibernate-commons-annotations-3.0.0.ga.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\ejb3-persistence\1.0.1.GA\ejb3-persistence-1.0.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar;C:\Documents and Settings\youjun\.m2\repository\jama\jama\1.0.1\jama-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\pal\pal\mesquite-201\pal-mesquite-201.jar;C:\Documents and Settings\youjun\.m2\repository\jsci\jsci\mesquite\jsci-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\tolbaseclasses\tolbaseclasses\mesquite\tolbaseclasses-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\mrj\MRJToolkitStubs\1.0\MRJToolkitStubs-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\apple\apple-java-extensions\1.2\apple-java-extensions-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\cipres\framework\1.0.1\framework-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\jdom\jdom\1.1\jdom-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-jaxws\2.1.1\cxf-rt-frontend-jaxws-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-jaxws_2.1_spec\1.0\geronimo-jaxws_2.1_spec-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0.2\geronimo-activation_1.1_spec-1.0.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-api\2.1.1\cxf-api-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-utilities\2.1.1\cxf-common-utilities-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-core\2.0.8\spring-core-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-beans\2.0.8\spring-beans-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-context\2.0.8\spring-context-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\aopalliance\aopalliance\1.0\aopalliance-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-annotation_1.0_spec\1.1.1\geronimo-annotation_1.0_spec-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\bind\jaxb-api\2.1\jaxb-api-2.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-stax-api_1.0_spec\1.0.1\geronimo-stax-api_1.0_spec-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\wsdl4j\wsdl4j\1.6.1\wsdl4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\xml-resolver\xml-resolver\1.2\xml-resolver-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\ws\commons\schema\XmlSchema\1.4.2\XmlSchema-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\codehaus\woodstox\wstx-asl\3.2.4\wstx-asl-3.2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\neethi\neethi\2.0.4\neethi-2.0.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-schemas\2.1.1\cxf-common-schemas-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-core\2.1.1\cxf-rt-core-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\bind\jaxb-impl\2.1.6\jaxb-impl-2.1.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.3\geronimo-javamail_1.4_spec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\fastinfoset\FastInfoset\1.2.2\FastInfoset-1.2.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-bindings-soap\2.1.1\cxf-rt-bindings-soap-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-tools-common\2.1.1\cxf-tools-common-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity\1.4\velocity-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity-dep\1.4\velocity-dep-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\bind\jaxb-xjc\2.1.6\jaxb-xjc-2.1.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-ws-metadata_2.0_spec\1.1.2\geronimo-ws-metadata_2.0_spec-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-databinding-jaxb\2.1.1\cxf-rt-databinding-jaxb-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-bindings-xml\2.1.1\cxf-rt-bindings-xml-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-simple\2.1.1\cxf-rt-frontend-simple-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-ws-addr\2.1.1\cxf-rt-ws-addr-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\messaging\saaj\saaj-impl\1.3\saaj-impl-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-transports-http\2.1.1\cxf-rt-transports-http-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-web\2.0.8\spring-web-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-transports-http-jetty\2.1.1\cxf-rt-transports-http-jetty-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\mortbay\jetty\jetty\6.1.9\jetty-6.1.9.jar;C:\Documents and Settings\youjun\.m2\repository\org\mortbay\jetty\jetty-util\6.1.9\jetty-util-6.1.9.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-servlet_2.5_spec\1.2\geronimo-servlet_2.5_spec-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\sql\jdbc-stdext\2.0\jdbc-stdext-2.0.jar;C:\Documents and Settings\youjun\.m2\repository\ibm\db2jcc_license_cu\2.6.80\db2jcc_license_cu-2.6.80.jar;C:\Documents and Settings\youjun\.m2\repository\ibm\db2jcc\2.6.80\db2jcc-2.6.80.jar;"/>
<property name="env.ProgramFiles" value="C:\Program Files"/>
+ <property name="surefire.test.class.path" value="C:\eclipse\workspace\oai-pmh_data_provider\data_provider_web\target\test-classes;C:\eclipse\workspace\oai-pmh_data_provider\data_provider_web\target\classes;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring\2.0.7\spring-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\commons-logging\commons-logging\1.1\commons-logging-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\log4j\log4j\1.2.13\log4j-1.2.13.jar;C:\Documents and Settings\youjun\.m2\repository\logkit\logkit\1.0.1\logkit-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\servlet-api\2.4\servlet-api-2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-mock\2.0.7\spring-mock-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\jstl\1.1.2\jstl-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\mail\mail\1.4\mail-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\javax\activation\activation\1.1\activation-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\xalan\xalan\2.7.0\xalan-2.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\xml-apis\xml-apis\1.0.b2\xml-apis-1.0.b2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-beanutils\commons-beanutils\1.7.0\commons-beanutils-1.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\commons-validator\commons-validator\1.1.4\commons-validator-1.1.4.jar;C:\Documents and Settings\youjun\.m2\repository\commons-lang\commons-lang\2.3\commons-lang-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\standard\1.1.2\standard-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\string\1.1.0\string-1.1.0.jar;C:\Documents and Settings\youjun\.m2\repository\struts\struts\1.2.9\struts-1.2.9.jar;C:\Documents and Settings\youjun\.m2\repository\opensymphony\sitemesh\2.3\sitemesh-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\displaytag\displaytag\1.1.1\displaytag-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-collections\commons-collections\3.1\commons-collections-3.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\lowagie\itext\1.3\itext-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\jcl104-over-slf4j\1.4.2\jcl104-over-slf4j-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-log4j12\1.4.2\slf4j-log4j12-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-api\1.4.2\slf4j-api-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\struts-menu\struts-menu\2.3\struts-menu-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\commons-digester\commons-digester\1.5\commons-digester-1.5.jar;C:\Documents and Settings\youjun\.m2\repository\hsqldb\hsqldb\1.7.1\hsqldb-1.7.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\acegisecurity\acegi-security\1.0.1\acegi-security-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-codec\commons-codec\1.3\commons-codec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\oro\oro\2.0.8\oro-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\springmodules\springmodules-validator\0.1\springmodules-validator-0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-fileupload\commons-fileupload\1.2\commons-fileupload-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-io\commons-io\1.3\commons-io-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\directwebremoting\dwr\2.0.rc2\dwr-2.0.rc2.jar;C:\Documents and Settings\youjun\.m2\repository\jmock\jmock\1.0.1\jmock-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\soap\saaj-api\1.3\saaj-api-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\zing\z3950\org\cql-java\1.0\cql-java-1.0.jar;C:\eclipse\workspace\treebase\treebase-core\target\classes;C:\Documents and Settings\youjun\.m2\repository\postgresql\postgresql\8.3-603.jdbc3\postgresql-8.3-603.jdbc3.jar;C:\Documents and Settings\youjun\.m2\repository\c3p0\c3p0\0.9.1.2\c3p0-0.9.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\nexml\model\nexml\1.5-SNAPSHOT\nexml-1.5-SNAPSHOT.jar;C:\Documents and Settings\youjun\.m2\repository\xerces\xercesImpl\2.4.0\xercesImpl-2.4.0.jar;C:\Documents and Settings\youjun\.m2\repository\mesquite\mesquite\2.01.tb\mesquite-2.01.tb.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-annotations\3.3.1.GA\hibernate-annotations-3.3.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate\3.2.6.ga\hibernate-3.2.6.ga.jar;C:\Documents and Settings\youjun\.m2\repository\net\sf\ehcache\ehcache\1.2.3\ehcache-1.2.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\transaction\jta\1.0.1B\jta-1.0.1B.jar;C:\Documents and Settings\youjun\.m2\repository\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\antlr\antlr\2.7.6\antlr-2.7.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-commons-annotations\3.0.0.ga\hibernate-commons-annotations-3.0.0.ga.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\ejb3-persistence\1.0.1.GA\ejb3-persistence-1.0.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar;C:\Documents and Settings\youjun\.m2\repository\jama\jama\1.0.1\jama-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\pal\pal\mesquite-201\pal-mesquite-201.jar;C:\Documents and Settings\youjun\.m2\repository\jsci\jsci\mesquite\jsci-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\tolbaseclasses\tolbaseclasses\mesquite\tolbaseclasses-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\mrj\MRJToolkitStubs\1.0\MRJToolkitStubs-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\apple\apple-java-extensions\1.2\apple-java-extensions-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\cipres\framework\1.0.1\framework-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\jdom\jdom\1.1\jdom-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-jaxws\2.1.1\cxf-rt-frontend-jaxws-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-jaxws_2.1_spec\1.0\geronimo-jaxws_2.1_spec-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0.2\geronimo-activation_1.1_spec-1.0.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-api\2.1.1\cxf-api-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-utilities\2.1.1\cxf-common-utilities-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-core\2.0.8\spring-core-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-beans\2.0.8\spring-beans-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-context\2.0.8\spring-context-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\aopalliance\aopalliance\1.0\aopalliance-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-annotation_1.0_spec\1.1.1\geronimo-annotation_1.0_spec-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\bind\jaxb-api\2.1\jaxb-api-2.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-stax-api_1.0_spec\1.0.1\geronimo-stax-api_1.0_spec-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\wsdl4j\wsdl4j\1.6.1\wsdl4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\xml-resolver\xml-resolver\1.2\xml-resolver-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\ws\commons\schema\XmlSchema\1.4.2\XmlSchema-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\codehaus\woodstox\wstx-asl\3.2.4\wstx-asl-3.2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\neethi\neethi\2.0.4\neethi-2.0.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-schemas\2.1.1\cxf-common-schemas-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-core\2.1.1\cxf-rt-core-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\bind\jaxb-impl\2.1.6\jaxb-impl-2.1.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.3\geronimo-javamail_1.4_spec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\fastinfoset\FastInfoset\1.2.2\FastInfoset-1.2.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-bindings-soap\2.1.1\cxf-rt-bindings-soap-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-tools-common\2.1.1\cxf-tools-common-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity\1.4\velocity-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity-dep\1.4\velocity-dep-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\bind\jaxb-xjc\2.1.6\jaxb-xjc-2.1.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-ws-metadata_2.0_spec\1.1.2\geronimo-ws-metadata_2.0_spec-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-databinding-jaxb\2.1.1\cxf-rt-databinding-jaxb-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-bindings-xml\2.1.1\cxf-rt-bindings-xml-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-simple\2.1.1\cxf-rt-frontend-simple-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-ws-addr\2.1.1\cxf-rt-ws-addr-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\messaging\saaj\saaj-impl\1.3\saaj-impl-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-transports-http\2.1.1\cxf-rt-transports-http-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-web\2.0.8\spring-web-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-transports-http-jetty\2.1.1\cxf-rt-transports-http-jetty-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\mortbay\jetty\jetty\6.1.9\jetty-6.1.9.jar;C:\Documents and Settings\youjun\.m2\repository\org\mortbay\jetty\jetty-util\6.1.9\jetty-util-6.1.9.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-servlet_2.5_spec\1.2\geronimo-servlet_2.5_spec-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\sql\jdbc-stdext\2.0\jdbc-stdext-2.0.jar;C:\Documents and Settings\youjun\.m2\repository\ibm\db2jcc_license_cu\2.6.80\db2jcc_license_cu-2.6.80.jar;C:\Documents and Settings\youjun\.m2\repository\ibm\db2jcc\2.6.80\db2jcc-2.6.80.jar;"/>
<property name="java.io.tmpdir" value="C:\DOCUME~1\youjun\LOCALS~1\Temp\"/>
- <property name="env.PROCESSOR_REVISION" value="1706"/>
+ <property name="env.PROCESSOR_REVISION" value="0304"/>
<property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
<property name="env.SystemRoot" value="C:\WINDOWS"/>
<property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/>
<property name="os.arch" value="x86"/>
- <property name="java.ext.dirs" value="C:\Program Files\Java\jre1.6.0_07\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/>
+ <property name="java.ext.dirs" value="C:\Java\sdk\jdk\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/>
<property name="env.tvdumpflags" value="8"/>
- <property name="user.dir" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web"/>
+ <property name="user.dir" value="C:\eclipse\workspace\oai-pmh_data_provider\data_provider_web"/>
+ <property name="env.VS71COMNTOOLS" value="C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\"/>
<property name="line.separator" value="
"/>
<property name="java.vm.name" value="Java HotSpot(TM) Client VM"/>
<property name="env.PATHEXT" value=".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH"/>
- <property name="env.Path" value="C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI.ACE\;C:\Program Files\Common Files\Roxio Shared\DLLShared\;C:\Program Files\Common Files\Roxio Shared\9.0\DLLShared\;C:\Program Files\Common Files\Adobe\AGL;C:\Program Files\MySQL\MySQL Server 5.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Java\SDK\bin"/>
- <property name="basedir" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web"/>
+ <property name="env.Path" value="C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Java\jdk1.5.0_02\bin;C:\Program Files\Common Files\Adobe\AGL;"C:\Program Files\Zone Labs\ZoneAlarm\MailFrontier";C:\Java\sdk5\bin;C:\Java\sdk\bin;C:\Program Files\Microsoft Visual Studio\Common\Tools\WinNT;C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin;C:\Program Files\Microsoft Visual Studio\Common\Tools;C:\Program Files\Microsoft Visual Studio\VC98\bin"/>
+ <property name="env.AXIS_LIB" value="C:\Java\axis-1_2RC2\lib"/>
+ <property name="basedir" value="C:\eclipse\workspace\oai-pmh_data_provider\data_provider_web"/>
<property name="maven.mode.standalone" value="true"/>
<property name="env.USERNAME" value="youjun"/>
<property name="env.SystemDrive" value="C:"/>
<property name="file.encoding" value="Cp1252"/>
- <property name="env.USERDOMAIN" value="NEWDELL"/>
+ <property name="env.USERDOMAIN" value="YALE-LD6ICZM0YC"/>
<property name="java.specification.version" value="1.6"/>
- <property name="env.PROCESSOR_LEVEL" value="6"/>
+ <property name="env.PROCESSOR_LEVEL" value="15"/>
</properties>
- <testcase time="0.031" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
+ <testcase time="0.063" 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-17 21:03:35 UTC (rev 276)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml 2009-11-17 21:08:07 UTC (rev 277)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.032" errors="0" skipped="0" tests="2" name="org.treebase.oai.web.command.OAIPMHCommandTest">
+<testsuite failures="0" time="0.031" 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\m2conf5561131778124697519.tmp"/>
+ <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf963159189806682849.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-17 21:03:35 UTC (rev 276)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-17 21:08:07 UTC (rev 277)
@@ -1,103 +1,111 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="25.735" errors="0" skipped="0" tests="6" name="org.treebase.oai.web.controller.OAIPMHControllerTest">
+<testsuite failures="0" time="46.078" errors="0" skipped="0" tests="7" 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"/>
+ <property name="localRepository" value="C:\Documents and Settings\youjun/.m2/repository"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.management.compiler" value="HotSpot Client Compiler"/>
<property name="env.PROMPT" value="$P$G"/>
<property name="os.name" value="Windows XP"/>
<property name="env.FP_NO_HOST_CHECK" value="NO"/>
- <property name="sun.boot.class.path" value="C:\Program Files\Java\jre1.6.0_07\lib\resources.jar;C:\Program Files\Java\jre1.6.0_07\lib\rt.jar;C:\Program Files\Java\jre1.6.0_07\lib\sunrsasign.jar;C:\Program Files\Java\jre1.6.0_07\lib\jsse.jar;C:\Program Files\Java\jre1.6.0_07\lib\jce.jar;C:\Program Files\Java\jre1.6.0_07\lib\charsets.jar;C:\Program Files\Java\jre1.6.0_07\classes"/>
- <property name="env.COMPUTERNAME" value="NEWDELL"/>
+ <property name="sun.boot.class.path" value="C:\Java\sdk\jdk\jre\lib\resources.jar;C:\Java\sdk\jdk\jre\lib\rt.jar;C:\Java\sdk\jdk\jre\lib\sunrsasign.jar;C:\Java\sdk\jdk\jre\lib\jsse.jar;C:\Java\sdk\jdk\jre\lib\jce.jar;C:\Java\sdk\jdk\jre\lib\charsets.jar;C:\Java\sdk\jdk\jre\classes"/>
+ <property name="env.COMPUTERNAME" value="YALE-LD6ICZM0YC"/>
<property name="env.ALLUSERSPROFILE" value="C:\Documents and Settings\All Users"/>
<property name="sun.desktop" value="windows"/>
<property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="java.runtime.version" value="1.6.0_07-b06"/>
+ <property name="java.runtime.version" value="1.6.0_16-b01"/>
<property name="env.HOMEPATH" value="\Documents and Settings\youjun"/>
<property name="user.name" value="youjun"/>
<property name="user.language" value="en"/>
- <property name="sun.boot.library.path" value="C:\Program Files\Java\jre1.6.0_07\bin"/>
- <property name="classworlds.conf" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3421515046292235680.tmp"/>
- <property name="java.version" value="1.6.0_07"/>
- <property name="env.PROCESSOR_IDENTIFIER" value="x86 Family 6 Model 23 Stepping 6, GenuineIntel"/>
+ <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\m2conf963159189806682849.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"/>
+ <property name="env.INCLUDE" value="C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\include\;C:\Program Files\Microsoft Visual Studio\VC98\atl\include;C:\Program Files\Microsoft Visual Studio\VC98\mfc\include;C:\Program Files\Microsoft Visual Studio\VC98\include"/>
<property name="env.CLIENTNAME" value="Console"/>
<property name="env.TEMP" value="C:\DOCUME~1\youjun\LOCALS~1\Temp"/>
<property name="sun.arch.data.model" value="32"/>
- <property name="java.endorsed.dirs" value="C:\Program Files\Java\jre1.6.0_07\lib\endorsed"/>
- <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/>
+ <property name="env.AXISCLASSPATH" value="C:\Java\axis-1_2RC2\lib\axis.jar;C:\Java\axis-1_2RC2\lib\commons-discovery.jar;C:\Java\axis-1_2RC2\lib\commons-logging.jar;C:\Java\axis-1_2RC2\lib\jaxrpc.jar;C:\Java\axis-1_2RC2\lib\saaj.jar;C:\Java\axis-1_2RC2\lib\log4j-1.2.8.jar;C:\Java\axis-1_2RC2\lib\xml-apis.jar;C:\Java\axis-1_2RC2\lib\xercesImpl.jar"/>
+ <property name="java.endorsed.dirs" value="C:\Java\sdk\jdk\jre\lib\endorsed"/>
+ <property name="sun.cpu.isalist" value=""/>
<property name="env.HOMEDRIVE" value="C:"/>
- <property name="sun.jnu.encoding" value="GBK"/>
+ <property name="sun.jnu.encoding" value="Cp1252"/>
<property name="file.encoding.pkg" value="sun.io"/>
<property name="file.separator" value="\"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.class.version" value="50.0"/>
<property name="user.country" value="US"/>
- <property name="java.home" value="C:\Program Files\Java\jre1.6.0_07"/>
+ <property name="java.home" value="C:\Java\sdk\jdk\jre"/>
<property name="env.APPDATA" value="C:\Documents and Settings\youjun\Application Data"/>
- <property name="java.vm.info" value="mixed mode, sharing"/>
+ <property name="java.vm.info" value="mixed mode"/>
<property name="env.ComSpec" value="C:\WINDOWS\system32\cmd.exe"/>
<property name="env.OS" value="Windows_NT"/>
<property name="env.CommonProgramFiles" value="C:\Program Files\Common Files"/>
<property name="os.version" value="5.1"/>
<property name="path.separator" value=";"/>
- <property name="java.vm.version" value="10.0-b23"/>
+ <property name="java.vm.version" value="14.2-b01"/>
<property name="user.variant" value=""/>
<property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
+ <property name="env.LIB" value="C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Lib\;C:\Program Files\Microsoft Visual Studio\VC98\mfc\lib;C:\Program Files\Microsoft Visual Studio\VC98\lib"/>
<property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
+ <property name="env.JAVA_HOME" value="C:\Java\sdk\jdk\jre\bin"/>
<property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
<property name="env.TMP" value="C:\DOCUME~1\youjun\LOCALS~1\Temp"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
+ <property name="env.MSDevDir" value="C:\Program Files\Microsoft Visual Studio\Common\MSDev98"/>
<property name="user.home" value="C:\Documents and Settings\youjun"/>
<property name="env.SESSIONNAME" value="Console"/>
<property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="env.RoxioCentral" value="C:\Program Files\Common Files\Roxio Shared\9.0\Roxio Central33\"/>
+ <property name="env.CLASSPATH" value=".;C:\Java\axis-1_2RC2\lib\axis.jar;C:\Java\axis-1_2RC2\lib\commons-discovery.jar;C:\Java\axis-1_2RC2\lib\commons-logging.jar;C:\Java\axis-1_2RC2\lib\jaxrpc.jar;C:\Java\axis-1_2RC2\lib\saaj.jar;C:\Java\axis-1_2RC2\lib\log4j-1.2.8.jar;C:\Java\axis-1_2RC2\lib\xml-apis.jar;C:\Java\axis-1_2RC2\lib\xercesImpl.jar"/>
<property name="env.NUMBER_OF_PROCESSORS" value="2"/>
- <property name="java.library.path" value="C:\Program Files\Java\jre1.6.0_07\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI.ACE\;C:\Program Files\Common Files\Roxio Shared\DLLShared\;C:\Program Files\Common Files\Roxio Shared\9.0\DLLShared\;C:\Program Files\Common Files\Adobe\AGL;C:\Program Files\MySQL\MySQL Server 5.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Java\SDK\bin"/>
+ <property name="java.library.path" value="C:\Java\sdk\jdk\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Java\jdk1.5.0_02\bin;C:\Program Files\Common Files\Adobe\AGL;"C:\Program Files\Zone Labs\ZoneAlarm\MailFrontier";C:\Java\sdk5\bin;C:\Java\sdk\bin;C:\Program Files\Microsoft Visual Studio\Common\Tools\WinNT;C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin;C:\Program Files\Microsoft Visual Studio\Common\Tools;C:\Program Files\Microsoft Visual Studio\VC98\bin"/>
<property name="java.vendor.url" value="http://java.sun.com/"/>
<property name="java.vm.vendor" value="Sun Microsystems Inc."/>
<property name="maven.home" value="EMBEDDED"/>
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="java.class.path" value="/C:/eclipse/plugins/org.maven.ide.components.maven_embedder_2.1.0.20080530-2300/jars/plexus-classworlds-1.2-alpha-12.jar"/>
+ <property name="java.class.path" value="/C:/eclipse/jee/plugins/org.maven.ide.components.maven_embedder_2.1.0.20080530-2300/jars/plexus-classworlds-1.2-alpha-12.jar"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="env.LOGONSERVER" value="\\NEWDELL"/>
+ <property name="env.LOGONSERVER" value="\\YALE-LD6ICZM0YC"/>
<property name="env.windir" value="C:\WINDOWS"/>
<property name="java.vm.specification.version" value="1.0"/>
<property name="env.PROCESSOR_ARCHITECTURE" value="x86"/>
- <property name="m2eclipse.workspace.state" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\workspacestate.properties"/>
+ <property name="m2eclipse.workspace.state" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\workspacestate.properties"/>
+ <property name="sun.os.patch.level" value="Service Pack 3"/>
<property name="sun.cpu.endian" value="little"/>
- <property name="sun.os.patch.level" value="Service Pack 3"/>
- <property name="surefire.test.class.path" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web\target\test-classes;C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web\target\classes;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring\2.0.7\spring-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\commons-logging\commons-logging\1.1\commons-logging-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\log4j\log4j\1.2.13\log4j-1.2.13.jar;C:\Documents and Settings\youjun\.m2\repository\logkit\logkit\1.0.1\logkit-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\servlet-api\2.4\servlet-api-2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-mock\2.0.7\spring-mock-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\jstl\1.1.2\jstl-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\mail\mail\1.4\mail-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\javax\activation\activation\1.1\activation-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\xalan\xalan\2.7.0\xalan-2.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\xml-apis\xml-apis\1.0.b2\xml-apis-1.0.b2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-beanutils\commons-beanutils\1.7.0\commons-beanutils-1.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\commons-validator\commons-validator\1.1.4\commons-validator-1.1.4.jar;C:\Documents and Settings\youjun\.m2\repository\commons-lang\commons-lang\2.3\commons-lang-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\standard\1.1.2\standard-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\string\1.1.0\string-1.1.0.jar;C:\Documents and Settings\youjun\.m2\repository\struts\struts\1.2.9\struts-1.2.9.jar;C:\Documents and Settings\youjun\.m2\repository\opensymphony\sitemesh\2.3\sitemesh-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\displaytag\displaytag\1.1.1\displaytag-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-collections\commons-collections\3.1\commons-collections-3.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\lowagie\itext\1.3\itext-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\jcl104-over-slf4j\1.4.2\jcl104-over-slf4j-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-log4j12\1.4.2\slf4j-log4j12-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-api\1.4.2\slf4j-api-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\struts-menu\struts-menu\2.3\struts-menu-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\commons-digester\commons-digester\1.5\commons-digester-1.5.jar;C:\Documents and Settings\youjun\.m2\repository\hsqldb\hsqldb\1.7.1\hsqldb-1.7.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\acegisecurity\acegi-security\1.0.1\acegi-security-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-codec\commons-codec\1.3\commons-codec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\oro\oro\2.0.8\oro-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\springmodules\springmodules-validator\0.1\springmodules-validator-0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-fileupload\commons-fileupload\1.2\commons-fileupload-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-io\commons-io\1.3\commons-io-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\directwebremoting\dwr\2.0.rc2\dwr-2.0.rc2.jar;C:\Documents and Settings\youjun\.m2\repository\jmock\jmock\1.0.1\jmock-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\soap\saaj-api\1.3\saaj-api-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\zing\z3950\org\cql-java\1.0\cql-java-1.0.jar;C:\Documents and Settings\youjun\workspace\treebase\treebase-core\target\classes;C:\Documents and Settings\youjun\.m2\repository\postgresql\postgresql\8.3-603.jdbc3\postgresql-8.3-603.jdbc3.jar;C:\Documents and Settings\youjun\.m2\repository\c3p0\c3p0\0.9.1.2\c3p0-0.9.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\nexml\model\nexml\1.5-SNAPSHOT\nexml-1.5-SNAPSHOT.jar;C:\Documents and Settings\youjun\.m2\repository\xerces\xercesImpl\2.4.0\xercesImpl-2.4.0.jar;C:\Documents and Settings\youjun\.m2\repository\mesquite\mesquite\2.01.tb\mesquite-2.01.tb.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-annotations\3.3.1.GA\hibernate-annotations-3.3.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate\3.2.6.ga\hibernate-3.2.6.ga.jar;C:\Documents and Settings\youjun\.m2\repository\net\sf\ehcache\ehcache\1.2.3\ehcache-1.2.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\transaction\jta\1.0.1B\jta-1.0.1B.jar;C:\Documents and Settings\youjun\.m2\repository\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\antlr\antlr\2.7.6\antlr-2.7.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-commons-annotations\3.0.0.ga\hibernate-commons-annotations-3.0.0.ga.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\ejb3-persistence\1.0.1.GA\ejb3-persistence-1.0.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar;C:\Documents and Settings\youjun\.m2\repository\jama\jama\1.0.1\jama-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\pal\pal\mesquite-201\pal-mesquite-201.jar;C:\Documents and Settings\youjun\.m2\repository\jsci\jsci\mesquite\jsci-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\tolbaseclasses\tolbaseclasses\mesquite\tolbaseclasses-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\mrj\MRJToolkitStubs\1.0\MRJToolkitStubs-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\apple\apple-java-extensions\1.2\apple-java-extensions-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\cipres\framework\1.0.1\framework-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\jdom\jdom\1.1\jdom-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-jaxws\2.1.1\cxf-rt-frontend-jaxws-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-jaxws_2.1_spec\1.0\geronimo-jaxws_2.1_spec-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0.2\geronimo-activation_1.1_spec-1.0.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-api\2.1.1\cxf-api-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-utilities\2.1.1\cxf-common-utilities-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-core\2.0.8\spring-core-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-beans\2.0.8\spring-beans-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-context\2.0.8\spring-context-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\aopalliance\aopalliance\1.0\aopalliance-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-annotation_1.0_spec\1.1.1\geronimo-annotation_1.0_spec-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\bind\jaxb-api\2.1\jaxb-api-2.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-stax-api_1.0_spec\1.0.1\geronimo-stax-api_1.0_spec-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\wsdl4j\wsdl4j\1.6.1\wsdl4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\xml-resolver\xml-resolver\1.2\xml-resolver-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\ws\commons\schema\XmlSchema\1.4.2\XmlSchema-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\codehaus\woodstox\wstx-asl\3.2.4\wstx-asl-3.2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\neethi\neethi\2.0.4\neethi-2.0.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-schemas\2.1.1\cxf-common-schemas-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-core\2.1.1\cxf-rt-core-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\bind\jaxb-impl\2.1.6\jaxb-impl-2.1.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.3\geronimo-javamail_1.4_spec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\fastinfoset\FastInfoset\1.2.2\FastInfoset-1.2.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-bindings-soap\2.1.1\cxf-rt-bindings-soap-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-tools-common\2.1.1\cxf-tools-common-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity\1.4\velocity-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity-dep\1.4\velocity-dep-1.4.jar;C:\Doc...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-17 21:03:45
|
Revision: 276
http://treebase.svn.sourceforge.net/treebase/?rev=276&view=rev
Author: youjun
Date: 2009-11-17 21:03:35 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
add a test(handleTest) on controller
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-17 16:55:09 UTC (rev 275)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-17 21:03:35 UTC (rev 276)
@@ -107,6 +107,8 @@
model.put("error", "invalid verb");
return new ModelAndView("error.vm",model);
}catch(NullPointerException e){
+ model.put("error_code", "badVerb");
+ model.put("error", "missing verb");
return (new ModelAndView("error.vm",model));
}
@@ -114,7 +116,7 @@
}
- ModelAndView ListRecords(OAIPMHCommand params, Map model){
+ public ModelAndView ListRecords(OAIPMHCommand params, Map model){
List<Submission> list=null;
try {
@@ -131,7 +133,7 @@
}
- ModelAndView ListIdentifiers( OAIPMHCommand params, Map model){
+ public ModelAndView ListIdentifiers( OAIPMHCommand params, Map model){
List<Submission> list=null;
try {
@@ -147,7 +149,7 @@
}
- ModelAndView GetRecord( OAIPMHCommand params, Map model){
+ public ModelAndView GetRecord( OAIPMHCommand params, Map model){
Submission submission = null;
@@ -172,21 +174,21 @@
}
- ModelAndView Identify(OAIPMHCommand params, Map model){
+ public ModelAndView Identify(OAIPMHCommand params, Map model){
return (new ModelAndView("Identify.vm",model));
}
- ModelAndView ListSets(OAIPMHCommand params, Map model){
+ public ModelAndView ListSets(OAIPMHCommand params, Map model){
model.put("error_code", "noSetHierarchy");
model.put("error", "This repository does not support sets");
return (new ModelAndView("error.vm",model));
}
- ModelAndView ListMetadataFormats(OAIPMHCommand params, Map model){
+ public ModelAndView ListMetadataFormats(OAIPMHCommand params, Map model){
Submission submission = null;
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-17 16:55:09 UTC (rev 275)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-17 21:03:35 UTC (rev 276)
@@ -1,6 +1,7 @@
package org.treebase.oai.web.controller;
import java.io.StringWriter;
+import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -12,6 +13,7 @@
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.springframework.test.AbstractTransactionalSpringContextTests;
+import org.springframework.validation.BindException;
import org.springframework.web.servlet.ModelAndView;
import org.treebase.oai.web.command.Identify;
import org.treebase.oai.web.command.OAIPMHCommand;
@@ -100,12 +102,12 @@
ModelAndView mav=controller.Identify(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- System.out.println("--------test Identify---------");
- System.out.print(result);
+ //System.out.println("--------test Identify---------");
+ //System.out.print(result);
}
- public void testListSet() {
+ public void testListSets() {
OAIPMHCommand params=new OAIPMHCommand();
params.setVerb("ListSets");
@@ -115,8 +117,8 @@
ModelAndView mav=controller.ListSets(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- System.out.println("---------test ListSet---------");
- System.out.print(result);
+ //System.out.println("---------test ListSet---------");
+ //System.out.print(result);
}
@@ -131,8 +133,8 @@
ModelAndView mav=controller.ListMetadataFormats(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- System.out.println("---------test ListMetadataFormats---------");
- System.out.print(result);
+ //System.out.println("---------test ListMetadataFormats---------");
+ //System.out.print(result);
}
@@ -148,12 +150,12 @@
ModelAndView mav=controller.GetRecord(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- System.out.println("---------test getRecord---------");
- System.out.print(result);
+ //System.out.println("---------test getRecord---------");
+ //System.out.print(result);
}
-public void testListRecord() {
+public void testListRecords() {
OAIPMHCommand params=new OAIPMHCommand();
params.setVerb("ListRecords");
@@ -171,22 +173,74 @@
}
-public void testListIdentify() {
+ public void testListIdentifiers()
+ {
- OAIPMHCommand params=new OAIPMHCommand();
- params.setVerb("ListIdentifiers");
- params.setFrom("2005-11-15T06:16:15Z");
- params.setUntil("2006-05-15T06:16:15Z");
- params.setMetadataPrefix("oai_dc");
- Map model=new HashMap();
- model.put("identify",identify );
- model.put("params", params);
- ModelAndView mav=controller.ListIdentifiers(params, model);
- String result=vu.runTemplate(mav);
- this.assertNotNull(result);
- //System.out.println("---------test ListIdentifiers---------");
- //System.out.print(result);
+ OAIPMHCommand params=new OAIPMHCommand();
+ params.setVerb("ListIdentifiers");
+ params.setFrom("2005-11-15T06:16:15Z");
+ params.setUntil("2006-05-15T06:16:15Z");
+ params.setMetadataPrefix("oai_dc");
+ Map model=new HashMap();
+ model.put("identify",identify );
+ model.put("params", params);
+ ModelAndView mav=controller.ListIdentifiers(params, model);
+ String result=vu.runTemplate(mav);
+ this.assertNotNull(result);
+ //System.out.println("---------test ListIdentifiers---------");
+ //System.out.print(result);
-}
+ }
+
+ public void testHandle() throws Exception
+ {
+ OAIPMHCommand params=new OAIPMHCommand();
+ ModelAndView mav=call(params);
+ System.out.println(mav.getViewName()+" "
+ +mav.getModel().get("error_code")
+ +": "+mav.getModel().get("error"));
+ this.assertEquals("error.vm", mav.getViewName());
+
+ params.setVerb("Identify");
+ mav=call(params);
+ this.assertEquals("Identify.vm", mav.getViewName());
+
+ params.setVerb("ListSets");
+ mav=call(params);
+ System.out.println(mav.getViewName()+" "
+ +mav.getModel().get("error_code")
+ +": "+mav.getModel().get("error"));
+ this.assertEquals("error.vm", mav.getViewName());
+
+ params.setVerb("ListMetadataFormats");
+ mav=call(params);
+ this.assertEquals("ListMetadataFormats.vm", mav.getViewName());
+
+ params.setVerb("GetRecord");
+ params.setIdentifier("treebase.org/study/TB2:s1225");
+ params.setMetadataPrefix("oai_dc");
+ mav=call(params);
+ this.assertEquals("GetRecord.vm", mav.getViewName());
+
+ params.setVerb("ListIdentifiers");
+ params.setFrom("2005-11-15T06:16:15Z");
+ params.setUntil("2006-05-15T06:16:15Z");
+ mav=call(params);
+ this.assertEquals("oai_dc_ListIdentifiers.vm", mav.getViewName());
+
+ params.setVerb("ListRecords");
+ params.setFrom("2005-11-15T06:16:15Z");
+ params.setUntil("2006-05-15T06:16:15Z");
+ mav=call(params);
+ this.assertEquals("ListRecords.vm", mav.getViewName());
+ }
+
+
+
+ private ModelAndView call(OAIPMHCommand params) throws Exception
+ {
+ ModelAndView mav=controller.handle(null, null, params, new BindException(params,"params"));
+ return mav;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2009-11-17 17:18:52
|
Bugs item #2899241, was opened at 2009-11-17 17:18 Message generated for change (Tracker Item Submitted) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2899241&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: performance Group: None Status: Open Priority: 9 Private: No Submitted By: Rutger Vos (rvos) Assigned to: Rutger Vos (rvos) Summary: Performance checking Initial Comment: Goal: to develop, implement and execute a strategy for recording performance differences (if any) between DB2 and PostgreSQL. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2899241&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-17 17:17:39
|
Bugs item #2899240, was opened at 2009-11-17 17:17 Message generated for change (Tracker Item Submitted) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2899240&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 9 Private: No Submitted By: Rutger Vos (rvos) Assigned to: Rutger Vos (rvos) Summary: Data consistency checking Initial Comment: Goal: to develop, implement and execute a strategy for ascertaining that all old data has been imported and is consistent. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2899240&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-17 17:06:33
|
Bugs item #2797430, was opened at 2009-05-27 15:08 Message generated for change (Settings changed) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2797430&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open >Priority: 9 Private: No Submitted By: Mark Dominus (mjdominus) Assigned to: Nobody/Anonymous (nobody) Summary: Password hashing Initial Comment: Passwords are stored in the USER table of the database in plain text. They should be hashed instead. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2797430&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-17 17:03:46
|
Bugs item #2897427, was opened at 2009-11-13 20:09 Message generated for change (Comment added) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2897427&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Cannot create new submission Initial Comment: When I try to create a new submission in the nescent-dev build, I get a data access failure. (below) ================== Data Access Failure Could not execute JDBC batch update; nested exception is org.hibernate.exception.ConstraintViolationException: Could not execute JDBC batch update org.springframework.dao.DataIntegrityViolationException: Could not execute JDBC batch update; nest ... [etc] ---------------------------------------------------------------------- >Comment By: Rutger Vos (rvos) Date: 2009-11-17 17:03 Message: I think this is due to the fact that EhCache (the plug in that caches stuff before committing) can't write its files to /tmp. This also affects searching, but clearly not in the same way. I have filed this as a support request to nescent, hopefully they can sort this out. ---------------------------------------------------------------------- Comment By: Rutger Vos (rvos) Date: 2009-11-17 17:03 Message: Thanks for reporting this bug. We'll look into it as soon as possible. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2897427&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-17 17:01:27
|
Bugs item #2896035, was opened at 2009-11-11 16:38 Message generated for change (Comment added) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896035&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None >Status: Closed Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) >Assigned to: Rutger Vos (rvos) Summary: Sort List causes Exception Initial Comment: This is based on the http://treebasedb-dev.nescent.org:6666/treebase-web/home.html implementation. Type in "Donoghue", search by author name, and then try to sort the resulting list. The result encounters an uncaught exception. This needs fixing before release. ---------------------------------------------------------------------- >Comment By: Rutger Vos (rvos) Date: 2009-11-17 17:01 Message: This bug has been resolved as per revision 275. What happened was that the plug in that sorts tables reconstitutes the QUERY_STRING, including the - possibly empty - CQL query. That empty CQL query was then passed to the CQL parser, which choked. The handler is now more strict and skips over empty-but-defined CQL queries. ---------------------------------------------------------------------- Comment By: Rutger Vos (rvos) Date: 2009-11-17 17:01 Message: Your bug has been resolved. Thanks for the report. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896035&group_id=248804 |
|
From: <rv...@us...> - 2009-11-17 16:55:16
|
Revision: 275
http://treebase.svn.sourceforge.net/treebase/?rev=275&view=rev
Author: rvos
Date: 2009-11-17 16:55:09 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
Added test to skip over not just query variables that are null, but also those that are "empty", as per TreebaseUtil.isEmpty(query), i.e. those that are strings such as "", which can happen when the $QUERY_STRING is reconstituted automatically and appended to the current URL.
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2009-11-17 16:47:32 UTC (rev 274)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2009-11-17 16:55:09 UTC (rev 275)
@@ -19,6 +19,7 @@
import org.apache.log4j.Logger;
import org.cipres.treebase.TreebaseIDString;
+import org.cipres.treebase.TreebaseUtil;
import org.cipres.treebase.TreebaseIDString.MalformedTreebaseIDString;
import org.cipres.treebase.domain.TBPersistable;
import org.cipres.treebase.domain.search.SearchResults;
@@ -396,7 +397,8 @@
HttpServletResponse response, BindException bindException, Map model)
throws Exception {
String query = request.getParameter("query");
- if ( query != null ) {
+ if ( query != null && ! TreebaseUtil.isEmpty(query) ) {
+ LOGGER.info("query is '"+ query +"'");
return this.handleQueryRequest(request, response, bindException);
}
String action = request.getParameter("action");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-17 16:47:48
|
Revision: 274
http://treebase.svn.sourceforge.net/treebase/?rev=274&view=rev
Author: rvos
Date: 2009-11-17 16:47:32 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
Added log line for CQL query
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java 2009-11-17 16:21:50 UTC (rev 273)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java 2009-11-17 16:47:32 UTC (rev 274)
@@ -94,6 +94,7 @@
LOGGER.info("formName is '" + formName + "'");
if ( ! TreebaseUtil.isEmpty(query) && ! query.equals("")) {
+ LOGGER.info("query is '" + query + "'");
return this.handleQueryRequest(request, response, errors);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-17 16:21:58
|
Revision: 273
http://treebase.svn.sourceforge.net/treebase/?rev=273&view=rev
Author: rvos
Date: 2009-11-17 16:21:50 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
Don't handle empty CQL queries.
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java 2009-11-17 16:08:08 UTC (rev 272)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java 2009-11-17 16:21:50 UTC (rev 273)
@@ -93,21 +93,7 @@
LOGGER.info("formName is '" + formName + "'");
- if ( ! TreebaseUtil.isEmpty(query) ) {
- /*
- CQLParser parser = new CQLParser();
- CQLNode root = parser.parse(query);
- root = normalizeParseTree(root);
- Set<Study> queryResults = doCQLQuery(root, new HashSet<Study>(),request, response, errors);
- StudySearchResults tsr = new StudySearchResults(queryResults);
- saveSearchResults(request, tsr);
- if ( TreebaseUtil.isEmpty(request.getParameter("format")) || ! request.getParameter("format").equals("rss1") ) {
- return new ModelAndView("search/studySearch", Constants.RESULT_SET, tsr);
- }
- else {
- return this.searchResultsAsRDF(tsr, request, root);
- }
- */
+ if ( ! TreebaseUtil.isEmpty(query) && ! query.equals("")) {
return this.handleQueryRequest(request, response, errors);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2009-11-17 16:10:09
|
Bugs item #2896032, was opened at 2009-11-11 16:32 Message generated for change (Comment added) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896032&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None >Status: Closed Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) >Assigned to: Rutger Vos (rvos) Summary: Phylowidget Fails to Run Initial Comment: Based on the http://treebasedb-dev.nescent.org:6666/treebase-web/home.html implementation, clicking on any tree to view it in PhyloWidget fails to work. This needs to be fixed before TB2 can be released. ---------------------------------------------------------------------- >Comment By: Rutger Vos (rvos) Date: 2009-11-17 16:10 Message: Fixed. The PhyloWidget.jar was not being copied to the correct location inside the servlet container due to a portability bug in the publish script. This bug has been fixed (as of revision 272), and consequently phylowidget now loads correctly. ---------------------------------------------------------------------- Comment By: Rutger Vos (rvos) Date: 2009-11-17 16:10 Message: Your bug has been resolved. Thanks for the report. ---------------------------------------------------------------------- Comment By: Rutger Vos (rvos) Date: 2009-11-17 16:09 Message: Fixed. The PhyloWidget.jar was not being copied to the correct location inside the servlet container due to a portability bug in the publish script. This bug has been fixed (as of revision 272), and consequently phylowidget now loads correctly. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896032&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-17 16:09:25
|
Bugs item #2896032, was opened at 2009-11-11 16:32 Message generated for change (Comment added) made by rvos You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896032&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Phylowidget Fails to Run Initial Comment: Based on the http://treebasedb-dev.nescent.org:6666/treebase-web/home.html implementation, clicking on any tree to view it in PhyloWidget fails to work. This needs to be fixed before TB2 can be released. ---------------------------------------------------------------------- >Comment By: Rutger Vos (rvos) Date: 2009-11-17 16:09 Message: Fixed. The PhyloWidget.jar was not being copied to the correct location inside the servlet container due to a portability bug in the publish script. This bug has been fixed (as of revision 272), and consequently phylowidget now loads correctly. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896032&group_id=248804 |
|
From: <rv...@us...> - 2009-11-17 16:08:22
|
Revision: 272
http://treebase.svn.sourceforge.net/treebase/?rev=272&view=rev
Author: rvos
Date: 2009-11-17 16:08:08 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
Script used to test whether tomcat was down by calling /usr/bin/GET, changed this to use curl (or a drop-in replacement if needed), which is more portable. For example, /usr/bin/GET was unavailable on treebasedb-dev.nescent.org, because LWP is not installed system-wide
Modified Paths:
--------------
trunk/treebase-core/src/main/perl/misc/publish
Modified: trunk/treebase-core/src/main/perl/misc/publish
===================================================================
--- trunk/treebase-core/src/main/perl/misc/publish 2009-11-17 04:28:48 UTC (rev 271)
+++ trunk/treebase-core/src/main/perl/misc/publish 2009-11-17 16:08:08 UTC (rev 272)
@@ -16,6 +16,12 @@
die '$CATALINA_HOME unset'
fi
+# This used to be hardcoded for /usr/bin/GET, but that requires
+# LWP to be installed system-wide, which is rarer than just
+# having curl somewhere. In any case, the required API for this
+# command is to return a non-zero exit code when attempting to
+# get a URL yields a 404 or other error.
+GETCMD="curl -s -o /dev/null"
WEBAPPS="$CATALINA_HOME/webapps"
TARGET_DIR="treebase-web"
@@ -50,7 +56,7 @@
# Stop the server, and make sure it's dead before proceeding
${CATALINA_HOME}/bin/catalina.sh stop
-if /usr/bin/GET -d $TOMCAT_URL ; then
+if $GETCMD $TOMCAT_URL ; then
die 'Failed to stop tomcat at $TOMCAT_URL'
fi
@@ -68,7 +74,7 @@
# Restart the server, and die if it doesn't start right away
${CATALINA_HOME}/bin/catalina.sh start
sleep 3
-if /usr/bin/GET -d $TOMCAT_URL ; then
+if $GETCMD $TOMCAT_URL ; then
: # okay
else
die 'Failed to restart tomcat at $TOMCAT_URL'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-17 04:29:00
|
Revision: 271
http://treebase.svn.sourceforge.net/treebase/?rev=271&view=rev
Author: youjun
Date: 2009-11-17 04:28:48 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
optimize templates
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
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/ListSets.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.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/ListSets.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/error.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/head.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm
Removed Paths:
-------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/badArgument.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/badVerb.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/cannotDisseminateFormat.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/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/badArgument.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/badVerb.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/cannotDisseminateFormat.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/idDoesNotExist.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java 2009-11-17 04:28:48 UTC (rev 271)
@@ -20,17 +20,27 @@
public void setVerb(String verb) {
this.verb = verb;
}
- public String getFrom() {
+ public String getModifiedFrom() {
if(from!=null&&from.trim()!="")return from;
return "1995-11-04T00:00:00Z";
}
+
+ public String getFrom() {
+ return from;
+ }
+
public void setFrom(String from) {
this.from = from;
}
- public String getUntil() {
+ public String getModifiedUntil() {
if(until != null && until.trim()!="") return until;
return "";
}
+
+ public String getUntil() {
+ return until;
+ }
+
public void setUntil(String until) {
this.until = until;
}
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-17 04:28:48 UTC (rev 271)
@@ -82,21 +82,32 @@
model.put("identify", this.identify);
if(errors.getErrorCount()>0){
- if(errors.hasFieldErrors("metadataPrefix"))
- return new ModelAndView("cannotDisseminateFormat.vm",model);
- if(errors.hasFieldErrors("verb"))
- return new ModelAndView("badVerb.vm",model);
- if(errors.hasFieldErrors("identifier"))
- return new ModelAndView("idDoesNotExist.vm",model);
+ if(errors.hasFieldErrors("metadataPrefix")){
+ model.put("error_code", "cannotDisseminateFormat");
+ model.put("error", "bad metadataPrefix");
+ return new ModelAndView("error.vm",model);
+ }
+ if(errors.hasFieldErrors("verb")){
+ model.put("error_code", "badVerb");
+ model.put("error", "no verb was found");
+ return new ModelAndView("error.vm",model);
+ }
+ if(errors.hasFieldErrors("identifier")){
+ model.put("error_code", "idDoesNotExist");
+ model.put("error", "no id was found");
+ return new ModelAndView("error.vm",model);
+ }
}
Method method=null;
try{
method=this.getClass().getMethod(params.getVerb(), new Class[]{OAIPMHCommand.class, Map.class});
- }catch(NoSuchMethodException nsme){
- return new ModelAndView("badVerb.vm",model);
+ }catch(NoSuchMethodException nsme){
+ model.put("error_code", "badVerb");
+ model.put("error", "invalid verb");
+ return new ModelAndView("error.vm",model);
}catch(NullPointerException e){
- return (new ModelAndView("badArgument.vm",model));
+ return (new ModelAndView("error.vm",model));
}
return (ModelAndView) method.invoke(this, params, model);
@@ -107,14 +118,15 @@
List<Submission> list=null;
try {
- list = (List)submissionService.findSubmissionByCreateDateRange(IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getFrom()),
- IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getUntil()));
+ list = (List)submissionService.findSubmissionByCreateDateRange(IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getModifiedFrom()),
+ IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getModifiedUntil()));
} catch (ParseException e) {
- // TODO Auto-generated catch block
- return (new ModelAndView("badArgument.vm",model));
+ model.put("error_code", "badArgument");
+ model.put("error", "invalid from or until format");
+ return (new ModelAndView("error.vm",model));
}
model.put("recordList", getRecordList(list));
- return (new ModelAndView(params.getMetadataPrefix()+"_ListRecords.vm",model));
+ return (new ModelAndView("ListRecords.vm",model));
}
@@ -123,11 +135,12 @@
List<Submission> list=null;
try {
- list = (List)submissionService.findSubmissionByCreateDateRange(IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getFrom()),
- IdentifyUtil.parseGranularity(identify.getGranularityPattern(), params.getUntil()));
+ list = (List)submissionService.findSubmissionByCreateDateRange(IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getModifiedFrom()),
+ IdentifyUtil.parseGranularity(identify.getGranularityPattern(), params.getModifiedUntil()));
} catch (ParseException e) {
- // TODO Auto-generated catch block
- return (new ModelAndView("badArgument.vm",model));
+ model.put("error_code", "badArgument");
+ model.put("error", "invalid from or until format");
+ return (new ModelAndView("error.vm",model));
}
model.put("recordList", getRecordList(list));
return (new ModelAndView(params.getMetadataPrefix()+"_ListIdentifiers.vm",model));
@@ -142,14 +155,20 @@
long id = IdentifyUtil.parseID(params);
submission = studyService.findByID(id).getSubmission();
}catch(NumberFormatException nfe){
- return (new ModelAndView("badArgument.vm",model));
+ model.put("error_code", "badArgument");
+ model.put("error", "invalid id format");
+ return (new ModelAndView("error.vm",model));
+
}
catch (NullPointerException e){
- return (new ModelAndView("idDoesNotExist.vm",model));
+ model.put("error_code", "idDoesNotExist");
+ model.put("error", "invalid id");
+ return (new ModelAndView("error.vm",model));
+
}
model.put("record", getRecordMap(submission));
- return (new ModelAndView(params.getMetadataPrefix()+"_GetRecord.vm",model));
+ return (new ModelAndView("GetRecord.vm",model));
}
@@ -161,9 +180,10 @@
}
ModelAndView ListSets(OAIPMHCommand params, Map model){
+ model.put("error_code", "noSetHierarchy");
+ model.put("error", "This repository does not support sets");
+ return (new ModelAndView("error.vm",model));
- return (new ModelAndView("ListSets.vm",model));
-
}
ModelAndView ListMetadataFormats(OAIPMHCommand params, Map model){
@@ -174,7 +194,10 @@
long id = IdentifyUtil.parseID(params);
submission = studyService.findByID(id).getSubmission();
}catch(NumberFormatException nfe){
- return (new ModelAndView("badArgument.vm",model));
+ model.put("error_code", "badArgument");
+ model.put("error", "invalid id format");
+ return (new ModelAndView("error.vm",model));
+
}
catch (NullPointerException e){
//id is optional for ListMetadataFormats
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,7 @@
+#parse("head.vm")
+<GetRecord>
+#if($!model.params.metadataPrefix=="oai_dc")
+#parse("oai_dc_record.vm")
+#end
+</GetRecord>
+</OAI-PMH>
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-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,10 +1,4 @@
-<?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="Identify">${model.identify.baseRUL}</request>
+#parse("head.vm")
<Identify>
<repositoryName>${model.identify.repositoryName}</repositoryName>
<baseURL>${model.identify.baseURL}</baseURL>
@@ -26,7 +20,6 @@
<delimiter>${model.identify.identifierDelimiter}</delimiter>
<sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
</oai-identifier>
- </description>
-
+ </description>
</Identify>
</OAI-PMH>
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-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListMetadataFormats.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,12 +1,4 @@
-<?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>
+#parse("head.vm")
<ListMetadataFormats>
<metadataFormat>
<metadataPrefix>oai_dc</metadataPrefix>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListRecords.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,9 @@
+#parse("head.vm")
+<ListRecords>
+#if($!model.params.metadataPrefix=="oai_dc")
+#foreach($record in $model.recordList)
+#parse("oai_dc_record.vm")
+#end
+#end
+</ListRecords>
+</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSets.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSets.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSets.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,10 +1,3 @@
-<?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.responseDate}</responseDate>
- <request verb="ListSets">${model.identify.baseURL}</request>
- <error code="noSetHierarchy">This repository does not
- support sets</error>
+#parse("head.vm")
+ <error code="noSetHierarchy">This repository does not support sets</error>
</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/error.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,3 @@
+#parse("head.vm")
+<error code="$!model.error_code">$!model.error</error>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/head.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,14 @@
+<?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 #if($!model.params.verb)verb="$!model.params.verb" #end
+#if($!model.params.identifier)identifier="$!model.params.identifier" #end
+#if($!model.params.metadataPrefix)metadataPrefix="$!model.params.metadataPrefix" #end
+#if($!model.params.from)from="$!model.params.from" #end
+#if($!model.params.until)until="$!model.params.until" #end
+#if($!model.params.resumptionToken)resumptionToken="$!model.params.resumptionToken" #end
+#if($!model.params.set)set="$!model.params.set" #end>
+$!model.identify.BaseURL</request>
Deleted: 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-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/idDoesNotExist.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1 +0,0 @@
-id not exist
\ No newline at end of file
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,76 +0,0 @@
-<?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="GetRecord" identifier="${model.params.identifier}"
- metadataPrefix="oai_dc">${model.identify.BaseURL}</request>
- <GetRecord>
- <record>
- <header>
- <identifier>${model.record.identifier}</identifier>
- <datestamp>$!model.record.datestamp</datestamp>
- </header>
- <metadata>
- <oai_dc:dc
- xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
- http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- #if($model.record.title)
- <dc:title>${model.record.title}</dc:title>
- #end
- #if($model.record.creator)
- #foreach ($person in $model.record.creator)
- <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
- #end
- #end
- #if($model.record.subject)
- <dc:subject>${model.record.subject}</dc:subject>
- #end
- #if($model.record.description)
- <dc:description>${model.record.description}</dc:description>
- #end
- #if($model.record.publisher)
- <dc:publisher>${model.record.publisher}</dc:publisher>
- #end
- #if($model.record.contributor)
- <dc:contributor>${model.record.contributor}</dc:contributor>
- #end
- #if($model.record.date)
- <dc:date>${model.record.date}</dc:date>
- #end
- #if($model.record.type)
- <dc:type>${model.record.type}</dc:type>
- #end
- #if($model.record.format)
- <dc:format>${model.record.format}</dc:format>
- #end
-
- ##if($model.record.identifier)
- ##<dc:identifier>${model.record.identifier}</dc:identifier>
- ##end
-
- #if($model.record.source)
- <dc:source>{model.record.source}</dc:source>
- #end
- #if($model.record.language)
- <dc:language>${model.record.language}</dc:language>
- #end
- #if($model.record.relation)
- <dc:relation>${model.record.relation}</dc:relation>
- #end
- #if($model.record.coverage)
- <dc:coverage>${model.record.coverage}</dc:coverage>
- #end
- #if($model.record.rights)
- <dc:rights>${model.record.rights}</dc:rights>
- #end
- </oai_dc:dc>
-
- </metadata>
- </record>
- </GetRecord>
-</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,19 +1,10 @@
-<?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="ListIdentifiers" from="${model.params.from}"
- until="$!model.params.until"
- metadataPrefix="${model.params.metadataPrefix}">
- ${model.identify.BaseURL}</request>
- <ListIdentifiers>
- #foreach ( $record in $model.recordList)
- <header>
- <identifier>${record.identifier}</identifier>
- <datestamp>$!record.datestamp</datestamp>
- </header>
- #end
- </ListIdentifiers>
+#parse("head.vm")
+<ListIdentifiers>
+#foreach ( $record in $model.recordList)
+<header>
+<identifier>${record.identifier}</identifier>
+<datestamp>$!record.datestamp</datestamp>
+</header>
+#end
+</ListIdentifiers>
</OAI-PMH>
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,77 +0,0 @@
-<?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="ListRecords" from="${model.params.from}"
- until="${model.params.from}" metadataPrefix="${model.params.metadataPrefix}">
- ${model.identify.BaseURL}</request>
- <ListRecords>
- #foreach ( $record in $model.recordList)
- <record>
- <header>
- <identifier>${record.identifier}</identifier>
- <datestamp>$!record.datestamp</datestamp>
- </header>
- <metadata>
- <oai_dc:dc
- xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
- http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- #if($record.title)
- <dc:title>${record.title}</dc:title>
- #end
- #if($record.creator)
- #foreach ($person in $record.creator)
- <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
- #end
- #end
- #if($record.subject)
- <dc:subject>${record.subject}</dc:subject>
- #end
- #if($record.description)
- <dc:description>${record.description}</dc:description>
- #end
- #if($record.publisher)
- <dc:publisher>${record.publisher}</dc:publisher>
- #end
- #if($record.contributor)
- <dc:contributor>${record.contributor}</dc:contributor>
- #end
- #if($record.date)
- <dc:date>${record.date}</dc:date>
- #end
- #if($record.type)
- <dc:type>${record.type}</dc:type>
- #end
- #if($record.format)
- <dc:format>${record.format}</dc:format>
- #end
- #if($record.identifier)
- <dc:identifier>${record.identifier}</dc:identifier>
- #end
- #if($record.source)
- <dc:source>{record.source}</dc:source>
- #end
- #if($record.language)
- <dc:language>${record.language}</dc:language>
- #end
- #if($record.relation)
- <dc:relation>${record.relation}</dc:relation>
- #end
- #if($record.coverage)
- <dc:coverage>${record.coverage}</dc:coverage>
- #end
- #if($record.rights)
- <dc:rights>${record.rights}</dc:rights>
- #end
- #end
- </oai_dc:dc>
- </metadata>
- </record>
-
- </ListRecords>
-</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_record.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,62 @@
+<record>
+ <header>
+ <identifier>${model.record.identifier}</identifier>
+ <datestamp>$!model.record.datestamp</datestamp>
+ </header>
+ <metadata>
+ <oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
+ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+ #if($model.record.title)
+ <dc:title>${model.record.title}</dc:title>
+ #end
+ #if($model.record.creator)
+ #foreach ($person in $model.record.creator)
+ <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
+ #end
+ #end
+ #if($model.record.subject)
+ <dc:subject>${model.record.subject}</dc:subject>
+ #end
+ #if($model.record.description)
+ <dc:description>${model.record.description}</dc:description>
+ #end
+ #if($model.record.publisher)
+ <dc:publisher>${model.record.publisher}</dc:publisher>
+ #end
+ #if($model.record.contributor)
+ <dc:contributor>${model.record.contributor}</dc:contributor>
+ #end
+ #if($model.record.date)
+ <dc:date>${model.record.date}</dc:date>
+ #end
+ #if($model.record.type)
+ <dc:type>${model.record.type}</dc:type>
+ #end
+ #if($model.record.format)
+ <dc:format>${model.record.format}</dc:format>
+#end
+##if($model.record.identifier)
+##<dc:identifier>${model.record.identifier}</dc:identifier>
+##end
+ #if($model.record.source)
+ <dc:source>{model.record.source}</dc:source>
+ #end
+ #if($model.record.language)
+ <dc:language>${model.record.language}</dc:language>
+ #end
+ #if($model.record.relation)
+ <dc:relation>${model.record.relation}</dc:relation>
+ #end
+ #if($model.record.coverage)
+ <dc:coverage>${model.record.coverage}</dc:coverage>
+ #end
+ #if($model.record.rights)
+ <dc:rights>${model.record.rights}</dc:rights>
+ #end
+ </oai_dc:dc>
+ </metadata>
+ </record>
\ 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-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-17 04:28:48 UTC (rev 271)
@@ -95,7 +95,8 @@
OAIPMHCommand params=new OAIPMHCommand();
params.setVerb("Identify");
Map model=new HashMap();
- model.put("identify",identify );
+ model.put("identify",identify );
+ model.put("params", params);
ModelAndView mav=controller.Identify(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
@@ -109,7 +110,8 @@
OAIPMHCommand params=new OAIPMHCommand();
params.setVerb("ListSets");
Map model=new HashMap();
- model.put("identify",identify );
+ model.put("identify",identify );
+ model.put("params", params);
ModelAndView mav=controller.ListSets(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
@@ -164,8 +166,8 @@
ModelAndView mav=controller.ListRecords(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- System.out.println("---------test ListRecord---------");
- System.out.print(result);
+ //System.out.println("---------test ListRecord---------");
+ //System.out.print(result);
}
@@ -182,8 +184,8 @@
ModelAndView mav=controller.ListIdentifiers(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- System.out.println("---------test ListIdentifiers---------");
- System.out.print(result);
+ //System.out.println("---------test ListIdentifiers---------");
+ //System.out.print(result);
}
Copied: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm (from rev 270, trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm)
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,7 @@
+#parse("head.vm")
+<GetRecord>
+#if($!model.params.metadataPrefix=="oai_dc")
+#parse("oai_dc_record.vm")
+#end
+</GetRecord>
+</OAI-PMH>
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-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/Identify.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,10 +1,4 @@
-<?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="Identify">${model.identify.baseRUL}</request>
+#parse("head.vm")
<Identify>
<repositoryName>${model.identify.repositoryName}</repositoryName>
<baseURL>${model.identify.baseURL}</baseURL>
@@ -26,7 +20,6 @@
<delimiter>${model.identify.identifierDelimiter}</delimiter>
<sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
</oai-identifier>
- </description>
-
+ </description>
</Identify>
</OAI-PMH>
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-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListMetadataFormats.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,12 +1,4 @@
-<?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>
+#parse("head.vm")
<ListMetadataFormats>
<metadataFormat>
<metadataPrefix>oai_dc</metadataPrefix>
Copied: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListRecords.vm (from rev 270, trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm)
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListRecords.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListRecords.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,9 @@
+#parse("head.vm")
+<ListRecords>
+#if($!model.params.metadataPrefix=="oai_dc")
+#foreach($record in $model.recordList)
+#parse("oai_dc_record.vm")
+#end
+#end
+</ListRecords>
+</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSets.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSets.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSets.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,10 +1,3 @@
-<?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.responseDate}</responseDate>
- <request verb="ListSets">${model.identify.baseURL}</request>
- <error code="noSetHierarchy">This repository does not
- support sets</error>
+#parse("head.vm")
+ <error code="noSetHierarchy">This repository does not support sets</error>
</OAI-PMH>
Copied: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/error.vm (from rev 270, trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/cannotDisseminateFormat.vm)
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/error.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/error.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,3 @@
+#parse("head.vm")
+<error code="$!model.error_code">$!model.error</error>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/head.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/head.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/head.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,14 @@
+<?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 #if($!model.params.verb)verb="$!model.params.verb" #end
+#if($!model.params.identifier)identifier="$!model.params.identifier" #end
+#if($!model.params.metadataPrefix)metadataPrefix="$!model.params.metadataPrefix" #end
+#if($!model.params.from)from="$!model.params.from" #end
+#if($!model.params.until)until="$!model.params.until" #end
+#if($!model.params.resumptionToken)resumptionToken="$!model.params.resumptionToken" #end
+#if($!model.params.set)set="$!model.params.set" #end>
+$!model.identify.BaseURL</request>
Deleted: 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-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/idDoesNotExist.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1 +0,0 @@
-id not exist
\ No newline at end of file
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,76 +0,0 @@
-<?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="GetRecord" identifier="${model.params.identifier}"
- metadataPrefix="oai_dc">${model.identify.BaseURL}</request>
- <GetRecord>
- <record>
- <header>
- <identifier>${model.record.identifier}</identifier>
- <datestamp>$!model.record.datestamp</datestamp>
- </header>
- <metadata>
- <oai_dc:dc
- xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
- http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- #if($model.record.title)
- <dc:title>${model.record.title}</dc:title>
- #end
- #if($model.record.creator)
- #foreach ($person in $model.record.creator)
- <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
- #end
- #end
- #if($model.record.subject)
- <dc:subject>${model.record.subject}</dc:subject>
- #end
- #if($model.record.description)
- <dc:description>${model.record.description}</dc:description>
- #end
- #if($model.record.publisher)
- <dc:publisher>${model.record.publisher}</dc:publisher>
- #end
- #if($model.record.contributor)
- <dc:contributor>${model.record.contributor}</dc:contributor>
- #end
- #if($model.record.date)
- <dc:date>${model.record.date}</dc:date>
- #end
- #if($model.record.type)
- <dc:type>${model.record.type}</dc:type>
- #end
- #if($model.record.format)
- <dc:format>${model.record.format}</dc:format>
- #end
-
- ##if($model.record.identifier)
- ##<dc:identifier>${model.record.identifier}</dc:identifier>
- ##end
-
- #if($model.record.source)
- <dc:source>{model.record.source}</dc:source>
- #end
- #if($model.record.language)
- <dc:language>${model.record.language}</dc:language>
- #end
- #if($model.record.relation)
- <dc:relation>${model.record.relation}</dc:relation>
- #end
- #if($model.record.coverage)
- <dc:coverage>${model.record.coverage}</dc:coverage>
- #end
- #if($model.record.rights)
- <dc:rights>${model.record.rights}</dc:rights>
- #end
- </oai_dc:dc>
-
- </metadata>
- </record>
- </GetRecord>
-</OAI-PMH>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,19 +1,10 @@
-<?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="ListIdentifiers" from="${model.params.from}"
- until="$!model.params.until"
- metadataPrefix="${model.params.metadataPrefix}">
- ${model.identify.BaseURL}</request>
- <ListIdentifiers>
- #foreach ( $record in $model.recordList)
- <header>
- <identifier>${record.identifier}</identifier>
- <datestamp>$!record.datestamp</datestamp>
- </header>
- #end
- </ListIdentifiers>
+#parse("head.vm")
+<ListIdentifiers>
+#foreach ( $record in $model.recordList)
+<header>
+<identifier>${record.identifier}</identifier>
+<datestamp>$!record.datestamp</datestamp>
+</header>
+#end
+</ListIdentifiers>
</OAI-PMH>
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm 2009-11-16 21:31:12 UTC (rev 270)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -1,77 +0,0 @@
-<?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="ListRecords" from="${model.params.from}"
- until="${model.params.from}" metadataPrefix="${model.params.metadataPrefix}">
- ${model.identify.BaseURL}</request>
- <ListRecords>
- #foreach ( $record in $model.recordList)
- <record>
- <header>
- <identifier>${record.identifier}</identifier>
- <datestamp>$!record.datestamp</datestamp>
- </header>
- <metadata>
- <oai_dc:dc
- xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
- http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- #if($record.title)
- <dc:title>${record.title}</dc:title>
- #end
- #if($record.creator)
- #foreach ($person in $record.creator)
- <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
- #end
- #end
- #if($record.subject)
- <dc:subject>${record.subject}</dc:subject>
- #end
- #if($record.description)
- <dc:description>${record.description}</dc:description>
- #end
- #if($record.publisher)
- <dc:publisher>${record.publisher}</dc:publisher>
- #end
- #if($record.contributor)
- <dc:contributor>${record.contributor}</dc:contributor>
- #end
- #if($record.date)
- <dc:date>${record.date}</dc:date>
- #end
- #if($record.type)
- <dc:type>${record.type}</dc:type>
- #end
- #if($record.format)
- <dc:format>${record.format}</dc:format>
- #end
- #if($record.identifier)
- <dc:identifier>${record.identifier}</dc:identifier>
- #end
- #if($record.source)
- <dc:source>{record.source}</dc:source>
- #end
- #if($record.language)
- <dc:language>${record.language}</dc:language>
- #end
- #if($record.relation)
- <dc:relation>${record.relation}</dc:relation>
- #end
- #if($record.coverage)
- <dc:coverage>${record.coverage}</dc:coverage>
- #end
- #if($record.rights)
- <dc:rights>${record.rights}</dc:rights>
- #end
- #end
- </oai_dc:dc>
- </metadata>
- </record>
-
- </ListRecords>
-</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_record.vm 2009-11-17 04:28:48 UTC (rev 271)
@@ -0,0 +1,62 @@
+<record>
+ <header>
+ <identifier>${model.record.identifier}</identifier>
+ <datestamp>$!model.record.datestamp</datestamp>
+ </header>
+ <metadata>
+ <oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
+ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+ #if($model.record.title)
+ <dc:title>${model.record.title}</dc:title>
+ #end
+ #if($model.record.creator)
+ #foreach ($person in $model.record.creator)
+ <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
+ #end
+ #end
+ #if($model.record.subject)
+ <dc:subject>${model.record.subject}</dc:subject>
+ #end
+ #if($model.record.description)
+ <dc:description>${model.record.description}</dc:description>
+ #end
+ #if($model.record.publisher)
+ <dc:publisher>${model.record.publisher}</dc:publisher>
+ #end
+ #if($model.record.contributor)
+ <dc:contributor>${model.record.contributor}</dc:contributor>
+ #end
+ #if($model.record.date)
+ <dc:date>${model.record.date}</dc:date>
+ #end
+ #if($model.record.type)
+ <dc:type>${model.record.type}</dc:type>
+ #end
+ #if($model.record.format)
+ <dc:format>${model.record.format}</dc:format>
+#end
+##if($model.record.identifier)
+##<dc:identifier>${model.record.identifier}</dc:identifier>
+##end
+ #if($model.record.source)
+ <dc:source>{model.record.source}</dc:source>
+ #end
+ #if($model.record.language)
+ <dc:language>${model.record.language}</dc:language>
+ #end
+ #if($model.record.relation)
+ <dc:relation>${model.record.relation}</dc:relation>
+ #end
+ #if($model.record.coverage)
+ <dc:coverage>${model.record.coverage}</dc:coverage>
+ #end
+ #if($model.record.rights)
+ <dc:rights>${model.record.rights}</dc:rights>
+ #end
+ </oai_dc:dc>
+ </metadata>
+ </record>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-16 21:31:20
|
Revision: 270
http://treebase.svn.sourceforge.net/treebase/?rev=270&view=rev
Author: youjun
Date: 2009-11-16 21:31:12 +0000 (Mon, 16 Nov 2009)
Log Message:
-----------
add OAIPMHValidator
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.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/top-servlet.xml
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/top-servlet.xml
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java 2009-11-15 21:14:10 UTC (rev 269)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/OAIPMHCommand.java 2009-11-16 21:31:12 UTC (rev 270)
@@ -1,5 +1,9 @@
package org.treebase.oai.web.command;
-
+/**
+ *
+ * @author youjun
+ * class transfer page/query input data to controller
+ */
public class OAIPMHCommand {
private String from;
@@ -17,13 +21,15 @@
this.verb = verb;
}
public String getFrom() {
- return from;
+ if(from!=null&&from.trim()!="")return from;
+ return "1995-11-04T00:00:00Z";
}
public void setFrom(String from) {
this.from = from;
}
public String getUntil() {
- return until;
+ if(until != null && until.trim()!="") return until;
+ return "";
}
public void setUntil(String until) {
this.until = until;
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-15 21:14:10 UTC (rev 269)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-16 21:31:12 UTC (rev 270)
@@ -80,18 +80,20 @@
Map model=errors.getModel();
model.put("requestParams", params);
model.put("identify", this.identify);
+
+ if(errors.getErrorCount()>0){
+ if(errors.hasFieldErrors("metadataPrefix"))
+ return new ModelAndView("cannotDisseminateFormat.vm",model);
+ if(errors.hasFieldErrors("verb"))
+ return new ModelAndView("badVerb.vm",model);
+ if(errors.hasFieldErrors("identifier"))
+ return new ModelAndView("idDoesNotExist.vm",model);
+ }
-
Method method=null;
-
- if(IdentifyUtil.badMetadataPrefix(params))
-
- return new ModelAndView("cannotDisseminateFormat.vm",model);
-
try{
method=this.getClass().getMethod(params.getVerb(), new Class[]{OAIPMHCommand.class, Map.class});
- }catch(NoSuchMethodException nsme){
-
+ }catch(NoSuchMethodException nsme){
return new ModelAndView("badVerb.vm",model);
}catch(NullPointerException e){
return (new ModelAndView("badArgument.vm",model));
@@ -175,8 +177,8 @@
return (new ModelAndView("badArgument.vm",model));
}
catch (NullPointerException e){
-
- return (new ModelAndView("idDoesNotExist.vm",model));
+ //id is optional for ListMetadataFormats
+ //return (new ModelAndView("idDoesNotExist.vm",model));
}
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-15 21:14:10 UTC (rev 269)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java 2009-11-16 21:31:12 UTC (rev 270)
@@ -14,18 +14,8 @@
* @author youjun
*
*/
-public class IdentifyUtil {
-
- // check if the MetadataPrefix in the params is supported by the service
+public class IdentifyUtil {
- public static boolean badMetadataPrefix(OAIPMHCommand params){
- if (params.getMetadataPrefix().toLowerCase()=="oai_dc")
- return false;
- if (params.getMetadataPrefix().toLowerCase()=="dryad")
- return false;
- return true;
- }
-
// return a studyID by parsing params.identifier
public static long parseID(OAIPMHCommand params)
@@ -40,7 +30,7 @@
public static Date parseGranularity(String granularity, String time ) throws ParseException
{
-
+ if(time=="")return new Date();
SimpleDateFormat sdf = new SimpleDateFormat(granularity);
Date utcDate = sdf.parse(time);
return utcToLocal(utcDate);
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java 2009-11-16 21:31:12 UTC (rev 270)
@@ -0,0 +1,32 @@
+package org.treebase.oai.web.validator;
+
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import org.springframework.validation.Validator;
+import org.treebase.oai.web.command.OAIPMHCommand;
+
+public class OAIPMHValidator implements Validator {
+
+ public boolean supports(Class pClass) {
+ return OAIPMHCommand.class.equals(pClass);
+ }
+
+ public void validate(Object pValidatable, Errors pError) {
+ // ValidationUtils.rejectIfEmpty(e, "name", "name.empty");
+ OAIPMHCommand command = (OAIPMHCommand) pValidatable;
+ String verb = command.getVerb().trim();
+ String fPrefix = command.getMetadataPrefix().trim();
+
+ ValidationUtils.rejectIfEmptyOrWhitespace(pError, "verb", "empyt verb");
+ if(verb=="GetRecord")
+ ValidationUtils.rejectIfEmptyOrWhitespace(pError, "identifier", "empyt id");
+
+ // check format prefix
+
+ if(verb=="GetRecord"||verb=="ListIdentifiers"||verb=="ListRecords")
+ if(fPrefix!="oai_dc"&fPrefix!="dryad")
+ pError.rejectValue("metadataPrefix","cannotDisseminateFormat");
+
+ }
+
+}
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml 2009-11-15 21:14:10 UTC (rev 269)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml 2009-11-16 21:31:12 UTC (rev 270)
@@ -26,6 +26,9 @@
<property name="submissionService"><ref bean="submissionService"></ref></property>
<property name="studyService"><ref bean="studyService"></ref></property>
<property name="identify"><ref bean="top.identify"></ref></property>
+ <property name="validator">
+ <bean class="org.treebase.oai.web.validator.OAIPMHValidator"/>
+ </property>
</bean>
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/top-servlet.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/top-servlet.xml 2009-11-15 21:14:10 UTC (rev 269)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/top-servlet.xml 2009-11-16 21:31:12 UTC (rev 270)
@@ -26,6 +26,9 @@
<property name="submissionService"><ref bean="submissionService"></ref></property>
<property name="studyService"><ref bean="studyService"></ref></property>
<property name="identify"><ref bean="top.identify"></ref></property>
+ <property name="validator">
+ <bean class="org.treebase.oai.web.validator.OAIPMHValidator"/>
+ </property>
</bean>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-15 21:14:19
|
Revision: 269
http://treebase.svn.sourceforge.net/treebase/?rev=269&view=rev
Author: youjun
Date: 2009-11-15 21:14:10 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
add unit and integration test
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
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/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.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.controller.OAIPMHControllerTest.txt
trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/org.treebase.oai.web.util.IdentifyUtilTest.txt
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSets.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSets.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/ListSets.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/oai_dc_GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/oai_dc_GetRecords.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/oai_dc_ListIdentifiers.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/oai_dc_ListRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/oai_dc_ListRecords.vm
Removed Paths:
-------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/GetRecord.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/test/resources/GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/GetRecord.vm
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-13 21:11:22 UTC (rev 268)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-15 21:14:10 UTC (rev 269)
@@ -2,6 +2,7 @@
import java.lang.reflect.Method;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -16,6 +17,8 @@
import org.treebase.oai.web.command.OAIPMHCommand;
import org.treebase.oai.web.util.IdentifyUtil;
import org.cipres.treebase.domain.admin.Person;
+import org.cipres.treebase.domain.study.ArticleCitation;
+import org.cipres.treebase.domain.study.BookCitation;
import org.cipres.treebase.domain.study.Citation;
import org.cipres.treebase.domain.study.Study;
import org.cipres.treebase.domain.study.Submission;
@@ -98,7 +101,7 @@
}
- ModelAndView ListRecoed(OAIPMHCommand params, Map model){
+ ModelAndView ListRecords(OAIPMHCommand params, Map model){
List<Submission> list=null;
try {
@@ -109,7 +112,7 @@
return (new ModelAndView("badArgument.vm",model));
}
model.put("recordList", getRecordList(list));
- return (new ModelAndView(params.getMetadataPrefix()+"_ListRecoed.vm",model));
+ return (new ModelAndView(params.getMetadataPrefix()+"_ListRecords.vm",model));
}
@@ -155,9 +158,9 @@
}
- ModelAndView ListSet(OAIPMHCommand params, Map model){
+ ModelAndView ListSets(OAIPMHCommand params, Map model){
- return (new ModelAndView("ListSet.vm",model));
+ return (new ModelAndView("ListSets.vm",model));
}
@@ -184,28 +187,52 @@
private Map getRecordMap(Submission submission){
- Map<String, String> map= new HashMap<String, String>();
+ Map map= new HashMap();
- Person submitter=submission.getSubmitter().getPerson();
- Citation citation=submission.getStudy().getCitation();
- Study study=submission.getStudy();
+ Study study=submission.getStudy();
+ Citation citation=study.getCitation();
+ String publisher=null;
+ //System.out.println("ctype: "+citation.getCitationType());
+ if(citation.getCitationType().toUpperCase().contains("BOOK"))
+ publisher=((BookCitation)citation).getPublisher();
+ else publisher=((ArticleCitation)citation).getJournal();
+
+ List<Person> authors=citation.getAuthors();
+
+
map.put("title", citation.getTitle());
- map.put("creator", submitter.getFirstName()+" "
- + submitter.getMiddleName()+" "
- + submitter.getLastName());
+ map.put("creator", authors);
map.put("subject", citation.getKeywords());
- map.put("description", study.getName()+" "+study.getNotes());
- map.put("abstract", citation.getAbstract());
- map.put("publisher", citation.());
+ if(study.getName()!=null&study.getNotes()!=null)
+ map.put("description", study.getName()+" "+study.getNotes());
+ else if(study.getNotes()==null)
+ map.put("description",study.getName());
+ else
+ map.put("description",study.getNotes());
+ map.put("publisher", publisher);
+ map.put("date", "published on "+citation.getPublishYear());
+ map.put("identifier", "treebase.org/study/TB2:s"+study.getId());
+ map.put("datestamp", study.getReleaseDate());
+ //map.put("type", "text");
+ //map.put("language", "en");
+ //map.put("issued", citation.getPublishYear());
+ //map.put("abstract", citation.getAbstract());
+
+
return map;
}
- private List getRecordList(List<Submission> slist)
+ private List getRecordList(List<Submission> sList)
{
- return null;
+ List recordList=new ArrayList<Map>();
+
+ for(int i =0; i< sList.size(); i++)
+ recordList.add(getRecordMap(sList.get(i)));
+
+ return recordList;
}
}
Deleted: 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-13 21:11:22 UTC (rev 268)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -1,10 +0,0 @@
-<?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.responseDate}</responseDate>
- <request verb="ListSets">${model.identify.baseURL}</request>
- <error code="noSetHierarchy">This repository does not
- support sets</error>
-</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSets.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSets.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSets.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,10 @@
+<?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.responseDate}</responseDate>
+ <request verb="ListSets">${model.identify.baseURL}</request>
+ <error code="noSetHierarchy">This repository does not
+ support sets</error>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_GetRecord.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,76 @@
+<?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="GetRecord" identifier="${model.params.identifier}"
+ metadataPrefix="oai_dc">${model.identify.BaseURL}</request>
+ <GetRecord>
+ <record>
+ <header>
+ <identifier>${model.record.identifier}</identifier>
+ <datestamp>$!model.record.datestamp</datestamp>
+ </header>
+ <metadata>
+ <oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
+ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+ #if($model.record.title)
+ <dc:title>${model.record.title}</dc:title>
+ #end
+ #if($model.record.creator)
+ #foreach ($person in $model.record.creator)
+ <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
+ #end
+ #end
+ #if($model.record.subject)
+ <dc:subject>${model.record.subject}</dc:subject>
+ #end
+ #if($model.record.description)
+ <dc:description>${model.record.description}</dc:description>
+ #end
+ #if($model.record.publisher)
+ <dc:publisher>${model.record.publisher}</dc:publisher>
+ #end
+ #if($model.record.contributor)
+ <dc:contributor>${model.record.contributor}</dc:contributor>
+ #end
+ #if($model.record.date)
+ <dc:date>${model.record.date}</dc:date>
+ #end
+ #if($model.record.type)
+ <dc:type>${model.record.type}</dc:type>
+ #end
+ #if($model.record.format)
+ <dc:format>${model.record.format}</dc:format>
+ #end
+
+ ##if($model.record.identifier)
+ ##<dc:identifier>${model.record.identifier}</dc:identifier>
+ ##end
+
+ #if($model.record.source)
+ <dc:source>{model.record.source}</dc:source>
+ #end
+ #if($model.record.language)
+ <dc:language>${model.record.language}</dc:language>
+ #end
+ #if($model.record.relation)
+ <dc:relation>${model.record.relation}</dc:relation>
+ #end
+ #if($model.record.coverage)
+ <dc:coverage>${model.record.coverage}</dc:coverage>
+ #end
+ #if($model.record.rights)
+ <dc:rights>${model.record.rights}</dc:rights>
+ #end
+ </oai_dc:dc>
+
+ </metadata>
+ </record>
+ </GetRecord>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListIdentifiers.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,19 @@
+<?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="ListIdentifiers" from="${model.params.from}"
+ until="$!model.params.until"
+ metadataPrefix="${model.params.metadataPrefix}">
+ ${model.identify.BaseURL}</request>
+ <ListIdentifiers>
+ #foreach ( $record in $model.recordList)
+ <header>
+ <identifier>${record.identifier}</identifier>
+ <datestamp>$!record.datestamp</datestamp>
+ </header>
+ #end
+ </ListIdentifiers>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/oai_dc_ListRecords.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,77 @@
+<?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="ListRecords" from="${model.params.from}"
+ until="${model.params.from}" metadataPrefix="${model.params.metadataPrefix}">
+ ${model.identify.BaseURL}</request>
+ <ListRecords>
+ #foreach ( $record in $model.recordList)
+ <record>
+ <header>
+ <identifier>${record.identifier}</identifier>
+ <datestamp>$!record.datestamp</datestamp>
+ </header>
+ <metadata>
+ <oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
+ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+ #if($record.title)
+ <dc:title>${record.title}</dc:title>
+ #end
+ #if($record.creator)
+ #foreach ($person in $record.creator)
+ <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
+ #end
+ #end
+ #if($record.subject)
+ <dc:subject>${record.subject}</dc:subject>
+ #end
+ #if($record.description)
+ <dc:description>${record.description}</dc:description>
+ #end
+ #if($record.publisher)
+ <dc:publisher>${record.publisher}</dc:publisher>
+ #end
+ #if($record.contributor)
+ <dc:contributor>${record.contributor}</dc:contributor>
+ #end
+ #if($record.date)
+ <dc:date>${record.date}</dc:date>
+ #end
+ #if($record.type)
+ <dc:type>${record.type}</dc:type>
+ #end
+ #if($record.format)
+ <dc:format>${record.format}</dc:format>
+ #end
+ #if($record.identifier)
+ <dc:identifier>${record.identifier}</dc:identifier>
+ #end
+ #if($record.source)
+ <dc:source>{record.source}</dc:source>
+ #end
+ #if($record.language)
+ <dc:language>${record.language}</dc:language>
+ #end
+ #if($record.relation)
+ <dc:relation>${record.relation}</dc:relation>
+ #end
+ #if($record.coverage)
+ <dc:coverage>${record.coverage}</dc:coverage>
+ #end
+ #if($record.rights)
+ <dc:rights>${record.rights}</dc:rights>
+ #end
+ #end
+ </oai_dc:dc>
+ </metadata>
+ </record>
+
+ </ListRecords>
+</OAI-PMH>
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-13 21:11:22 UTC (rev 268)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-15 21:14:10 UTC (rev 269)
@@ -11,14 +11,14 @@
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
+import org.springframework.test.AbstractTransactionalSpringContextTests;
import org.springframework.web.servlet.ModelAndView;
import org.treebase.oai.web.command.Identify;
import org.treebase.oai.web.command.OAIPMHCommand;
-public class OAIPMHControllerTest extends AbstractDependencyInjectionSpringContextTests {
+public class OAIPMHControllerTest extends AbstractTransactionalSpringContextTests {
@@ -107,10 +107,10 @@
public void testListSet() {
OAIPMHCommand params=new OAIPMHCommand();
- params.setVerb("ListSet");
+ params.setVerb("ListSets");
Map model=new HashMap();
model.put("identify",identify );
- ModelAndView mav=controller.ListSet(params, model);
+ ModelAndView mav=controller.ListSets(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
System.out.println("---------test ListSet---------");
@@ -138,16 +138,53 @@
OAIPMHCommand params=new OAIPMHCommand();
params.setVerb("ListMetadataFormats");
- params.setIdentifier("treebase.org/study/TB2:s169");
+ params.setIdentifier("treebase.org/study/TB2:s1225");
params.setMetadataPrefix("oai_dc");
Map model=new HashMap();
model.put("identify",identify );
model.put("params", params);
- ModelAndView mav=controller.ListMetadataFormats(params, model);
+ ModelAndView mav=controller.GetRecord(params, model);
String result=vu.runTemplate(mav);
this.assertNotNull(result);
- System.out.println("---------test ListMetadataFormats---------");
+ System.out.println("---------test getRecord---------");
System.out.print(result);
}
+
+public void testListRecord() {
+
+ OAIPMHCommand params=new OAIPMHCommand();
+ params.setVerb("ListRecords");
+ params.setFrom("2005-11-15T06:16:15Z");
+ params.setUntil("2006-05-15T06:16:15Z");
+ params.setMetadataPrefix("oai_dc");
+ Map model=new HashMap();
+ model.put("identify",identify );
+ model.put("params", params);
+ ModelAndView mav=controller.ListRecords(params, model);
+ String result=vu.runTemplate(mav);
+ this.assertNotNull(result);
+ System.out.println("---------test ListRecord---------");
+ System.out.print(result);
+
+ }
+
+public void testListIdentify() {
+
+ OAIPMHCommand params=new OAIPMHCommand();
+ params.setVerb("ListIdentifiers");
+ params.setFrom("2005-11-15T06:16:15Z");
+ params.setUntil("2006-05-15T06:16:15Z");
+ params.setMetadataPrefix("oai_dc");
+ Map model=new HashMap();
+ model.put("identify",identify );
+ model.put("params", params);
+ ModelAndView mav=controller.ListIdentifiers(params, model);
+ String result=vu.runTemplate(mav);
+ this.assertNotNull(result);
+ System.out.println("---------test ListIdentifiers---------");
+ System.out.print(result);
+
}
+
+}
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm 2009-11-13 21:11:22 UTC (rev 268)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -1,41 +0,0 @@
-<?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="GetRecord" identifier="${model.params.identifier}"
- metadataPrefix="oai_dc">${model.identify.BaseURL}</request>
- <GetRecord>
- <record>
- <header>
- <identifier>${model.params.identifier}</identifier>
- <datestamp>${model.record.getCreateDate()}</datestamp>
- </header>
- <metadata>
- <oai_dc:dc
- xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
- http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- <dc:title>${.getStudy().getCitation().getTitle()}</dc:title>
- <dc:creator></dc:creator>
- <dc:subject>Digital Libraries</dc:subject>
- <dc:description>With the increasing technical sophistication of
- both information consumers and providers, there is
- increasing demand for more meaningful experiences of digital
- information. We present a framework that separates digital
- object experience, or rendering, from digital object storage
- and manipulation, so the rendering can be tailored to
- particular communities of users.
- </dc:description>
- <dc:description>Comment: 23 pages including 2 appendices,
- 8 figures</dc:description>
- <dc:date>2001-12-14</dc:date>
- </oai_dc:dc>
-<!\x97 some missing field here like keyword etc see NESCent schema -->
- </metadata>
- </record>
- </GetRecord>
-</OAI-PMH>
Deleted: 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-13 21:11:22 UTC (rev 268)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -1,10 +0,0 @@
-<?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.responseDate}</responseDate>
- <request verb="ListSets">${model.identify.baseURL}</request>
- <error code="noSetHierarchy">This repository does not
- support sets</error>
-</OAI-PMH>
Copied: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSets.vm (from rev 268, trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm)
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSets.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSets.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,10 @@
+<?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.responseDate}</responseDate>
+ <request verb="ListSets">${model.identify.baseURL}</request>
+ <error code="noSetHierarchy">This repository does not
+ support sets</error>
+</OAI-PMH>
Copied: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm (from rev 268, trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm)
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_GetRecord.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,76 @@
+<?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="GetRecord" identifier="${model.params.identifier}"
+ metadataPrefix="oai_dc">${model.identify.BaseURL}</request>
+ <GetRecord>
+ <record>
+ <header>
+ <identifier>${model.record.identifier}</identifier>
+ <datestamp>$!model.record.datestamp</datestamp>
+ </header>
+ <metadata>
+ <oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
+ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+ #if($model.record.title)
+ <dc:title>${model.record.title}</dc:title>
+ #end
+ #if($model.record.creator)
+ #foreach ($person in $model.record.creator)
+ <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
+ #end
+ #end
+ #if($model.record.subject)
+ <dc:subject>${model.record.subject}</dc:subject>
+ #end
+ #if($model.record.description)
+ <dc:description>${model.record.description}</dc:description>
+ #end
+ #if($model.record.publisher)
+ <dc:publisher>${model.record.publisher}</dc:publisher>
+ #end
+ #if($model.record.contributor)
+ <dc:contributor>${model.record.contributor}</dc:contributor>
+ #end
+ #if($model.record.date)
+ <dc:date>${model.record.date}</dc:date>
+ #end
+ #if($model.record.type)
+ <dc:type>${model.record.type}</dc:type>
+ #end
+ #if($model.record.format)
+ <dc:format>${model.record.format}</dc:format>
+ #end
+
+ ##if($model.record.identifier)
+ ##<dc:identifier>${model.record.identifier}</dc:identifier>
+ ##end
+
+ #if($model.record.source)
+ <dc:source>{model.record.source}</dc:source>
+ #end
+ #if($model.record.language)
+ <dc:language>${model.record.language}</dc:language>
+ #end
+ #if($model.record.relation)
+ <dc:relation>${model.record.relation}</dc:relation>
+ #end
+ #if($model.record.coverage)
+ <dc:coverage>${model.record.coverage}</dc:coverage>
+ #end
+ #if($model.record.rights)
+ <dc:rights>${model.record.rights}</dc:rights>
+ #end
+ </oai_dc:dc>
+
+ </metadata>
+ </record>
+ </GetRecord>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListIdentifiers.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,19 @@
+<?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="ListIdentifiers" from="${model.params.from}"
+ until="$!model.params.until"
+ metadataPrefix="${model.params.metadataPrefix}">
+ ${model.identify.BaseURL}</request>
+ <ListIdentifiers>
+ #foreach ( $record in $model.recordList)
+ <header>
+ <identifier>${record.identifier}</identifier>
+ <datestamp>$!record.datestamp</datestamp>
+ </header>
+ #end
+ </ListIdentifiers>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/oai_dc_ListRecords.vm 2009-11-15 21:14:10 UTC (rev 269)
@@ -0,0 +1,77 @@
+<?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="ListRecords" from="${model.params.from}"
+ until="${model.params.from}" metadataPrefix="${model.params.metadataPrefix}">
+ ${model.identify.BaseURL}</request>
+ <ListRecords>
+ #foreach ( $record in $model.recordList)
+ <record>
+ <header>
+ <identifier>${record.identifier}</identifier>
+ <datestamp>$!record.datestamp</datestamp>
+ </header>
+ <metadata>
+ <oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
+ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+ #if($record.title)
+ <dc:title>${record.title}</dc:title>
+ #end
+ #if($record.creator)
+ #foreach ($person in $record.creator)
+ <dc:creator>${person.lastName}, ${person.firstName}</dc:creator>
+ #end
+ #end
+ #if($record.subject)
+ <dc:subject>${record.subject}</dc:subject>
+ #end
+ #if($record.description)
+ <dc:description>${record.description}</dc:description>
+ #end
+ #if($record.publisher)
+ <dc:publisher>${record.publisher}</dc:publisher>
+ #end
+ #if($record.contributor)
+ <dc:contributor>${record.contributor}</dc:contributor>
+ #end
+ #if($record.date)
+ <dc:date>${record.date}</dc:date>
+ #end
+ #if($record.type)
+ <dc:type>${record.type}</dc:type>
+ #end
+ #if($record.format)
+ <dc:format>${record.format}</dc:format>
+ #end
+ #if($record.identifier)
+ <dc:identifier>${record.identifier}</dc:identifier>
+ #end
+ #if($record.source)
+ <dc:source>{record.source}</dc:source>
+ #end
+ #if($record.language)
+ <dc:language>${record.language}</dc:language>
+ #end
+ #if($record.relation)
+ <dc:relation>${record.relation}</dc:relation>
+ #end
+ #if($record.coverage)
+ <dc:coverage>${record.coverage}</dc:coverage>
+ #end
+ #if($record.rights)
+ <dc:rights>${record.rights}</dc:rights>
+ #end
+ #end
+ </oai_dc:dc>
+ </metadata>
+ </record>
+
+ </ListRecords>
+</OAI-PMH>
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-13 21:11:22 UTC (rev 268)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-15 21:14:10 UTC (rev 269)
@@ -1,105 +1,98 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.062" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
+<testsuite failures="0" time="0.031" 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"/>
+ <property name="localRepository" value="C:\Documents and Settings\youjun\.m2\repository"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.management.compiler" value="HotSpot Client Compiler"/>
<property name="env.PROMPT" value="$P$G"/>
<property name="os.name" value="Windows XP"/>
<property name="env.FP_NO_HOST_CHECK" value="NO"/>
- <property name="sun.boot.class.path" value="C:\Java\sdk\jdk\jre\lib\resources.jar;C:\Java\sdk\jdk\jre\lib\rt.jar;C:\Java\sdk\jdk\jre\lib\sunrsasign.jar;C:\Java\sdk\jdk\jre\lib\jsse.jar;C:\Java\sdk\jdk\jre\lib\jce.jar;C:\Java\sdk\jdk\jre\lib\charsets.jar;C:\Java\sdk\jdk\jre\classes"/>
- <property name="env.COMPUTERNAME" value="YALE-LD6ICZM0YC"/>
+ <property name="sun.boot.class.path" value="C:\Program Files\Java\jre1.6.0_07\lib\resources.jar;C:\Program Files\Java\jre1.6.0_07\lib\rt.jar;C:\Program Files\Java\jre1.6.0_07\lib\sunrsasign.jar;C:\Program Files\Java\jre1.6.0_07\lib\jsse.jar;C:\Program Files\Java\jre1.6.0_07\lib\jce.jar;C:\Program Files\Java\jre1.6.0_07\lib\charsets.jar;C:\Program Files\Java\jre1.6.0_07\classes"/>
+ <property name="env.COMPUTERNAME" value="NEWDELL"/>
<property name="env.ALLUSERSPROFILE" value="C:\Documents and Settings\All Users"/>
<property name="sun.desktop" value="windows"/>
<property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="java.runtime.version" value="1.6.0_16-b01"/>
+ <property name="java.runtime.version" value="1.6.0_07-b06"/>
<property name="env.HOMEPATH" value="\Documents and Settings\youjun"/>
<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\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="sun.boot.library.path" value="C:\Program Files\Java\jre1.6.0_07\bin"/>
+ <property name="classworlds.conf" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3421515046292235680.tmp"/>
+ <property name="java.version" value="1.6.0_07"/>
+ <property name="env.PROCESSOR_IDENTIFIER" value="x86 Family 6 Model 23 Stepping 6, GenuineIntel"/>
<property name="user.timezone" value="America/New_York"/>
- <property name="env.INCLUDE" value="C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\include\;C:\Program Files\Microsoft Visual Studio\VC98\atl\include;C:\Program Files\Microsoft Visual Studio\VC98\mfc\include;C:\Program Files\Microsoft Visual Studio\VC98\include"/>
<property name="env.CLIENTNAME" value="Console"/>
<property name="env.TEMP" value="C:\DOCUME~1\youjun\LOCALS~1\Temp"/>
<property name="sun.arch.data.model" value="32"/>
- <property name="env.AXISCLASSPATH" value="C:\Java\axis-1_2RC2\lib\axis.jar;C:\Java\axis-1_2RC2\lib\commons-discovery.jar;C:\Java\axis-1_2RC2\lib\commons-logging.jar;C:\Java\axis-1_2RC2\lib\jaxrpc.jar;C:\Java\axis-1_2RC2\lib\saaj.jar;C:\Java\axis-1_2RC2\lib\log4j-1.2.8.jar;C:\Java\axis-1_2RC2\lib\xml-apis.jar;C:\Java\axis-1_2RC2\lib\xercesImpl.jar"/>
- <property name="java.endorsed.dirs" value="C:\Java\sdk\jdk\jre\lib\endorsed"/>
- <property name="sun.cpu.isalist" value=""/>
+ <property name="java.endorsed.dirs" value="C:\Program Files\Java\jre1.6.0_07\lib\endorsed"/>
+ <property name="sun.cpu.isalist" value="pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86"/>
<property name="env.HOMEDRIVE" value="C:"/>
- <property name="sun.jnu.encoding" value="Cp1252"/>
+ <property name="sun.jnu.encoding" value="GBK"/>
<property name="file.encoding.pkg" value="sun.io"/>
<property name="file.separator" value="\"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.class.version" value="50.0"/>
<property name="user.country" value="US"/>
- <property name="java.home" value="C:\Java\sdk\jdk\jre"/>
+ <property name="java.home" value="C:\Program Files\Java\jre1.6.0_07"/>
<property name="env.APPDATA" value="C:\Documents and Settings\youjun\Application Data"/>
- <property name="java.vm.info" value="mixed mode"/>
+ <property name="java.vm.info" value="mixed mode, sharing"/>
<property name="env.ComSpec" value="C:\WINDOWS\system32\cmd.exe"/>
<property name="env.OS" value="Windows_NT"/>
<property name="env.CommonProgramFiles" value="C:\Program Files\Common Files"/>
<property name="os.version" value="5.1"/>
<property name="path.separator" value=";"/>
- <property name="java.vm.version" value="14.2-b01"/>
+ <property name="java.vm.version" value="10.0-b23"/>
<property name="user.variant" value=""/>
<property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
- <property name="env.LIB" value="C:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Lib\;C:\Program Files\Microsoft Visual Studio\VC98\mfc\lib;C:\Program Files\Microsoft Visual Studio\VC98\lib"/>
<property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
- <property name="env.JAVA_HOME" value="C:\Java\sdk\jdk\jre\bin"/>
<property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
<property name="env.TMP" value="C:\DOCUME~1\youjun\LOCALS~1\Temp"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
- <property name="env.MSDevDir" value="C:\Program Files\Microsoft Visual Studio\Common\MSDev98"/>
<property name="user.home" value="C:\Documents and Settings\youjun"/>
<property name="env.SESSIONNAME" value="Console"/>
<property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="env.CLASSPATH" value=".;C:\Java\axis-1_2RC2\lib\axis.jar;C:\Java\axis-1_2RC2\lib\commons-discovery.jar;C:\Java\axis-1_2RC2\lib\commons-logging.jar;C:\Java\axis-1_2RC2\lib\jaxrpc.jar;C:\Java\axis-1_2RC2\lib\saaj.jar;C:\Java\axis-1_2RC2\lib\log4j-1.2.8.jar;C:\Java\axis-1_2RC2\lib\xml-apis.jar;C:\Java\axis-1_2RC2\lib\xercesImpl.jar"/>
+ <property name="env.RoxioCentral" value="C:\Program Files\Common Files\Roxio Shared\9.0\Roxio Central33\"/>
<property name="env.NUMBER_OF_PROCESSORS" value="2"/>
- <property name="java.library.path" value="C:\Java\sdk\jdk\jre\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Java\jdk1.5.0_02\bin;C:\Program Files\Common Files\Adobe\AGL;"C:\Program Files\Zone Labs\ZoneAlarm\MailFrontier";C:\Java\sdk5\bin;C:\Java\sdk\bin;C:\Program Files\Microsoft Visual Studio\Common\Tools\WinNT;C:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin;C:\Program Files\Microsoft Visual Studio\Common\Tools;C:\Program Files\Microsoft Visual Studio\VC98\bin"/>
+ <property name="java.library.path" value="C:\Program Files\Java\jre1.6.0_07\bin;.;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI.ACE\;C:\Program Files\Common Files\Roxio Shared\DLLShared\;C:\Program Files\Common Files\Roxio Shared\9.0\DLLShared\;C:\Program Files\Common Files\Adobe\AGL;C:\Program Files\MySQL\MySQL Server 5.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Java\SDK\bin"/>
<property name="java.vendor.url" value="http://java.sun.com/"/>
<property name="java.vm.vendor" value="Sun Microsystems Inc."/>
<property name="maven.home" value="EMBEDDED"/>
<property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="java.class.path" value="/C:/eclipse/jee/plugins/org.maven.ide.components.maven_embedder_2.1.0.20080530-2300/jars/plexus-classworlds-1.2-alpha-12.jar"/>
+ <property name="java.class.path" value="/C:/eclipse/plugins/org.maven.ide.components.maven_embedder_2.1.0.20080530-2300/jars/plexus-classworlds-1.2-alpha-12.jar"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="env.LOGONSERVER" value="\\YALE-LD6ICZM0YC"/>
+ <property name="env.LOGONSERVER" value="\\NEWDELL"/>
<property name="env.windir" value="C:\WINDOWS"/>
<property name="java.vm.specification.version" value="1.0"/>
<property name="env.PROCESSOR_ARCHITECTURE" value="x86"/>
- <property name="m2eclipse.workspace.state" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\workspacestate.properties"/>
- <property name="sun.os.patch.level" value="Service Pack 3"/>
+ <property name="m2eclipse.workspace.state" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\workspacestate.properties"/>
<property name="sun.cpu.endian" value="little"/>
+ <property name="sun.os.patch.level" value="Service Pack 3"/>
+ <property name="surefire.test.class.path" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web\target\test-classes;C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web\target\classes;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring\2.0.7\spring-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\commons-logging\commons-logging\1.1\commons-logging-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\log4j\log4j\1.2.13\log4j-1.2.13.jar;C:\Documents and Settings\youjun\.m2\repository\logkit\logkit\1.0.1\logkit-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\servlet-api\2.4\servlet-api-2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-mock\2.0.7\spring-mock-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\jstl\1.1.2\jstl-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\mail\mail\1.4\mail-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\javax\activation\activation\1.1\activation-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\xalan\xalan\2.7.0\xalan-2.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\xml-apis\xml-apis\1.0.b2\xml-apis-1.0.b2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-beanutils\commons-beanutils\1.7.0\commons-beanutils-1.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\commons-validator\commons-validator\1.1.4\commons-validator-1.1.4.jar;C:\Documents and Settings\youjun\.m2\repository\commons-lang\commons-lang\2.3\commons-lang-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\standard\1.1.2\standard-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\string\1.1.0\string-1.1.0.jar;C:\Documents and Settings\youjun\.m2\repository\struts\struts\1.2.9\struts-1.2.9.jar;C:\Documents and Settings\youjun\.m2\repository\opensymphony\sitemesh\2.3\sitemesh-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\displaytag\displaytag\1.1.1\displaytag-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-collections\commons-collections\3.1\commons-collections-3.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\lowagie\itext\1.3\itext-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\jcl104-over-slf4j\1.4.2\jcl104-over-slf4j-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-log4j12\1.4.2\slf4j-log4j12-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-api\1.4.2\slf4j-api-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\struts-menu\struts-menu\2.3\struts-menu-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\commons-digester\commons-digester\1.5\commons-digester-1.5.jar;C:\Documents and Settings\youjun\.m2\repository\hsqldb\hsqldb\1.7.1\hsqldb-1.7.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\acegisecurity\acegi-security\1.0.1\acegi-security-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-codec\commons-codec\1.3\commons-codec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\oro\oro\2.0.8\oro-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\springmodules\springmodules-validator\0.1\springmodules-validator-0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-fileupload\commons-fileupload\1.2\commons-fileupload-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-io\commons-io\1.3\commons-io-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\directwebremoting\dwr\2.0.rc2\dwr-2.0.rc2.jar;C:\Documents and Settings\youjun\.m2\repository\jmock\jmock\1.0.1\jmock-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\soap\saaj-api\1.3\saaj-api-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\zing\z3950\org\cql-java\1.0\cql-java-1.0.jar;C:\Documents and Settings\youjun\workspace\treebase\treebase-core\target\classes;C:\Documents and Settings\youjun\.m2\repository\postgresql\postgresql\8.3-603.jdbc3\postgresql-8.3-603.jdbc3.jar;C:\Documents and Settings\youjun\.m2\repository\c3p0\c3p0\0.9.1.2\c3p0-0.9.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\nexml\model\nexml\1.5-SNAPSHOT\nexml-1.5-SNAPSHOT.jar;C:\Documents and Settings\youjun\.m2\repository\xerces\xercesImpl\2.4.0\xercesImpl-2.4.0.jar;C:\Documents and Settings\youjun\.m2\repository\mesquite\mesquite\2.01.tb\mesquite-2.01.tb.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-annotations\3.3.1.GA\hibernate-annotations-3.3.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate\3.2.6.ga\hibernate-3.2.6.ga.jar;C:\Documents and Settings\youjun\.m2\repository\net\sf\ehcache\ehcache\1.2.3\ehcache-1.2.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\transaction\jta\1.0.1B\jta-1.0.1B.jar;C:\Documents and Settings\youjun\.m2\repository\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\antlr\antlr\2.7.6\antlr-2.7.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-commons-annotations\3.0.0.ga\hibernate-commons-annotations-3.0.0.ga.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\ejb3-persistence\1.0.1.GA\ejb3-persistence-1.0.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar;C:\Documents and Settings\youjun\.m2\repository\jama\jama\1.0.1\jama-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\pal\pal\mesquite-201\pal-mesquite-201.jar;C:\Documents and Settings\youjun\.m2\repository\jsci\jsci\mesquite\jsci-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\tolbaseclasses\tolbaseclasses\mesquite\tolbaseclasses-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\mrj\MRJToolkitStubs\1.0\MRJToolkitStubs-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\apple\apple-java-extensions\1.2\apple-java-extensions-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\cipres\framework\1.0.1\framework-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\jdom\jdom\1.1\jdom-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-jaxws\2.1.1\cxf-rt-frontend-jaxws-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-jaxws_2.1_spec\1.0\geronimo-jaxws_2.1_spec-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0.2\geronimo-activation_1.1_spec-1.0.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-api\2.1.1\cxf-api-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-utilities\2.1.1\cxf-common-utilities-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-core\2.0.8\spring-core-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-beans\2.0.8\spring-beans-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-context\2.0.8\spring-context-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\aopalliance\aopalliance\1.0\aopalliance-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-annotation_1.0_spec\1.1.1\geronimo-annotation_1.0_spec-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\bind\jaxb-api\2.1\jaxb-api-2.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-stax-api_1.0_spec\1.0.1\geronimo-stax-api_1.0_spec-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\wsdl4j\wsdl4j\1.6.1\wsdl4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\xml-resolver\xml-resolver\1.2\xml-resolver-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\ws\commons\schema\XmlSchema\1.4.2\XmlSchema-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\codehaus\woodstox\wstx-asl\3.2.4\wstx-asl-3.2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\neethi\neethi\2.0.4\neethi-2.0.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-common-schemas\2.1.1\cxf-common-schemas-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-core\2.1.1\cxf-rt-core-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\bind\jaxb-impl\2.1.6\jaxb-impl-2.1.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.3\geronimo-javamail_1.4_spec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\fastinfoset\FastInfoset\1.2.2\FastInfoset-1.2.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-bindings-soap\2.1.1\cxf-rt-bindings-soap-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-tools-common\2.1.1\cxf-tools-common-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity\1.4\velocity-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\velocity\velocity-dep\1.4\velocity-dep-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\bind\jaxb-xjc\2.1.6\jaxb-xjc-2.1.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-ws-metadata_2.0_spec\1.1.2\geronimo-ws-metadata_2.0_spec-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-databinding-jaxb\2.1.1\cxf-rt-databinding-jaxb-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-bindings-xml\2.1.1\cxf-rt-bindings-xml-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-simple\2.1.1\cxf-rt-frontend-simple-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-ws-addr\2.1.1\cxf-rt-ws-addr-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\sun\xml\messaging\saaj\saaj-impl\1.3\saaj-impl-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-transports-http\2.1.1\cxf-rt-transports-http-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-web\2.0.8\spring-web-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-transports-http-jetty\2.1.1\cxf-rt-transports-http-jetty-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\mortbay\jetty\jetty\6.1.9\jetty-6.1.9.jar;C:\Documents and Settings\youjun\.m2\repository\org\mortbay\jetty\jetty-util\6.1.9\jetty-util-6.1.9.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-servlet_2.5_spec\1.2\geronimo-servlet_2.5_spec-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\sql\jdbc-stdext\2.0\jdbc-stdext-2.0.jar;C:\Documents and Settings\youjun\.m2\repository\ibm\db2jcc_license_cu\2.6.80\db2jcc_license_cu-2.6.80.jar;C:\Documents and Settings\youjun\.m2\repository\ibm\db2jcc\2.6.80\db2jcc-2.6.80.jar;"/>
<property name="env.ProgramFiles" value="C:\Program Files"/>
- <property name="surefire.test.class.path" value="C:\eclipse\workspace\oai-pmh_data_provider\data_provider_web\target\test-classes;C:\eclipse\workspace\oai-pmh_data_provider\data_provider_web\target\classes;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring\2.0.7\spring-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\commons-logging\commons-logging\1.1\commons-logging-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\log4j\log4j\1.2.13\log4j-1.2.13.jar;C:\Documents and Settings\youjun\.m2\repository\logkit\logkit\1.0.1\logkit-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\servlet-api\2.4\servlet-api-2.4.jar;C:\Documents and Settings\youjun\.m2\repository\org\springframework\spring-mock\2.0.7\spring-mock-2.0.7.jar;C:\Documents and Settings\youjun\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\servlet\jstl\1.1.2\jstl-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\javax\mail\mail\1.4\mail-1.4.jar;C:\Documents and Settings\youjun\.m2\repository\javax\activation\activation\1.1\activation-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\xalan\xalan\2.7.0\xalan-2.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\xml-apis\xml-apis\1.0.b2\xml-apis-1.0.b2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-beanutils\commons-beanutils\1.7.0\commons-beanutils-1.7.0.jar;C:\Documents and Settings\youjun\.m2\repository\commons-validator\commons-validator\1.1.4\commons-validator-1.1.4.jar;C:\Documents and Settings\youjun\.m2\repository\commons-lang\commons-lang\2.3\commons-lang-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\standard\1.1.2\standard-1.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\taglibs\string\1.1.0\string-1.1.0.jar;C:\Documents and Settings\youjun\.m2\repository\struts\struts\1.2.9\struts-1.2.9.jar;C:\Documents and Settings\youjun\.m2\repository\opensymphony\sitemesh\2.3\sitemesh-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\displaytag\displaytag\1.1.1\displaytag-1.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-collections\commons-collections\3.1\commons-collections-3.1.jar;C:\Documents and Settings\youjun\.m2\repository\com\lowagie\itext\1.3\itext-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\jcl104-over-slf4j\1.4.2\jcl104-over-slf4j-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-log4j12\1.4.2\slf4j-log4j12-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\slf4j\slf4j-api\1.4.2\slf4j-api-1.4.2.jar;C:\Documents and Settings\youjun\.m2\repository\struts-menu\struts-menu\2.3\struts-menu-2.3.jar;C:\Documents and Settings\youjun\.m2\repository\commons-digester\commons-digester\1.5\commons-digester-1.5.jar;C:\Documents and Settings\youjun\.m2\repository\hsqldb\hsqldb\1.7.1\hsqldb-1.7.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\acegisecurity\acegi-security\1.0.1\acegi-security-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-codec\commons-codec\1.3\commons-codec-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\oro\oro\2.0.8\oro-2.0.8.jar;C:\Documents and Settings\youjun\.m2\repository\springmodules\springmodules-validator\0.1\springmodules-validator-0.1.jar;C:\Documents and Settings\youjun\.m2\repository\commons-fileupload\commons-fileupload\1.2\commons-fileupload-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\commons-io\commons-io\1.3\commons-io-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\org\directwebremoting\dwr\2.0.rc2\dwr-2.0.rc2.jar;C:\Documents and Settings\youjun\.m2\repository\jmock\jmock\1.0.1\jmock-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\javax\xml\soap\saaj-api\1.3\saaj-api-1.3.jar;C:\Documents and Settings\youjun\.m2\repository\zing\z3950\org\cql-java\1.0\cql-java-1.0.jar;C:\eclipse\workspace\treebase\treebase-core\target\classes;C:\Documents and Settings\youjun\.m2\repository\postgresql\postgresql\8.3-603.jdbc3\postgresql-8.3-603.jdbc3.jar;C:\Documents and Settings\youjun\.m2\repository\c3p0\c3p0\0.9.1.2\c3p0-0.9.1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\nexml\model\nexml\1.5-SNAPSHOT\nexml-1.5-SNAPSHOT.jar;C:\Documents and Settings\youjun\.m2\repository\xerces\xercesImpl\2.4.0\xercesImpl-2.4.0.jar;C:\Documents and Settings\youjun\.m2\repository\mesquite\mesquite\2.01.tb\mesquite-2.01.tb.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-annotations\3.3.1.GA\hibernate-annotations-3.3.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate\3.2.6.ga\hibernate-3.2.6.ga.jar;C:\Documents and Settings\youjun\.m2\repository\net\sf\ehcache\ehcache\1.2.3\ehcache-1.2.3.jar;C:\Documents and Settings\youjun\.m2\repository\javax\transaction\jta\1.0.1B\jta-1.0.1B.jar;C:\Documents and Settings\youjun\.m2\repository\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar;C:\Documents and Settings\youjun\.m2\repository\antlr\antlr\2.7.6\antlr-2.7.6.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\hibernate-commons-annotations\3.0.0.ga\hibernate-commons-annotations-3.0.0.ga.jar;C:\Documents and Settings\youjun\.m2\repository\org\hibernate\ejb3-persistence\1.0.1.GA\ejb3-persistence-1.0.1.GA.jar;C:\Documents and Settings\youjun\.m2\repository\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar;C:\Documents and Settings\youjun\.m2\repository\jama\jama\1.0.1\jama-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\pal\pal\mesquite-201\pal-mesquite-201.jar;C:\Documents and Settings\youjun\.m2\repository\jsci\jsci\mesquite\jsci-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\tolbaseclasses\tolbaseclasses\mesquite\tolbaseclasses-mesquite.jar;C:\Documents and Settings\youjun\.m2\repository\mrj\MRJToolkitStubs\1.0\MRJToolkitStubs-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\apple\apple-java-extensions\1.2\apple-java-extensions-1.2.jar;C:\Documents and Settings\youjun\.m2\repository\org\cipres\framework\1.0.1\framework-1.0.1.jar;C:\Documents and Settings\youjun\.m2\repository\jdom\jdom\1.1\jdom-1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\cxf\cxf-rt-frontend-jaxws\2.1.1\cxf-rt-frontend-jaxws-2.1.1.jar;C:\Documents and Settings\youjun\.m2\repository\org\apache\geronimo\specs\geronimo-jaxws_2.1_spec\1.0\geronimo-jaxws_2.1_spec-1.0.jar;C:\Documents and Settings\youjun\.m2\repository\org\apach...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-13 21:11:30
|
Revision: 268
http://treebase.svn.sourceforge.net/treebase/?rev=268&view=rev
Author: youjun
Date: 2009-11-13 21:11:22 +0000 (Fri, 13 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
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/GetRecord.vm
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-12 21:06:19 UTC (rev 267)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-13 21:11:22 UTC (rev 268)
@@ -2,6 +2,7 @@
import java.lang.reflect.Method;
import java.text.ParseException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -14,6 +15,9 @@
import org.treebase.oai.web.command.Identify;
import org.treebase.oai.web.command.OAIPMHCommand;
import org.treebase.oai.web.util.IdentifyUtil;
+import org.cipres.treebase.domain.admin.Person;
+import org.cipres.treebase.domain.study.Citation;
+import org.cipres.treebase.domain.study.Study;
import org.cipres.treebase.domain.study.Submission;
import org.cipres.treebase.domain.study.SubmissionService;
import org.cipres.treebase.domain.study.StudyService;
@@ -104,7 +108,7 @@
// TODO Auto-generated catch block
return (new ModelAndView("badArgument.vm",model));
}
- model.put("recodeList", list);
+ model.put("recordList", getRecordList(list));
return (new ModelAndView(params.getMetadataPrefix()+"_ListRecoed.vm",model));
}
@@ -120,7 +124,7 @@
// TODO Auto-generated catch block
return (new ModelAndView("badArgument.vm",model));
}
- model.put("recodeList", list);
+ model.put("recordList", getRecordList(list));
return (new ModelAndView(params.getMetadataPrefix()+"_ListIdentifiers.vm",model));
}
@@ -139,8 +143,7 @@
return (new ModelAndView("idDoesNotExist.vm",model));
}
-
- model.put("record", submission);
+ model.put("record", getRecordMap(submission));
return (new ModelAndView(params.getMetadataPrefix()+"_GetRecord.vm",model));
}
@@ -160,7 +163,6 @@
ModelAndView ListMetadataFormats(OAIPMHCommand params, Map model){
-
Submission submission = null;
try{
@@ -173,9 +175,37 @@
return (new ModelAndView("idDoesNotExist.vm",model));
}
-
+
+
return (new ModelAndView("ListMetadataFormats.vm",model));
}
+
+ private Map getRecordMap(Submission submission){
+
+ Map<String, String> map= new HashMap<String, String>();
+
+ Person submitter=submission.getSubmitter().getPerson();
+ Citation citation=submission.getStudy().getCitation();
+ Study study=submission.getStudy();
+
+ map.put("title", citation.getTitle());
+ map.put("creator", submitter.getFirstName()+" "
+ + submitter.getMiddleName()+" "
+ + submitter.getLastName());
+ map.put("subject", citation.getKeywords());
+ map.put("description", study.getName()+" "+study.getNotes());
+ map.put("abstract", citation.getAbstract());
+ map.put("publisher", citation.());
+
+
+
+ return map;
+ }
+
+ private List getRecordList(List<Submission> slist)
+ {
+ return null;
+ }
}
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-12 21:06:19 UTC (rev 267)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-13 21:11:22 UTC (rev 268)
@@ -133,4 +133,21 @@
System.out.print(result);
}
+
+ public void testGetRecord() {
+
+ OAIPMHCommand params=new OAIPMHCommand();
+ params.setVerb("ListMetadataFormats");
+ params.setIdentifier("treebase.org/study/TB2:s169");
+ params.setMetadataPrefix("oai_dc");
+ 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/GetRecord.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm 2009-11-12 21:06:19 UTC (rev 267)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm 2009-11-13 21:11:22 UTC (rev 268)
@@ -0,0 +1,41 @@
+<?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="GetRecord" identifier="${model.params.identifier}"
+ metadataPrefix="oai_dc">${model.identify.BaseURL}</request>
+ <GetRecord>
+ <record>
+ <header>
+ <identifier>${model.params.identifier}</identifier>
+ <datestamp>${model.record.getCreateDate()}</datestamp>
+ </header>
+ <metadata>
+ <oai_dc:dc
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
+ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+ <dc:title>${.getStudy().getCitation().getTitle()}</dc:title>
+ <dc:creator></dc:creator>
+ <dc:subject>Digital Libraries</dc:subject>
+ <dc:description>With the increasing technical sophistication of
+ both information consumers and providers, there is
+ increasing demand for more meaningful experiences of digital
+ information. We present a framework that separates digital
+ object experience, or rendering, from digital object storage
+ and manipulation, so the rendering can be tailored to
+ particular communities of users.
+ </dc:description>
+ <dc:description>Comment: 23 pages including 2 appendices,
+ 8 figures</dc:description>
+ <dc:date>2001-12-14</dc:date>
+ </oai_dc:dc>
+<!\x97 some missing field here like keyword etc see NESCent schema -->
+ </metadata>
+ </record>
+ </GetRecord>
+</OAI-PMH>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2009-11-13 20:09:02
|
Bugs item #2897427, was opened at 2009-11-13 15:09 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2897427&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Cannot create new submission Initial Comment: When I try to create a new submission in the nescent-dev build, I get a data access failure. (below) ================== Data Access Failure Could not execute JDBC batch update; nested exception is org.hibernate.exception.ConstraintViolationException: Could not execute JDBC batch update org.springframework.dao.DataIntegrityViolationException: Could not execute JDBC batch update; nest ... [etc] ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2897427&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-13 15:41:56
|
Bugs item #2897306, was opened at 2009-11-13 10:41 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2897306&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Mark Dominus (mjdominus) Summary: Some Corrupted Trees Initial Comment: This is based on the treebasedb-dev.nescent.org build. Under the trees tab, search for "..2" and "NTAX". The result is 86 trees with only 1 taxon each -- basically, these are corrupted or missing trees. Not sure how best to fix these, but I can generate a new set of trees from TreeBASE1 if I can be given a list of *legacy* tree ids. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2897306&group_id=248804 |
|
From: <yo...@us...> - 2009-11-12 21:06:28
|
Revision: 267
http://treebase.svn.sourceforge.net/treebase/?rev=267&view=rev
Author: youjun
Date: 2009-11-12 21:06:19 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
sync a test config file with source code
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml 2009-11-12 20:54:50 UTC (rev 266)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml 2009-11-12 21:06:19 UTC (rev 267)
@@ -24,7 +24,7 @@
<bean id="OAIPMHController" class="org.treebase.oai.web.controller.OAIPMHController">
<property name="submissionService"><ref bean="submissionService"></ref></property>
- <property name="studyService"><ref bean="studyphyloTreeService"></ref></property>
+ <property name="studyService"><ref bean="studyService"></ref></property>
<property name="identify"><ref bean="top.identify"></ref></property>
</bean>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: SourceForge.net <no...@so...> - 2009-11-11 16:45:57
|
Bugs item #2896043, was opened at 2009-11-11 11:45 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896043&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: data Group: None Status: Open Priority: 5 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Mark Dominus (mjdominus) Summary: nexus from analysis creates redundant taxon blocks Initial Comment: Reconstructing the nexus of an analysis step, such as this: http://treebasedb-dev.nescent.org:6666/treebase-web/search/downloadAnAnalysisStep.html?analysisid=1953 Results in one taxon block per character block and one taxon block per tree block. These are redundant and cause an error in Mesquite. Since analysis steps do not allow trees to have taxa not found in related matrices, each analysis step nexus should have only one taxon block, with all tree and character blocks linking to it. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896043&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-11 16:38:23
|
Bugs item #2896035, was opened at 2009-11-11 11:38 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896035&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Sort List causes Exception Initial Comment: This is based on the http://treebasedb-dev.nescent.org:6666/treebase-web/home.html implementation. Type in "Donoghue", search by author name, and then try to sort the resulting list. The result encounters an uncaught exception. This needs fixing before release. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896035&group_id=248804 |
|
From: SourceForge.net <no...@so...> - 2009-11-11 16:32:40
|
Bugs item #2896032, was opened at 2009-11-11 11:32 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896032&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 9 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: Nobody/Anonymous (nobody) Summary: Phylowidget Fails to Run Initial Comment: Based on the http://treebasedb-dev.nescent.org:6666/treebase-web/home.html implementation, clicking on any tree to view it in PhyloWidget fails to work. This needs to be fixed before TB2 can be released. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=2896032&group_id=248804 |
|
From: <yo...@us...> - 2009-11-10 20:34:43
|
Revision: 265
http://treebase.svn.sourceforge.net/treebase/?rev=265&view=rev
Author: youjun
Date: 2009-11-10 20:34:36 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml
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:33:09 UTC (rev 264)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml 2009-11-10 20:34:36 UTC (rev 265)
@@ -28,7 +28,8 @@
<property name="deletedRecord" value="${identify.deletedRecord}" />
<property name="granularity" value="${identify.granularity}" />
<property name="granularityPattern" value="${identify.granularityPattern}" />
-
+ <property name="repositoryIdentifier" value="${identify.repositoryIdentifier}" />
+ <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
</bean>
<!-- ========================================================== -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
