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-10 20:33:25
|
Revision: 264
http://treebase.svn.sourceforge.net/treebase/?rev=264&view=rev
Author: youjun
Date: 2009-11-10 20:33:09 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
add test on OAIPMHController
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/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/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java
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/target/classes/org/treebase/oai/web/command/Identify.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/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/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
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/GetRecord.vm
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/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/jdbc.properties
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/GetRecord.vm
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/badArgument.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/badVerb.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/cannotDisseminateFormat.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/idDoesNotExist.vm
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/jdbc.properties
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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java 2009-11-10 20:33:09 UTC (rev 264)
@@ -29,7 +29,23 @@
private String deletedRecord;
private String granularity;
private String granularityPattern;
+ private String repositoryIdentifier;
+ private String sampleIdentifier;
+
+ public String getRepositoryIdentifier() {
+ return repositoryIdentifier;
+ }
+ public void setRepositoryIdentifier(String repositoryIdentifier) {
+ this.repositoryIdentifier = repositoryIdentifier;
+ }
+ public String getSampleIdentifier() {
+ return sampleIdentifier;
+ }
+ public void setSampleIdentifier(String sampleIdentifier) {
+ this.sampleIdentifier = sampleIdentifier;
+ }
+
public String getBaseRUL() {
return baseRUL;
}
@@ -74,11 +90,11 @@
}
// return a current date object in UTC
- public String getResponseDate(Date date){
+ public String getResponseDate(){
SimpleDateFormat format = new SimpleDateFormat(granularityPattern);
Calendar cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"));
format.setCalendar(cal);
- return format.format(date);
+ return format.format(new Date());
}
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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties 2009-11-10 20:33:09 UTC (rev 264)
@@ -5,4 +5,6 @@
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'
\ No newline at end of file
+identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z'
+identify.sampleIdentifier=***
+identify.repositoryIdentifier=***
\ 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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm 2009-11-10 20:33:09 UTC (rev 264)
@@ -3,16 +3,16 @@
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>${now()}</responseDate>
- <request verb="Identify">${identify.baseRUL}</request>
+ <responseDate>${model.identify.getResponseDate()}</responseDate>
+ <request verb="Identify">${model.identify.baseRUL}</request>
<Identify>
- <repositoryName>${identify.repositoryName}</repositoryName>
- <baseURL>${identify.baseRUL}</baseURL>
- <protocolVersion>${identify.protocolVersion}</protocolVersion>
- <adminEmail>${identify.adminEmail}</adminEmail>
- <earliestDatestamp>${identify.earliestDatestamp}</earliestDatestamp>
- <deletedRecord>${identify.deletedRecord}</deletedRecord>
- <granularity>${identify.granularity}</granularity>
+ <repositoryName>${model.identify.repositoryName}</repositoryName>
+ <baseURL>${model.identify.baseRUL}</baseURL>
+ <protocolVersion>${model.identify.protocolVersion}</protocolVersion>
+ <adminEmail>${model.identify.adminEmail}</adminEmail>
+ <earliestDatestamp>${model.identify.earliestDatestamp}</earliestDatestamp>
+ <deletedRecord>${model.identify.deletedRecord}</deletedRecord>
+ <granularity>${model.identify.granularity}</granularity>
<description>
<oai-identifier
@@ -22,9 +22,9 @@
"http://www.openarchives.org/OAI/2.0/oai-identifier
http://www.openarchives.org/OAI/2.0/oai-identifier.xsd">
<scheme>oai</scheme>
- <repositoryIdentifier>${identify.repositoryIdentifier}</repositoryIdentifier>
+ <repositoryIdentifier>${model.identify.repositoryIdentifier}</repositoryIdentifier>
<delimiter>:</delimiter>
- <sampleIdentifier>${identify.sampleIdentifier}</sampleIdentifier>
+ <sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
</oai-identifier>
</description>
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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-10 20:33:09 UTC (rev 264)
@@ -1,26 +1,30 @@
package org.treebase.oai.web.controller;
import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
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.web.servlet.ModelAndView;
import org.treebase.oai.web.command.Identify;
+import org.treebase.oai.web.command.OAIPMHCommand;
public class OAIPMHControllerTest extends AbstractDependencyInjectionSpringContextTests {
- /**
- * constructor.
- *
- */
- VelocityUtil vu;
+
+ VelocityUtil vu= new VelocityUtil();;
+
+ //OAIPMHCommand command;
private OAIPMHController controller;
@@ -34,15 +38,20 @@
this.identify = identify;
}
-
+ // velocity utils for test only
class VelocityUtil{
VelocityEngine ve;
VelocityUtil(){
ve = new VelocityEngine();
+ Properties p = new Properties();
+ p.setProperty(Velocity.INPUT_ENCODING, "UTF-8");
+ p.setProperty(Velocity.OUTPUT_ENCODING, "UTF-8");
+ p.setProperty("file.resource.loader.class",
+ "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
try {
- ve.init();
+ ve.init(p);
} catch (Exception e) {
// TODO Auto-generated catch block
logger.info(e.getMessage());
@@ -53,7 +62,7 @@
StringWriter writer=null;
Template t=null;
try {
- t = ve.getTemplate(mav.getViewName());
+ t = ve.getTemplate("\\"+mav.getViewName());
VelocityContext context = new VelocityContext();
context.put("model", mav.getModel());
@@ -80,11 +89,17 @@
"classpath*:applicationContext-dao.xml","classpath*:applicationContext-service.xml"};
}
- public void setup(){
- vu= new VelocityUtil();
- }
- public void testHandle() {
- this.assertEquals(true, true);
+ public void testIdentify() {
+
+ OAIPMHCommand params=new OAIPMHCommand();
+ params.setVerb("Identify");
+ Map model=new HashMap();
+ model.put("identify",identify );
+ ModelAndView mav=controller.Identify(params, model);
+ String result=vu.runTemplate(mav);
+ this.assertNotNull(result);
+ System.out.print(result);
+
}
}
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/Identify.vm 2009-11-10 20:33:09 UTC (rev 264)
@@ -0,0 +1,32 @@
+<?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>
+ <Identify>
+ <repositoryName>${model.identify.repositoryName}</repositoryName>
+ <baseURL>${model.identify.baseRUL}</baseURL>
+ <protocolVersion>${model.identify.protocolVersion}</protocolVersion>
+ <adminEmail>${model.identify.adminEmail}</adminEmail>
+ <earliestDatestamp>${model.identify.earliestDatestamp}</earliestDatestamp>
+ <deletedRecord>${model.identify.deletedRecord}</deletedRecord>
+ <granularity>${model.identify.granularity}</granularity>
+
+ <description>
+ <oai-identifier
+ xmlns="http://www.openarchives.org/OAI/2.0/oai-identifier"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://www.openarchives.org/OAI/2.0/oai-identifier
+ http://www.openarchives.org/OAI/2.0/oai-identifier.xsd">
+ <scheme>oai</scheme>
+ <repositoryIdentifier>${model.identify.repositoryIdentifier}</repositoryIdentifier>
+ <delimiter>:</delimiter>
+ <sampleIdentifier>${model.identify.sampleIdentifier}</sampleIdentifier>
+ </oai-identifier>
+ </description>
+
+ </Identify>
+</OAI-PMH>
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/ListSet.vm 2009-11-10 20:33:09 UTC (rev 264)
@@ -0,0 +1,11 @@
+<?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>${identify.responseDate}</responseDate>
+ <request verb="ListSets">
+ ${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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/WEB-INF/identify.properties 2009-11-10 20:33:09 UTC (rev 264)
@@ -5,4 +5,6 @@
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'
\ No newline at end of file
+identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z'
+identify.sampleIdentifier=***
+identify.repositoryIdentifier=***
\ 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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/applicationContext.xml 2009-11-10 20:33:09 UTC (rev 264)
@@ -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>
<!-- ========================================================== -->
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/jdbc.properties
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/jdbc.properties (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/jdbc.properties 2009-11-10 20:33:09 UTC (rev 264)
@@ -0,0 +1,21 @@
+# This is treebase-core jdbc.properties
+
+jdbc.driverClassName=org.postgresql.Driver
+jdbc.url=jdbc:postgresql://treebasedb-dev.nescent.org/treebasedev
+jdbc.username=treebase_app
+jdbc.password=tim5tema
+
+
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+
+#for development only:
+#hibernate.show_sql=true
+#hibernate.format_sql=true
+#hibernate.generate_statistics=true
+#hibernate.use_sql_comments=true
+
+#options are: validate | update | create | create-drop
+hibernate.hbm2ddl.auto=
+
+#Mesquite installation directory
+mesquite.folder_dir=/home/mjd/Mesquite_Folder/
\ 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/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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-10 20:33:09 UTC (rev 264)
@@ -1,97 +1,105 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.016" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
+<testsuite failures="0" time="0.109" 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\m2conf1040307559773268787.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\m2conf3142349244246216166.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="env.PROCESSOR_REVISION" value="1706"/>
+ <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="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.016" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
+ <testcase time="0.109" 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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml 2009-11-10 20:33:09 UTC (rev 264)
@@ -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\m2conf6482424883845288848.tmp"/>
+ <property name="classworlds.conf" value="C:\eclipse\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf3142349244246216166.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"/>
@@ -48,6 +48,7 @@
<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"/>
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 00:57:06 UTC (rev 263)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-10 20:33:09 UTC (rev 264)
@@ -1,97 +1,105 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="7.421" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.controller.OAIPMHControllerTest">
+<testsuite failures="0" time="17.875" errors="0" skipped="0" tests="1" 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\m2conf1040307559773268787.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\m2conf3142349244246216166.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:\...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-10 00:57:15
|
Revision: 263
http://treebase.svn.sourceforge.net/treebase/?rev=263&view=rev
Author: youjun
Date: 2009-11-10 00:57:06 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
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/top-servlet.xml
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
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/top-servlet.xml
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-09 21:08:14 UTC (rev 262)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-10 00:57:06 UTC (rev 263)
@@ -76,7 +76,8 @@
@Override
protected String[] getConfigLocations() {
- return new String[]{"applicationContext.xml","top-servlet.xml"};
+ return new String[]{"applicationContext.xml","top-servlet.xml",
+ "classpath*:applicationContext-dao.xml","classpath*:applicationContext-service.xml"};
}
public void setup(){
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-09 21:08:14 UTC (rev 262)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/top-servlet.xml 2009-11-10 00:57:06 UTC (rev 263)
@@ -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>
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-09 21:08:14 UTC (rev 262)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-10 00:57:06 UTC (rev 263)
@@ -1,104 +1,97 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.172" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
+<testsuite failures="0" time="0.016" 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\m2conf6482424883845288848.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\m2conf1040307559773268787.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="env.JAVA_HOME" value="C:\Java\sdk\jdk\jre\bin"/>
+ <property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
<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\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.PROCESSOR_REVISION" value="1706"/>
<property name="java.io.tmpdir" value="C:\DOCUME~1\youjun\LOCALS~1\Temp\"/>
- <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:\Java\sdk\jdk\jre\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/>
+ <property name="java.ext.dirs" value="C:\Program Files\Java\jre1.6.0_07\lib\ext;C:\WINDOWS\Sun\Java\lib\ext"/>
<property name="env.tvdumpflags" value="8"/>
- <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="user.dir" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web"/>
<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:\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="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="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="YALE-LD6ICZM0YC"/>
+ <property name="env.USERDOMAIN" value="NEWDELL"/>
<property name="java.specification.version" value="1.6"/>
- <property name="env.PROCESSOR_LEVEL" value="15"/>
+ <property name="env.PROCESSOR_LEVEL" value="6"/>
</properties>
- <testcase time="0.172" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
+ <testcase time="0.016" 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.controller.OAIPMHControllerTest.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-09 21:08:14 UTC (rev 262)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-10 00:57:06 UTC (rev 263)
@@ -1,193 +1,97 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="8.125" errors="1" skipped="0" tests="1" name="org.treebase.oai.web.controller.OAIPMHControllerTest">
+<testsuite failures="0" time="7.421" errors="0" skipped="0" tests="1" 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:\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\m2conf6482424883845288848.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\m2conf1040307559773268787.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="env.JAVA_HOME" value="C:\Java\sdk\jdk\jre\bin"/>
+ <property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
<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\spring...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-09 21:08:23
|
Revision: 262
http://treebase.svn.sourceforge.net/treebase/?rev=262&view=rev
Author: youjun
Date: 2009-11-09 21:08:14 +0000 (Mon, 09 Nov 2009)
Log Message:
-----------
add velocity util for testing
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/.classpath
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/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/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/Identify.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/OAIPMHCommand.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/controller/OAIPMHController.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/util/IdentifyUtil.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web.war
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/org/treebase/oai/PackageTestSuite.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/PackageTestSuite.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/IdentifyTest.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/PackageTestSuite.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/org/treebase/oai/web/controller/PackageTestSuite.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/IdentifyUtilTest.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/PackageTestSuite.class
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/top-servlet.xml
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/test-classes/org/treebase/oai/web/controller/OAIPMHControllerTest$VelocityUtil.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/top-servlet.xml
Modified: trunk/oai-pmh_data_provider/data_provider_web/.classpath
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-09 18:06:10 UTC (rev 261)
+++ trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-09 21:08:14 UTC (rev 262)
@@ -12,6 +12,5 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="lib" path="C:/Documents and Settings/youjun/.m2/repository/org/cipres/treebase/treebase-core/1.0-SNAPSHOT/treebase-core-1.0-SNAPSHOT.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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-09 18:06:10 UTC (rev 261)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-09 21:08:14 UTC (rev 262)
@@ -82,7 +82,7 @@
return new ModelAndView("cannotDisseminateFormat.vm",model);
try{
- method=this.getClass().getMethod(params.getVerb(), new Class[]{HttpServletRequest.class, HttpServletResponse.class, OAIPMHCommand.class, Map.class});
+ method=this.getClass().getMethod(params.getVerb(), new Class[]{OAIPMHCommand.class, Map.class});
}catch(NoSuchMethodException nsme){
return new ModelAndView("badVerb.vm",model);
@@ -90,11 +90,11 @@
return (new ModelAndView("badArgument.vm",model));
}
- return (ModelAndView) method.invoke(this, request, response, params, model);
+ return (ModelAndView) method.invoke(this, params, model);
}
- ModelAndView ListRecoed(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ ModelAndView ListRecoed(OAIPMHCommand params, Map model){
List<Submission> list=null;
try {
@@ -110,7 +110,7 @@
}
- ModelAndView ListIdentifiers(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ ModelAndView ListIdentifiers( OAIPMHCommand params, Map model){
List<Submission> list=null;
try {
@@ -125,7 +125,7 @@
}
- ModelAndView GetRecord(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ ModelAndView GetRecord( OAIPMHCommand params, Map model){
Submission submission = null;
@@ -145,20 +145,20 @@
}
- ModelAndView Identify(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ ModelAndView Identify(OAIPMHCommand params, Map model){
return (new ModelAndView("Identify.vm",model));
}
- ModelAndView ListSet(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ ModelAndView ListSet(OAIPMHCommand params, Map model){
return (new ModelAndView("ListSet.vm",model));
}
- ModelAndView ListMetadataFormats(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ 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-09 18:06:10 UTC (rev 261)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-09 21:08:14 UTC (rev 262)
@@ -1,7 +1,15 @@
package org.treebase.oai.web.controller;
-import org.cipres.treebase.core.CoreServiceLauncher;
+import java.io.StringWriter;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+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.web.servlet.ModelAndView;
+import org.treebase.oai.web.command.Identify;
@@ -9,13 +17,72 @@
/**
* constructor.
- */
+ *
+ */
+ VelocityUtil vu;
+
+ private OAIPMHController controller;
+
+ public void setController(OAIPMHController controller) {
+ this.controller = controller;
+ }
+
+ private Identify identify;
+
+ public void setIdentify(Identify identify) {
+ this.identify = identify;
+ }
+
+
+ class VelocityUtil{
+ VelocityEngine ve;
+
+ VelocityUtil(){
+ ve = new VelocityEngine();
+
+ try {
+ ve.init();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ logger.info(e.getMessage());
+ }
+ }
+
+ String runTemplate(ModelAndView mav) {
+ StringWriter writer=null;
+ Template t=null;
+ try {
+ t = ve.getTemplate(mav.getViewName());
+
+ VelocityContext context = new VelocityContext();
+ context.put("model", mav.getModel());
+ writer= new StringWriter();
+ t.merge(context, writer);
+
+ } catch (ResourceNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ParseErrorException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return writer.toString();
+ }
+ }
+
@Override
protected String[] getConfigLocations() {
- return new String[]{"applicationContext.xml"};
+ return new String[]{"applicationContext.xml","top-servlet.xml"};
}
+ public void setup(){
+ vu= new VelocityUtil();
+ }
+
public void testHandle() {
this.assertEquals(true, true);
}
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/top-servlet.xml 2009-11-09 21:08:14 UTC (rev 262)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:dwr="http://www.directwebremoting.org/schema/spring-dwr"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.directwebremoting.org/schema/spring-dwr
+ http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd">
+
+ <!-- ========================================================== -->
+ <!-- velocity configure -->
+ <!-- ========================================================== -->
+
+ <bean id="velocityConfigurer" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
+ <property name="resourceLoaderPath">
+ <value>WEB-INF/vmFiles/</value>
+ </property>
+ </bean>
+
+ <!-- ========================================================== -->
+ <!-- LIST OF CONTROLLERS FOR OAI-PMH -->
+ <!-- ========================================================== -->
+
+ <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="identify"><ref bean="top.identify"></ref></property>
+ </bean>
+
+
+ <!-- ========================================================== -->
+ <!-- LIST OF VALIDATORS FOR CONTROLLER -->
+ <!-- ========================================================== -->
+
+
+ <!-- ========================================================== -->
+ <!-- MESSAGE SOURCE DEFINITION -->
+ <!-- ========================================================== -->
+ <!--bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+ <property name="basename"><value>ApplicationResources</value></property>
+ </bean-->
+
+ <!-- ========================================================== -->
+ <!-- Spring View Resolvers for Templates -->
+ <!-- ========================================================== -->
+ <bean id="viewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver">
+ <property name="suffix">
+ <value>.vm</value>
+ </property>
+ <property name="exposeRequestAttributes">
+ <value>true</value>
+ </property>
+ <property name="exposeSessionAttributes">
+ <value>true</value>
+ </property>
+ </bean>
+
+ <!-- ========================================================== -->
+ <!-- URL MAPPING -->
+ <!-- ========================================================== -->
+ <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+
+ <property name="alwaysUseFullPath" value="true"/>
+ <property name="mappings">
+ <props>
+ <prop key="/top/**">OAIPMHController</prop>
+ </props>
+ </property>
+ </bean>
+ <!-- ==================================================================================================== -->
+ <!-- Exception Mappings -->
+ <!-- This bean resolves specific types of exception to corresponding error views -->
+ <!-- The default behavior of DispatcherServlet is to propagate all exceptions to the servlet container -->
+ <!-- This will happen here with all other types of exception -->
+ <!-- ==================================================================================================== -->
+ <!--bean id="exceptionResolver" class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
+ <property name="exceptionMappings">
+ <props>
+ <prop key="org.springframework.dao.DataAccessException">/errors/dataAccessFailure</prop>
+ <prop key="org.springframework.transaction.TransactionException">/errors/dataAccessFailure</prop>
+ <prop key="org.cipres.treebase.web.exceptions.EmptyStudyException">/errors/studyAccessFailure</prop>
+ </props>
+ </property>
+ </bean-->
+
+</beans>
Added: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/command/Identify.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/command/Identify.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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)
Added: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/util/IdentifyUtil.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/classes/org/treebase/oai/web/util/IdentifyUtil.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/Identify.class
===================================================================
(Binary files differ)
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/OAIPMHCommand.class
===================================================================
(Binary files differ)
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/controller/OAIPMHController.class
===================================================================
(Binary files differ)
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/util/IdentifyUtil.class
===================================================================
(Binary files differ)
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web.war
===================================================================
(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-09 18:06:10 UTC (rev 261)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-09 21:08:14 UTC (rev 262)
@@ -1,39 +1,42 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
+<testsuite failures="0" time="0.172" 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\SDK\jdk\jre\lib\resources.jar;C:\Program Files\Java\SDK\jdk\jre\lib\rt.jar;C:\Program Files\Java\SDK\jdk\jre\lib\sunrsasign.jar;C:\Program Files\Java\SDK\jdk\jre\lib\jsse.jar;C:\Program Files\Java\SDK\jdk\jre\lib\jce.jar;C:\Program Files\Java\SDK\jdk\jre\lib\charsets.jar;C:\Program Files\Java\SDK\jdk\jre\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_13-b03"/>
+ <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\SDK\jdk\jre\bin"/>
- <property name="classworlds.conf" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf1208425064661956248.tmp"/>
- <property name="java.version" value="1.6.0_13"/>
- <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\m2conf6482424883845288848.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\SDK\jdk\jre\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\SDK\jdk\jre"/>
+ <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"/>
<property name="env.ComSpec" value="C:\WINDOWS\system32\cmd.exe"/>
@@ -41,55 +44,61 @@
<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="11.3-b02"/>
+ <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="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\SDK\jdk\jre\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:\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\.m2\repository\org\cipres\treebase\treebase-core\1.0-SNAPSHOT\treebase-core-1.0-SNAPSHOT.jar;"/>
<property name="env.ProgramFiles" value="C:\Program Files"/>
- <property name="env.PROCESSOR_REVISION" value="1706"/>
+ <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="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\SDK\jdk\jre\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" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
+ <testcase time="0.172" 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-09 18:06:10 UTC (rev 261)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml 2009-11-09 21:08:14 UTC (rev 262)
@@ -2,96 +2,103 @@
<testsuite failures="0" time="0" 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"/>
+ <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\m2conf2718452852784588497.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\m2conf6482424883845288848.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="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
+ <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="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:\Docum...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-09 18:06:19
|
Revision: 261
http://treebase.svn.sourceforge.net/treebase/?rev=261&view=rev
Author: youjun
Date: 2009-11-09 18:06:10 +0000 (Mon, 09 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
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/data_provider_web/WEB-INF/applicationContext.xml
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web.war
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/war/work/webapp-cache.xml
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/Identify.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/OAIPMHCommand.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/controller/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/controller/OAIPMHController.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/util/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/util/IdentifyUtil.class
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/identify.properties
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/GetRecord.vm
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/Identify.vm
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/ListMetadataFormats.vm
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/ListSet.vm
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/badArgument.vm
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/badVerb.vm
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/cannotDisseminateFormat.vm
trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/idDoesNotExist.vm
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-09 00:29:52 UTC (rev 260)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-09 18:06:10 UTC (rev 261)
@@ -11,14 +11,12 @@
* constructor.
*/
-
- public void testXXXX() {
-
- }
-
@Override
protected String[] getConfigLocations() {
- return CoreServiceLauncher.getSpringConfigurations();
+ return new String[]{"applicationContext.xml"};
}
+ public void testHandle() {
+ this.assertEquals(true, true);
+ }
}
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/applicationContext.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/applicationContext.xml 2009-11-09 00:29:52 UTC (rev 260)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/applicationContext.xml 2009-11-09 18:06:10 UTC (rev 261)
@@ -9,6 +9,28 @@
http://www.directwebremoting.org/schema/spring-dwr
http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd">
+ <bean id="top.propertyConfigurer"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="locations">
+ <list>
+ <value>/WEB-INF/identify.properties</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="top.identify" class="org.treebase.oai.web.command.Identify">
+ <property name="baseRUL" value="${identify.baseRUL}" />
+ <property name="repositoryName" value="${identify.repositoryName}" />
+ <property name="protocolVersion" value="${identify.protocolVersion}" />
+ <property name="adminEmail" value="${identify.adminEmail}" />
+ <property name="earliestDatestamp" value="${identify.earliestDatestamp}" />
+ <property name="deletedRecord" value="${identify.deletedRecord}" />
+ <property name="granularity" value="${identify.granularity}" />
+ <property name="granularityPattern" value="${identify.granularityPattern}" />
+
+ </bean>
+
<!-- ========================================================== -->
<!-- LIST OF DWR beans/methods -->
<!-- ========================================================== -->
Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/Identify.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/Identify.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/OAIPMHCommand.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/command/OAIPMHCommand.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/controller/OAIPMHController.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/controller/OAIPMHController.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/util/IdentifyUtil.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/classes/org/treebase/oai/web/util/IdentifyUtil.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/identify.properties
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/identify.properties (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/identify.properties 2009-11-09 18:06:10 UTC (rev 261)
@@ -0,0 +1,8 @@
+identify.baseRUL=www.***/top.edu
+identify.repositoryName=org.treebase.oai
+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'
\ No newline at end of file
Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml 2009-11-09 00:29:52 UTC (rev 260)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml 2009-11-09 18:06:10 UTC (rev 261)
@@ -19,12 +19,14 @@
</bean>
<!-- ========================================================== -->
- <!-- LIST OF CONTROLLERS FOR VERBS AND FORMATS -->
+ <!-- LIST OF CONTROLLERS FOR OAI-PMH -->
<!-- ========================================================== -->
- <!--bean id="appletInteractionController" class="org.cipres.treebase.web.controllers.AppletInteractionController">
- <property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property>
- </bean-->
+ <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="identify"><ref bean="top.identify"></ref></property>
+ </bean>
<!-- ========================================================== -->
@@ -62,7 +64,7 @@
<property name="alwaysUseFullPath" value="true"/>
<property name="mappings">
<props>
- <!--prop key="/oai-pmh verbs/metadata formats/paramaters</prop-->
+ <prop key="/top/**">OAIPMHController</prop>
</props>
</property>
</bean>
Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/Identify.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/Identify.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/Identify.vm 2009-11-09 18:06:10 UTC (rev 261)
@@ -0,0 +1,32 @@
+<?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>${now()}</responseDate>
+ <request verb="Identify">${identify.baseRUL}</request>
+ <Identify>
+ <repositoryName>${identify.repositoryName}</repositoryName>
+ <baseURL>${identify.baseRUL}</baseURL>
+ <protocolVersion>${identify.protocolVersion}</protocolVersion>
+ <adminEmail>${identify.adminEmail}</adminEmail>
+ <earliestDatestamp>${identify.earliestDatestamp}</earliestDatestamp>
+ <deletedRecord>${identify.deletedRecord}</deletedRecord>
+ <granularity>${identify.granularity}</granularity>
+
+ <description>
+ <oai-identifier
+ xmlns="http://www.openarchives.org/OAI/2.0/oai-identifier"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://www.openarchives.org/OAI/2.0/oai-identifier
+ http://www.openarchives.org/OAI/2.0/oai-identifier.xsd">
+ <scheme>oai</scheme>
+ <repositoryIdentifier>${identify.repositoryIdentifier}</repositoryIdentifier>
+ <delimiter>:</delimiter>
+ <sampleIdentifier>${identify.sampleIdentifier}</sampleIdentifier>
+ </oai-identifier>
+ </description>
+
+ </Identify>
+</OAI-PMH>
Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/ListSet.vm
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/ListSet.vm (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/vmFiles/ListSet.vm 2009-11-09 18:06:10 UTC (rev 261)
@@ -0,0 +1,11 @@
+<?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>${identify.responseDate}</responseDate>
+ <request verb="ListSets">
+ ${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/data_provider_web.war
===================================================================
(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-09 00:29:52 UTC (rev 260)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-09 18:06:10 UTC (rev 261)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.016" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.command.IdentifyTest">
+<testsuite failures="0" time="0" 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"/>
@@ -8,23 +8,23 @@
<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="sun.boot.class.path" value="C:\Program Files\Java\SDK\jdk\jre\lib\resources.jar;C:\Program Files\Java\SDK\jdk\jre\lib\rt.jar;C:\Program Files\Java\SDK\jdk\jre\lib\sunrsasign.jar;C:\Program Files\Java\SDK\jdk\jre\lib\jsse.jar;C:\Program Files\Java\SDK\jdk\jre\lib\jce.jar;C:\Program Files\Java\SDK\jdk\jre\lib\charsets.jar;C:\Program Files\Java\SDK\jdk\jre\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_07-b06"/>
+ <property name="java.runtime.version" value="1.6.0_13-b03"/>
<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\m2conf4319035611112168820.tmp"/>
- <property name="java.version" value="1.6.0_07"/>
+ <property name="sun.boot.library.path" value="C:\Program Files\Java\SDK\jdk\jre\bin"/>
+ <property name="classworlds.conf" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf1208425064661956248.tmp"/>
+ <property name="java.version" value="1.6.0_13"/>
<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.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="java.endorsed.dirs" value="C:\Program Files\Java\SDK\jdk\jre\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="GBK"/>
@@ -33,18 +33,17 @@
<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:\Program Files\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="11.3-b02"/>
<property name="user.variant" value=""/>
<property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
- <property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
<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"/>
@@ -54,7 +53,7 @@
<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.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:\Program Files\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:\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"/>
@@ -65,10 +64,9 @@
<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="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="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\.m2\repository\org\cipres\treebase\treebase-core\1.0-SNAPSHOT\treebase-core-1.0-SNAPSHOT.jar;"/>
<property name="env.ProgramFiles" value="C:\Program Files"/>
<property name="env.PROCESSOR_REVISION" value="1706"/>
<property name="java.io.tmpdir" value="C:\DOCUME~1\youjun\LOCALS~1\Temp\"/>
@@ -76,7 +74,7 @@
<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:\Program Files\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="line.separator" value="
@@ -93,5 +91,5 @@
<property name="java.specification.version" value="1.6"/>
<property name="env.PROCESSOR_LEVEL" value="6"/>
</properties>
- <testcase time="0.016" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
+ <testcase time="0" 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.controller.OAIPMHControllerTest.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-09 00:29:52 UTC (rev 260)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-09 18:06:10 UTC (rev 261)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="5.515" errors="0" skipped="0" tests="1" name="org.treebase.oai.web.controller.OAIPMHControllerTest">
+<testsuite failures="0" time="0.281" errors="0" skipped="0" tests="1" 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"/>
@@ -8,23 +8,23 @@
<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="sun.boot.class.path" value="C:\Program Files\Java\SDK\jdk\jre\lib\resources.jar;C:\Program Files\Java\SDK\jdk\jre\lib\rt.jar;C:\Program Files\Java\SDK\jdk\jre\lib\sunrsasign.jar;C:\Program Files\Java\SDK\jdk\jre\lib\jsse.jar;C:\Program Files\Java\SDK\jdk\jre\lib\jce.jar;C:\Program Files\Java\SDK\jdk\jre\lib\charsets.jar;C:\Program Files\Java\SDK\jdk\jre\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_07-b06"/>
+ <property name="java.runtime.version" value="1.6.0_13-b03"/>
<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\m2conf4319035611112168820.tmp"/>
- <property name="java.version" value="1.6.0_07"/>
+ <property name="sun.boot.library.path" value="C:\Program Files\Java\SDK\jdk\jre\bin"/>
+ <property name="classworlds.conf" value="C:\Documents and Settings\youjun\workspace\.metadata\.plugins\org.maven.ide.eclipse\launches\m2conf1208425064661956248.tmp"/>
+ <property name="java.version" value="1.6.0_13"/>
<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.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="java.endorsed.dirs" value="C:\Program Files\Java\SDK\jdk\jre\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="GBK"/>
@@ -33,18 +33,17 @@
<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:\Program Files\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="11.3-b02"/>
<property name="user.variant" value=""/>
<property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
- <property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
<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"/>
@@ -54,7 +53,7 @@
<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.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:\Program Files\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:\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"/>
@@ -65,10 +64,9 @@
<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="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="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\.m2\repository\org\cipres\treebase\treebase-core\1.0-SNAPSHOT\treebase-core-1.0-SNAPSHOT.jar;"/>
<property name="env.ProgramFiles" value="C:\Program Files"/>
<property name="env.PROCESSOR_REVISION" value="1706"/>
<property name="java.io.tmpdir" value="C:\DOCUME~1\youjun\LOCALS~1\Temp\"/>
@@ -76,7 +74,7 @@
<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:\Pro...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-09 00:30:03
|
Revision: 260
http://treebase.svn.sourceforge.net/treebase/?rev=260&view=rev
Author: youjun
Date: 2009-11-09 00:29:52 +0000 (Mon, 09 Nov 2009)
Log Message:
-----------
unit test
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/test/java/org/treebase/oai/web/command/IdentifyTest.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.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/java/org/treebase/oai/web/util/IdentifyUtilTest.java
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/WEB-INF/
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/target/surefire-reports/
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/WEB-INF/
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
Removed Paths:
-------------
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java
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-08 01:03:27 UTC (rev 259)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java 2009-11-09 00:29:52 UTC (rev 260)
@@ -6,8 +6,12 @@
import java.util.GregorianCalendar;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
+/**
+ *
+ * @author youjun
+ * class hold identify data about the service
+ */
-
public class Identify {
public String getGranularityPattern() {
@@ -69,6 +73,7 @@
this.granularity = granularity;
}
+ // return a current date object in UTC
public String getResponseDate(Date date){
SimpleDateFormat format = new SimpleDateFormat(granularityPattern);
Calendar cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"));
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-08 01:03:27 UTC (rev 259)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java 2009-11-09 00:29:52 UTC (rev 260)
@@ -9,9 +9,15 @@
import org.treebase.oai.web.command.Identify;
import org.treebase.oai.web.command.OAIPMHCommand;
-
+/*
+ *
+ * @author youjun
+ *
+ */
public class IdentifyUtil {
+ // check if the MetadataPrefix in the params is supported by the service
+
public static boolean badMetadataPrefix(OAIPMHCommand params){
if (params.getMetadataPrefix().toLowerCase()=="dc")
return false;
@@ -20,12 +26,18 @@
return true;
}
+ // return a studyID by parsing params.identifier
+
public static long parseID(OAIPMHCommand params)
{
- String [] ids = params.getIdentifier().split("/");
- return Long.parseLong(ids[ids.length-1]);
+ String [] ids = params.getIdentifier().split("[/:.]");
+
+ return Long.parseLong(ids[ids.length-1].replaceAll("[a-zA-Z]",""));
}
+
+ // convert a time String to date object based on granularity
+
public static Date parseGranularity(String granularity, String time ) throws ParseException
{
@@ -36,6 +48,8 @@
}
+ //convert a date object from utc to local
+
protected static Date utcToLocal(Date utcDate)
{
long utcMiliseconds = utcDate.getTime();
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/IdentifyTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/IdentifyTest.java 2009-11-08 01:03:27 UTC (rev 259)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/IdentifyTest.java 2009-11-09 00:29:52 UTC (rev 260)
@@ -1,21 +1,28 @@
package org.treebase.oai.web.command;
-import junit.framework.TestCase;
+import java.util.Date;
+import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
-public class IdentifyTest extends TestCase {
+public class IdentifyTest extends AbstractDependencyInjectionSpringContextTests {
+
+ private Identify identify;
- public void setUp() {
-
+ public void setIdentify(Identify identify) {
+ this.identify = identify;
}
+
+ @Override
+ protected String[] getConfigLocations() {
+ return new String[]{"applicationContext.xml"};
+ }
- public void testAction() {
+ public void testLoadIdentify() {
+
+ this.assertNotNull(identify);
}
- public void testPerform() {
-
- }
}
\ No newline at end of file
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java 2009-11-08 01:03:27 UTC (rev 259)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java 2009-11-09 00:29:52 UTC (rev 260)
@@ -1,23 +0,0 @@
-package org.treebase.oai.web.command;
-
-import junit.framework.TestCase;
-
-
-
-public class OAIPMHCommandTest {
-
-
- public void setUp() {
-
- }
-
- public void testAction() {
-
- }
-
- public void testPerform() {
-
- }
-
-
-}
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java 2009-11-08 01:03:27 UTC (rev 259)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java 2009-11-09 00:29:52 UTC (rev 260)
@@ -9,8 +9,8 @@
TestSuite suite = new TestSuite("Test for org.cipres.treebase.auxdata");
suite.addTestSuite(IdentifyTest.class);
- suite.addTestSuite(OAIPMHCommandTest.class);
+
return suite;
}
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-08 01:03:27 UTC (rev 259)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-09 00:29:52 UTC (rev 260)
@@ -10,10 +10,11 @@
/**
* constructor.
*/
- public OAIPMHControllerTest () {
- super();
+
+
+ public void testXXXX() {
+
}
-
@Override
protected String[] getConfigLocations() {
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/IdentifyUtilTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/IdentifyUtilTest.java 2009-11-08 01:03:27 UTC (rev 259)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/IdentifyUtilTest.java 2009-11-09 00:29:52 UTC (rev 260)
@@ -1,22 +1,30 @@
package org.treebase.oai.web.util;
+import org.treebase.oai.web.command.OAIPMHCommand;
+
import junit.framework.TestCase;
-public class IdentifyUtilTest {
+public class IdentifyUtilTest extends TestCase{
+ private OAIPMHCommand params;
- public void setUp() {
-
- }
+ public void setUp() {
+ params= new OAIPMHCommand();
- public void testAction() {
-
- }
+ }
+
+ public void testParseID() {
+ params.setIdentifier("http://arXiv.org/abs/cs/0112017");
+ this.assertEquals(112017L, IdentifyUtil.parseID(params));
+ params.setIdentifier("oai:HUBerlin.de:3000218");
+ this.assertEquals(3000218L, IdentifyUtil.parseID(params));
+ params.setIdentifier("http://purl.org/phylo/treebase/phylows/study/TB2:S6705");
+ this.assertEquals(6705L, IdentifyUtil.parseID(params));
+
+
+ }
- public void testPerform() {
-
- }
}
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/WEB-INF/identify.properties 2009-11-09 00:29:52 UTC (rev 260)
@@ -0,0 +1,8 @@
+identify.baseRUL=www.***/top.edu
+identify.repositoryName=org.treebase.oai
+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'
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/resources/applicationContext.xml 2009-11-09 00:29:52 UTC (rev 260)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans default-autowire="no"
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:dwr="http://www.directwebremoting.org/schema/spring-dwr"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.directwebremoting.org/schema/spring-dwr
+ http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd">
+
+ <bean id="top.propertyConfigurer"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="locations">
+ <list>
+ <value>/WEB-INF/identify.properties</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="top.identify" class="org.treebase.oai.web.command.Identify">
+ <property name="baseRUL" value="${identify.baseRUL}" />
+ <property name="repositoryName" value="${identify.repositoryName}" />
+ <property name="protocolVersion" value="${identify.protocolVersion}" />
+ <property name="adminEmail" value="${identify.adminEmail}" />
+ <property name="earliestDatestamp" value="${identify.earliestDatestamp}" />
+ <property name="deletedRecord" value="${identify.deletedRecord}" />
+ <property name="granularity" value="${identify.granularity}" />
+ <property name="granularityPattern" value="${identify.granularityPattern}" />
+
+ </bean>
+
+ <!-- ========================================================== -->
+ <!-- LIST OF DWR beans/methods -->
+ <!-- ========================================================== -->
+
+
+
+ <!-- bean id="remoteAjaxProgressListener" class="org.cipres.treebase.web.controllers.AjaxProgressListener">
+ <dwr:remote javascript="RemoteAjaxProgressListener">
+ <dwr:include method="getStatus"/>
+ </dwr:remote>
+ </bean -->
+ <!-- dwr:configuration>
+ <dwr:convert type="bean" class="org.cipres.treebase.web.model.UploadInfoBean"/>
+ </dwr:configuration -->
+
+
+
+</beans>
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.IdentifyTest.xml 2009-11-09 00:29:52 UTC (rev 260)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.016" 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="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="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="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\m2conf4319035611112168820.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.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.HOMEDRIVE" value="C:"/>
+ <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:\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, 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="10.0-b23"/>
+ <property name="user.variant" value=""/>
+ <property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
+ <property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
+ <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="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.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.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.vm.specification.name" value="Java Virtual Machine Specification"/>
+ <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:\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="env.PROCESSOR_REVISION" value="1706"/>
+ <property name="java.io.tmpdir" value="C:\DOCUME~1\youjun\LOCALS~1\Temp\"/>
+ <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="env.tvdumpflags" value="8"/>
+ <property name="user.dir" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web"/>
+ <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="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="java.specification.version" value="1.6"/>
+ <property name="env.PROCESSOR_LEVEL" value="6"/>
+ </properties>
+ <testcase time="0.016" classname="org.treebase.oai.web.command.IdentifyTest" name="testLoadIdentify"/>
+</testsuite>
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.command.OAIPMHCommandTest.xml 2009-11-09 00:29:52 UTC (rev 260)
@@ -0,0 +1,98 @@
+<?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">
+ <properties>
+ <property name="java.vendor" value="Sun Microsystems Inc."/>
+ <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="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="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\m2conf2718452852784588497.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.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.HOMEDRIVE" value="C:"/>
+ <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:\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, 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="10.0-b23"/>
+ <property name="user.variant" value=""/>
+ <property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
+ <property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
+ <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="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.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.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.vm.specification.name" value="Java Virtual Machine Specification"/>
+ <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:\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="env.PROCESSOR_REVISION" value="1706"/>
+ <property name="java.io.tmpdir" value="C:\DOCUME~1\youjun\LOCALS~1\Temp\"/>
+ <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="env.tvdumpflags" value="8"/>
+ <property name="user.dir" value="C:\Documents and Settings\youjun\workspace\oai-pmh_data_provider\data_provider_web"/>
+ <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="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="java.specification.version" value="1.6"/>
+ <property name="env.PROCESSOR_LEVEL" value="6"/>
+ </properties>
+ <testcase time="0" classname="org.treebase.oai.web.command.OAIPMHCommandTest" name="org.treebase.oai.web.command.OAIPMHCommandTest.testAction"/>
+ <testcase time="0" classname="org.treebase.oai.web.command.OAIPMHCommandTest" name="org.treebase.oai.web.command.OAIPMHCommandTest.testPerform"/>
+</testsuite>
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/target/surefire-reports/TEST-org.treebase.oai.web.controller.OAIPMHControllerTest.xml 2009-11-09 00:29:52 UTC (rev 260)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="5.515" errors="0" skipped="0" tests="1" 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="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="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="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\m2conf4319035611112168820.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.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.HOMEDRIVE" value="C:"/>
+ <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:\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, 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="10.0-b23"/>
+ <property name="user.variant" value=""/>
+ <property name="env.USERPROFILE" value="C:\Documents and Settings\youjun"/>
+ <property name="mesquite.folder_dir" value="/home/mjd/Mesquite_Folder/"/>
+ <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="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.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.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.vm.specification.name" value="Java Virtual Machine Specification"/>
+ <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:\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\repos...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-08 01:03:34
|
Revision: 259
http://treebase.svn.sourceforge.net/treebase/?rev=259&view=rev
Author: youjun
Date: 2009-11-08 01:03:27 +0000 (Sun, 08 Nov 2009)
Log Message:
-----------
add test classes
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.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/java/org/treebase/oai/web/controller/PackageTestSuite.java
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java 2009-11-08 01:03:27 UTC (rev 259)
@@ -3,34 +3,15 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-/**
- * The class <code>PackageTestSuite</code> builds a suite that can be used to run all of the tests
- * within its package as well as within any subpackages of its package.
- *
- * @generatedBy CodePro at 9/27/05 10:27 AM
- * @author Jin Ruan
- * @version $Revision: 1.0 $
- */
+
public class PackageTestSuite {
- /**
- * Launch the test.
- *
- * @param args the command line arguments
- *
- * @generatedBy CodePro at 9/27/05 10:27 AM
- */
+
public static void main(String[] args) {
junit.textui.TestRunner.run(suite());
}
- /**
- * Create a test suite that can run all of the test cases in this package and all subpackages.
- *
- * @return the test suite that was created
- *
- * @generatedBy CodePro at 9/27/05 10:27 AM
- */
+
public static Test suite() {
TestSuite suite = new TestSuite("Tests in package " + PackageTestSuite.class.getName());
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java 2009-11-08 01:03:27 UTC (rev 259)
@@ -3,34 +3,15 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-/**
- * The class <code>PackageTestSuite</code> builds a suite that can be used to run all of the tests
- * within its package as well as within any subpackages of its package.
- *
- * @generatedBy CodePro at 10/13/05 4:18 PM
- * @author Jin Ruan
- * @version $Revision: 1.0 $
- */
+
public class PackageTestSuite {
- /**
- * Launch the test.
- *
- * @param args the command line arguments
- *
- * @generatedBy CodePro at 10/13/05 4:18 PM
- */
+
public static void main(String[] args) {
junit.textui.TestRunner.run(suite());
}
- /**
- * Create a test suite that can run all of the test cases in this package and all subpackages.
- *
- * @return the test suite that was created
- *
- * @generatedBy CodePro at 10/13/05 4:18 PM
- */
+
public static Test suite() {
TestSuite suite = new TestSuite("Tests in package " + PackageTestSuite.class.getName());
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java 2009-11-08 01:03:27 UTC (rev 259)
@@ -7,11 +7,11 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.cipres.treebase.auxdata");
- //$JUnit-BEGIN$
+
suite.addTestSuite(IdentifyTest.class);
suite.addTestSuite(OAIPMHCommandTest.class);
- //$JUnit-END$
+
return suite;
}
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-07 17:44:44 UTC (rev 258)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-08 01:03:27 UTC (rev 259)
@@ -14,10 +14,7 @@
super();
}
- /**
- *
- * @see org.springframework.test.AbstractDependencyInjectionSpringContextTests#getConfigLocations()
- */
+
@Override
protected String[] getConfigLocations() {
return CoreServiceLauncher.getSpringConfigurations();
Modified: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/PackageTestSuite.java 2009-11-08 01:03:27 UTC (rev 259)
@@ -7,10 +7,10 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.cipres.treebase.auxdata");
- //$JUnit-BEGIN$
+
suite.addTestSuite(OAIPMHControllerTest.class);
- //$JUnit-END$
+
return suite;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-07 17:44:53
|
Revision: 258
http://treebase.svn.sourceforge.net/treebase/?rev=258&view=rev
Author: youjun
Date: 2009-11-07 17:44:44 +0000 (Sat, 07 Nov 2009)
Log Message:
-----------
test classes
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/IdentifyTest.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/
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/PackageTestSuite.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/IdentifyUtilTest.java
trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/PackageTestSuite.java
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/PackageTestSuite.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/PackageTestSuite.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/IdentifyTest.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/OAIPMHCommandTest.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/PackageTestSuite.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/
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/org/treebase/oai/web/controller/PackageTestSuite.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/IdentifyUtilTest.class
trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/PackageTestSuite.class
Modified: trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component 2009-11-06 16:36:12 UTC (rev 257)
+++ trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component 2009-11-07 17:44:44 UTC (rev 258)
@@ -4,7 +4,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
- <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/treebase/treebase">
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/treebase-core/treebase-core">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="data_provider_web"/>
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,42 @@
+package org.treebase.oai;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * The class <code>PackageTestSuite</code> builds a suite that can be used to run all of the tests
+ * within its package as well as within any subpackages of its package.
+ *
+ * @generatedBy CodePro at 9/27/05 10:27 AM
+ * @author Jin Ruan
+ * @version $Revision: 1.0 $
+ */
+public class PackageTestSuite {
+
+ /**
+ * Launch the test.
+ *
+ * @param args the command line arguments
+ *
+ * @generatedBy CodePro at 9/27/05 10:27 AM
+ */
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ /**
+ * Create a test suite that can run all of the test cases in this package and all subpackages.
+ *
+ * @return the test suite that was created
+ *
+ * @generatedBy CodePro at 9/27/05 10:27 AM
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Tests in package " + PackageTestSuite.class.getName());
+
+ suite.addTest(org.treebase.oai.web.PackageTestSuite.suite());
+
+ return suite;
+ }
+}
+
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,48 @@
+package org.treebase.oai.web;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * The class <code>PackageTestSuite</code> builds a suite that can be used to run all of the tests
+ * within its package as well as within any subpackages of its package.
+ *
+ * @generatedBy CodePro at 10/13/05 4:18 PM
+ * @author Jin Ruan
+ * @version $Revision: 1.0 $
+ */
+public class PackageTestSuite {
+
+ /**
+ * Launch the test.
+ *
+ * @param args the command line arguments
+ *
+ * @generatedBy CodePro at 10/13/05 4:18 PM
+ */
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ /**
+ * Create a test suite that can run all of the test cases in this package and all subpackages.
+ *
+ * @return the test suite that was created
+ *
+ * @generatedBy CodePro at 10/13/05 4:18 PM
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Tests in package " + PackageTestSuite.class.getName());
+
+ //suite.addTestSuite(ContextManagerTest.class);
+ //suite.addTestSuite(RangeExpressionTest.class);
+ //suite.addTestSuite(TreebaseIDStringTest.class);
+ //suite.addTestSuite(TreebaseUtilTest.class);
+
+ suite.addTest(org.treebase.oai.web.command.PackageTestSuite.suite());
+ suite.addTest(org.treebase.oai.web.controller.PackageTestSuite.suite());
+ suite.addTest(org.treebase.oai.web.util.PackageTestSuite.suite());
+
+ return suite;
+ }
+}
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/IdentifyTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/IdentifyTest.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/IdentifyTest.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,21 @@
+package org.treebase.oai.web.command;
+
+import junit.framework.TestCase;
+
+
+public class IdentifyTest extends TestCase {
+
+
+ public void setUp() {
+
+ }
+
+ public void testAction() {
+
+ }
+
+ public void testPerform() {
+
+ }
+
+}
\ No newline at end of file
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/OAIPMHCommandTest.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,23 @@
+package org.treebase.oai.web.command;
+
+import junit.framework.TestCase;
+
+
+
+public class OAIPMHCommandTest {
+
+
+ public void setUp() {
+
+ }
+
+ public void testAction() {
+
+ }
+
+ public void testPerform() {
+
+ }
+
+
+}
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/command/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,18 @@
+package org.treebase.oai.web.command;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class PackageTestSuite {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.cipres.treebase.auxdata");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(IdentifyTest.class);
+ suite.addTestSuite(OAIPMHCommandTest.class);
+
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Added: 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 (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/OAIPMHControllerTest.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,26 @@
+package org.treebase.oai.web.controller;
+
+import org.cipres.treebase.core.CoreServiceLauncher;
+import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
+
+
+
+public class OAIPMHControllerTest extends AbstractDependencyInjectionSpringContextTests {
+
+ /**
+ * constructor.
+ */
+ public OAIPMHControllerTest () {
+ super();
+ }
+
+ /**
+ *
+ * @see org.springframework.test.AbstractDependencyInjectionSpringContextTests#getConfigLocations()
+ */
+ @Override
+ protected String[] getConfigLocations() {
+ return CoreServiceLauncher.getSpringConfigurations();
+ }
+
+}
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/PackageTestSuite.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/controller/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,17 @@
+package org.treebase.oai.web.controller;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class PackageTestSuite {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.cipres.treebase.auxdata");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(OAIPMHControllerTest.class);
+
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/IdentifyUtilTest.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/IdentifyUtilTest.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/IdentifyUtilTest.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,22 @@
+package org.treebase.oai.web.util;
+
+import junit.framework.TestCase;
+
+
+
+public class IdentifyUtilTest {
+
+ public void setUp() {
+
+ }
+
+ public void testAction() {
+
+ }
+
+ public void testPerform() {
+
+ }
+
+
+}
Added: trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/PackageTestSuite.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/PackageTestSuite.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/test/java/org/treebase/oai/web/util/PackageTestSuite.java 2009-11-07 17:44:44 UTC (rev 258)
@@ -0,0 +1,17 @@
+package org.treebase.oai.web.util;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class PackageTestSuite {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.cipres.treebase.auxdata");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(IdentifyUtilTest.class);
+
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/PackageTestSuite.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/PackageTestSuite.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/PackageTestSuite.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/PackageTestSuite.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/IdentifyTest.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/IdentifyTest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/OAIPMHCommandTest.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/OAIPMHCommandTest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/PackageTestSuite.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/command/PackageTestSuite.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/OAIPMHControllerTest.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/OAIPMHControllerTest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/PackageTestSuite.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/controller/PackageTestSuite.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/IdentifyUtilTest.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/IdentifyUtilTest.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/PackageTestSuite.class
===================================================================
(Binary files differ)
Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/test-classes/org/treebase/oai/web/util/PackageTestSuite.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-06 16:36:20
|
Revision: 257
http://treebase.svn.sourceforge.net/treebase/?rev=257&view=rev
Author: youjun
Date: 2009-11-06 16:36:12 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
typo-proof, add a test on SubmissionDAOTest
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -184,12 +184,12 @@
return (Submission) q.uniqueResult();
}
- public Collection<Submission> findByCreateDateRange(Date from, Date util) {
+ public Collection<Submission> findByCreateDateRange(Date from, Date until) {
Query q = getSession().createQuery(
- "from Submission as sub where sub.createDate between :begin and :end");
+ "from Submission where createdate between :begin and :end");
q.setDate("begin", from);
- q.setDate("end", util);
+ q.setDate("end", until);
return q.list();
}
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -71,5 +71,5 @@
Collection<Submission> findByPublishedState();
Collection<Submission> findByInProgressState();
- Collection<Submission> findByCreateDateRange(Date from, Date util);
+ Collection<Submission> findByCreateDateRange(Date from, Date until);
}
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -41,7 +41,7 @@
Collection<Submission> findPublishedSubmissions();
- Collection<Submission> findSubmissionByCreateDateRange(Date from, Date util);
+ Collection<Submission> findSubmissionByCreateDateRange(Date from, Date until);
/**
* Create a submission, which associates with a new study. A submitter is required.
*
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -929,10 +929,10 @@
}
- public Collection<Submission> findSubmissionByCreateDateRange(Date from, Date util) {
+ public Collection<Submission> findSubmissionByCreateDateRange(Date from, Date until) {
- return getSubmissionHome().findByCreateDateRange(from, util);
+ return getSubmissionHome().findByCreateDateRange(from, until);
}
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java 2009-11-05 20:30:13 UTC (rev 256)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/SubmissionDAOTest.java 2009-11-06 16:36:12 UTC (rev 257)
@@ -1,6 +1,8 @@
package org.cipres.treebase.dao.study;
import java.util.Collection;
+import java.util.Date;
+import java.util.GregorianCalendar;
import org.cipres.treebase.dao.AbstractDAOTest;
import org.cipres.treebase.domain.matrix.Matrix;
@@ -166,6 +168,23 @@
}
}
+ public void testFindByCreateDateRange() {
+ String testName = "testFindByCreateDateRange";
+ if (logger.isInfoEnabled()) {
+ logger.info("\n\t\tRunning Test: " + testName);
+ }
+
+ Date from = (new GregorianCalendar(2006,1,1)).getTime();
+ Date until = (new GregorianCalendar(2007,1,1)).getTime();
+
+ Collection<Submission> s = getFixture().findByCreateDateRange(from, until);
+ assertTrue(s.size() > 0);
+ if (logger.isInfoEnabled()) {
+ logger.info("\n\t\tRunning Test: found " + s.size());
+ }
+ }
+
+
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-05 20:30:21
|
Revision: 256
http://treebase.svn.sourceforge.net/treebase/?rev=256&view=rev
Author: youjun
Date: 2009-11-05 20:30:13 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
finish coding
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/controller/OAIPMHController.java
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/cannotDisseminateFormat.vm
Removed Paths:
-------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/cannotDisseminateFormat.vm
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-05 16:32:57 UTC (rev 255)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java 2009-11-05 20:30:13 UTC (rev 256)
@@ -10,6 +10,13 @@
public class Identify {
+ public String getGranularityPattern() {
+ return granularityPattern;
+ }
+ public void setGranularityPattern(String granularityPattern) {
+ this.granularityPattern = granularityPattern;
+ }
+
private String baseRUL;
private String repositoryName;
private String protocolVersion;
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-05 16:32:57 UTC (rev 255)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-05 20:30:13 UTC (rev 256)
@@ -1,6 +1,7 @@
package org.treebase.oai.web.controller;
import java.lang.reflect.Method;
+import java.text.ParseException;
import java.util.List;
import java.util.Map;
@@ -12,7 +13,7 @@
import org.springframework.web.servlet.mvc.AbstractCommandController;
import org.treebase.oai.web.command.Identify;
import org.treebase.oai.web.command.OAIPMHCommand;
-import org.treebase.oai.web.util.ParamsUtil;
+import org.treebase.oai.web.util.IdentifyUtil;
import org.cipres.treebase.domain.study.Submission;
import org.cipres.treebase.domain.study.SubmissionService;
import org.cipres.treebase.domain.study.StudyService;
@@ -76,7 +77,7 @@
Method method=null;
- if(ParamsUtil.badMetadataPrefix(params))
+ if(IdentifyUtil.badMetadataPrefix(params))
return new ModelAndView("cannotDisseminateFormat.vm",model);
@@ -96,7 +97,14 @@
ModelAndView ListRecoed(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
List<Submission> list=null;
- model.put("recodeList", list);;
+ try {
+ list = (List)submissionService.findSubmissionByCreateDateRange(IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getFrom()),
+ IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getUntil()));
+ } catch (ParseException e) {
+ // TODO Auto-generated catch block
+ return (new ModelAndView("badArgument.vm",model));
+ }
+ model.put("recodeList", list);
return (new ModelAndView(params.getMetadataPrefix()+"_ListRecoed.vm",model));
}
@@ -105,6 +113,13 @@
ModelAndView ListIdentifiers(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
List<Submission> list=null;
+ try {
+ list = (List)submissionService.findSubmissionByCreateDateRange(IdentifyUtil.parseGranularity(identify.getGranularityPattern(),params.getFrom()),
+ IdentifyUtil.parseGranularity(identify.getGranularityPattern(), params.getUntil()));
+ } catch (ParseException e) {
+ // TODO Auto-generated catch block
+ return (new ModelAndView("badArgument.vm",model));
+ }
model.put("recodeList", list);
return (new ModelAndView(params.getMetadataPrefix()+"_ListIdentifiers.vm",model));
@@ -115,7 +130,7 @@
Submission submission = null;
try{
- long id = ParamsUtil.parseID(params);
+ long id = IdentifyUtil.parseID(params);
submission = studyService.findByID(id).getSubmission();
}catch(NumberFormatException nfe){
return (new ModelAndView("badArgument.vm",model));
@@ -149,7 +164,7 @@
Submission submission = null;
try{
- long id = ParamsUtil.parseID(params);
+ long id = IdentifyUtil.parseID(params);
submission = studyService.findByID(id).getSubmission();
}catch(NumberFormatException nfe){
return (new ModelAndView("badArgument.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-05 16:32:57 UTC (rev 255)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java 2009-11-05 20:30:13 UTC (rev 256)
@@ -1,5 +1,13 @@
package org.treebase.oai.web.util;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+import org.treebase.oai.web.command.Identify;
import org.treebase.oai.web.command.OAIPMHCommand;
public class IdentifyUtil {
@@ -17,4 +25,23 @@
String [] ids = params.getIdentifier().split("/");
return Long.parseLong(ids[ids.length-1]);
}
+
+ public static Date parseGranularity(String granularity, String time ) throws ParseException
+ {
+
+ SimpleDateFormat sdf = new SimpleDateFormat(granularity);
+ Date utcDate = sdf.parse(time);
+ return utcToLocal(utcDate);
+
+
+ }
+
+ protected static Date utcToLocal(Date utcDate)
+ {
+ long utcMiliseconds = utcDate.getTime();
+
+ Calendar cal = new GregorianCalendar();
+ cal.setTimeInMillis(utcMiliseconds);
+ return new Date(utcMiliseconds + cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET));
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-05 16:33:09
|
Revision: 255
http://treebase.svn.sourceforge.net/treebase/?rev=255&view=rev
Author: youjun
Date: 2009-11-05 16:32:57 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
change a util class name
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/.classpath
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java
Removed Paths:
-------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java
Modified: trunk/oai-pmh_data_provider/data_provider_web/.classpath
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-05 15:56:16 UTC (rev 254)
+++ trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-05 16:32:57 UTC (rev 255)
@@ -12,6 +12,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="lib" path="/treebase/treebase-core/target/treebase-core-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="C:/Documents and Settings/youjun/.m2/repository/org/cipres/treebase/treebase-core/1.0-SNAPSHOT/treebase-core-1.0-SNAPSHOT.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Copied: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java (from rev 250, trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java)
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/IdentifyUtil.java 2009-11-05 16:32:57 UTC (rev 255)
@@ -0,0 +1,20 @@
+package org.treebase.oai.web.util;
+
+import org.treebase.oai.web.command.OAIPMHCommand;
+
+public class IdentifyUtil {
+
+ public static boolean badMetadataPrefix(OAIPMHCommand params){
+ if (params.getMetadataPrefix().toLowerCase()=="dc")
+ return false;
+ if (params.getMetadataPrefix().toLowerCase()=="dryad")
+ return false;
+ return true;
+ }
+
+ public static long parseID(OAIPMHCommand params)
+ {
+ String [] ids = params.getIdentifier().split("/");
+ return Long.parseLong(ids[ids.length-1]);
+ }
+}
Deleted: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java 2009-11-05 15:56:16 UTC (rev 254)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java 2009-11-05 16:32:57 UTC (rev 255)
@@ -1,20 +0,0 @@
-package org.treebase.oai.web.util;
-
-import org.treebase.oai.web.command.OAIPMHCommand;
-
-public class ParamsUtil {
-
- public static boolean badMetadataPrefix(OAIPMHCommand params){
- if (params.getMetadataPrefix().toLowerCase()=="dc")
- return false;
- if (params.getMetadataPrefix().toLowerCase()=="dryad")
- return false;
- return true;
- }
-
- public static long parseID(OAIPMHCommand params)
- {
- String [] ids = params.getIdentifier().split("/");
- return Long.parseLong(ids[ids.length-1]);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-05 15:56:25
|
Revision: 254
http://treebase.svn.sourceforge.net/treebase/?rev=254&view=rev
Author: youjun
Date: 2009-11-05 15:56:16 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
fix a typo
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-05 15:41:54 UTC (rev 253)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-05 15:56:16 UTC (rev 254)
@@ -929,7 +929,7 @@
}
- public Collection<Submission> findSubmissionByCreateTimeRange(Date from, Date util) {
+ public Collection<Submission> findSubmissionByCreateDateRange(Date from, Date util) {
return getSubmissionHome().findByCreateDateRange(from, util);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-05 15:42:10
|
Revision: 253
http://treebase.svn.sourceforge.net/treebase/?rev=253&view=rev
Author: youjun
Date: 2009-11-05 15:41:54 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
add postgresql jdbc driver to maven dependency
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-05 15:32:57 UTC (rev 252)
+++ trunk/pom.xml 2009-11-05 15:41:54 UTC (rev 253)
@@ -106,6 +106,11 @@
<artifactId>log4j</artifactId>
<version>1.2.13</version>
</dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-507.jdbc4</version>
+ </dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2009-11-05 15:33:17
|
Revision: 252
http://treebase.svn.sourceforge.net/treebase/?rev=252&view=rev
Author: youjun
Date: 2009-11-05 15:32:57 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
add a method to select submission base on "create date" in DAO and service layer update interfaces also
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
Added Paths:
-----------
trunk/treebase-core/src/main/java/META-INF/
trunk/treebase-core/src/main/java/META-INF/MANIFEST.MF
Added: trunk/treebase-core/src/main/java/META-INF/MANIFEST.MF
===================================================================
--- trunk/treebase-core/src/main/java/META-INF/MANIFEST.MF (rev 0)
+++ trunk/treebase-core/src/main/java/META-INF/MANIFEST.MF 2009-11-05 15:32:57 UTC (rev 252)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java 2009-11-04 22:20:57 UTC (rev 251)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java 2009-11-05 15:32:57 UTC (rev 252)
@@ -2,6 +2,7 @@
package org.cipres.treebase.dao.study;
import java.util.Collection;
+import java.util.Date;
import org.hibernate.Criteria;
import org.hibernate.Query;
@@ -139,6 +140,7 @@
return q.list();
}
+
/**
*
* @see org.cipres.treebase.domain.study.SubmissionHome#findByReadyState()
@@ -181,5 +183,14 @@
return (Submission) q.uniqueResult();
}
+
+ public Collection<Submission> findByCreateDateRange(Date from, Date util) {
+ Query q = getSession().createQuery(
+ "from Submission as sub where sub.createDate between :begin and :end");
+ q.setDate("begin", from);
+ q.setDate("end", util);
+ return q.list();
+ }
+
}
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java 2009-11-04 22:20:57 UTC (rev 251)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java 2009-11-05 15:32:57 UTC (rev 252)
@@ -1,6 +1,7 @@
package org.cipres.treebase.domain.study;
+import java.util.Date;
import java.util.Collection;
import org.cipres.treebase.domain.DomainHome;
@@ -70,4 +71,5 @@
Collection<Submission> findByPublishedState();
Collection<Submission> findByInProgressState();
+ Collection<Submission> findByCreateDateRange(Date from, Date util);
}
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java 2009-11-04 22:20:57 UTC (rev 251)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java 2009-11-05 15:32:57 UTC (rev 252)
@@ -3,6 +3,7 @@
import java.io.File;
import java.util.Collection;
+import java.util.Date;
import org.cipres.treebase.dao.jdbc.NexusDataSetJDBC;
import org.cipres.treebase.domain.admin.User;
@@ -40,6 +41,7 @@
Collection<Submission> findPublishedSubmissions();
+ Collection<Submission> findSubmissionByCreateDateRange(Date from, Date util);
/**
* Create a submission, which associates with a new study. A submitter is required.
*
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-04 22:20:57 UTC (rev 251)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java 2009-11-05 15:32:57 UTC (rev 252)
@@ -928,8 +928,18 @@
return getSubmissionHome().findByMatrix(pMatrix);
}
+
+ public Collection<Submission> findSubmissionByCreateTimeRange(Date from, Date util) {
+
+
+ return getSubmissionHome().findByCreateDateRange(from, util);
+ }
+
+
+
@Override
public Class defaultResultClass() {
return Submission.class;
}
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-04 22:21:06
|
Revision: 251
http://treebase.svn.sourceforge.net/treebase/?rev=251&view=rev
Author: rvos
Date: 2009-11-04 22:20:57 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Adding BSD-style license
Added Paths:
-----------
trunk/LICENSE.txt
Added: trunk/LICENSE.txt
===================================================================
--- trunk/LICENSE.txt (rev 0)
+++ trunk/LICENSE.txt 2009-11-04 22:20:57 UTC (rev 251)
@@ -0,0 +1,27 @@
+Copyright (c) 2009, Phyloinformatics Research Foundation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+* Neither the name of the Phyloinformatics Research Foundation nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ 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-04 21:12:30
|
Revision: 250
http://treebase.svn.sourceforge.net/treebase/?rev=250&view=rev
Author: youjun
Date: 2009-11-04 21:12:12 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java
Added Paths:
-----------
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/cannotDisseminateFormat.vm
trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java
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/ListMetadataFormats.vm
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/idDoesNotExist.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-04 17:04:34 UTC (rev 249)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-04 21:12:12 UTC (rev 250)
@@ -1,7 +1,7 @@
package org.treebase.oai.web.controller;
import java.lang.reflect.Method;
-import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -12,9 +12,18 @@
import org.springframework.web.servlet.mvc.AbstractCommandController;
import org.treebase.oai.web.command.Identify;
import org.treebase.oai.web.command.OAIPMHCommand;
+import org.treebase.oai.web.util.ParamsUtil;
+import org.cipres.treebase.domain.study.Submission;
import org.cipres.treebase.domain.study.SubmissionService;
import org.cipres.treebase.domain.study.StudyService;
-
+/**
+ * OAIPMHController.java
+ *
+ * Created on Nov. 1, 2009
+ *
+ * @author Youjun Guo
+ *
+ */
public class OAIPMHController extends AbstractCommandController{
private SubmissionService submissionService;
@@ -64,23 +73,30 @@
model.put("requestParams", params);
model.put("identify", this.identify);
- String responsDate;
Method method=null;
+ if(ParamsUtil.badMetadataPrefix(params))
+
+ return new ModelAndView("cannotDisseminateFormat.vm",model);
try{
method=this.getClass().getMethod(params.getVerb(), new Class[]{HttpServletRequest.class, HttpServletResponse.class, OAIPMHCommand.class, Map.class});
- }catch(NoSuchMethodException e){
+ }catch(NoSuchMethodException nsme){
return new ModelAndView("badVerb.vm",model);
+ }catch(NullPointerException e){
+ return (new ModelAndView("badArgument.vm",model));
}
- return (ModelAndView) method.invoke(this, request, response, params, model);
- }
+ return (ModelAndView) method.invoke(this, request, response, params, model);
+
+ }
ModelAndView ListRecoed(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ List<Submission> list=null;
+ model.put("recodeList", list);;
return (new ModelAndView(params.getMetadataPrefix()+"_ListRecoed.vm",model));
}
@@ -88,18 +104,35 @@
ModelAndView ListIdentifiers(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ List<Submission> list=null;
+ model.put("recodeList", list);
return (new ModelAndView(params.getMetadataPrefix()+"_ListIdentifiers.vm",model));
}
ModelAndView GetRecord(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+ Submission submission = null;
+
+ try{
+ long id = ParamsUtil.parseID(params);
+ submission = studyService.findByID(id).getSubmission();
+ }catch(NumberFormatException nfe){
+ return (new ModelAndView("badArgument.vm",model));
+ }
+ catch (NullPointerException e){
+
+ return (new ModelAndView("idDoesNotExist.vm",model));
+ }
+
+ model.put("record", submission);
return (new ModelAndView(params.getMetadataPrefix()+"_GetRecord.vm",model));
}
ModelAndView Identify(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+
return (new ModelAndView("Identify.vm",model));
}
@@ -112,6 +145,20 @@
ModelAndView ListMetadataFormats(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){
+
+ Submission submission = null;
+
+ try{
+ long id = ParamsUtil.parseID(params);
+ submission = studyService.findByID(id).getSubmission();
+ }catch(NumberFormatException nfe){
+ return (new ModelAndView("badArgument.vm",model));
+ }
+ catch (NullPointerException e){
+
+ return (new ModelAndView("idDoesNotExist.vm",model));
+ }
+
return (new ModelAndView("ListMetadataFormats.vm",model));
}
Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java (rev 0)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/util/ParamsUtil.java 2009-11-04 21:12:12 UTC (rev 250)
@@ -0,0 +1,20 @@
+package org.treebase.oai.web.util;
+
+import org.treebase.oai.web.command.OAIPMHCommand;
+
+public class ParamsUtil {
+
+ public static boolean badMetadataPrefix(OAIPMHCommand params){
+ if (params.getMetadataPrefix().toLowerCase()=="dc")
+ return false;
+ if (params.getMetadataPrefix().toLowerCase()=="dryad")
+ return false;
+ return true;
+ }
+
+ public static long parseID(OAIPMHCommand params)
+ {
+ String [] ids = params.getIdentifier().split("/");
+ return Long.parseLong(ids[ids.length-1]);
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-04 17:04:42
|
Revision: 249
http://treebase.svn.sourceforge.net/treebase/?rev=249&view=rev
Author: rvos
Date: 2009-11-04 17:04:34 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Cleaned up maven pom.xml files
Modified Paths:
--------------
trunk/pom.xml
trunk/treebase-core/pom.xml
trunk/treebase-web/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-11-04 16:54:08 UTC (rev 248)
+++ trunk/pom.xml 2009-11-04 17:04:34 UTC (rev 249)
@@ -7,81 +7,69 @@
<artifactId>treebase</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <url>http://www.phylo.org/treebase/index.php</url>
+ <url>https://sourceforge.net/projects/treebase/</url>
<issueManagement>
- <system>FogBugz</system>
- <url>https://www.ngbw.org/ngbugz</url>
+ <system>SourceForge</system>
+ <url>https://sourceforge.net/tracker/?group_id=248804</url>
</issueManagement>
<inceptionYear>2005</inceptionYear>
<scm>
- <connection>scm:svn:http://nladr-cvs.sdsc.edu/svn/CIPRES/treebase/trunk</connection>
- <developerConnection>scm:svn:http://nladr-cvs.sdsc.edu/svn/CIPRES/treebase/trunk</developerConnection>
- <url>http://nladr-cvs.sdsc.edu/svn/cipresdev/trunk</url>
+ <connection>scm:svn:https://treebase.svn.sourceforge.net/svnroot/treebase/trunk</connection>
+ <developerConnection>scm:svn:https://treebase.svn.sourceforge.net/svnroot/treebase/trunk</developerConnection>
+ <url>http://treebase.svn.sourceforge.net/viewvc/treebase/trunk</url>
</scm>
- <!-- mailingLists>
+ <mailingLists>
+
<mailingList>
- <name>cipres-dev</name>
- <subscribe>https://lists.sdsc.edu/mailman/listinfo.cgi/cipres</subscribe>
- <unsubscribe>https://lists.sdsc.edu/mailman/listinfo.cgi/cipres</unsubscribe>
- <archive>https://lists.sdsc.edu/mailman/listinfo.cgi/cipres</archive>
+ <name>treebase-devel</name>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/treebase-devel</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/treebase-devel</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=treebase-devel</archive>
</mailingList>
- </mailingLists -->
+
+ <mailingList>
+ <name>treebase-guts</name>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/treebase-guts</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/treebase-guts</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=treebase-guts</archive>
+ </mailingList>
+
+ <mailingList>
+ <name>treebase-users</name>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/treebase-users</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/treebase-users</unsubscribe>
+ <archive>https://sourceforge.net/mailarchive/forum.php?forum_name=treebase-users</archive>
+ </mailingList>
+
+ </mailingLists>
<developers>
- <developer>
- <id>lcchan</id>
- <name>Lucie Chan</name>
- <email>lc...@sd...</email>
- <organization>SDSC</organization>
- <organizationUrl>http://www.sdsc.edu</organizationUrl>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>-7</timezone>
- </developer>
- <developer>
- <id>jin</id>
- <name>Jin Ruan</name>
- <email>jr...@sd...</email>
- <organization>SDSC</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <id>madhu</id>
- <name>Madhusudan</name>
- <email>ma...@sd...</email>
- <organization>SDSC</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <id>mjd</id>
- <name>Mark Jason Dominus</name>
- <email>mj...@ge...</email>
- <organization>Penn Genome Frontiers Institute</organization>
- <organizationUrl>http://www.genomics.upenn.edu</organizationUrl>
- <roles>
- <role>developer</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
+
<developer>
- <id>rvosa</id>
- <name>Rutger Vos</name>
- <email>rut...@gm...</email>
- <organization>University of British Columbia</organization>
- <organizationUrl>http://www.ubc.ca</organizationUrl>
- <timezone>-7</timezone>
- <roles>
- <role>developer</role>
- </roles>
+
+ <id>rvosa</id>
+
+ <name>Rutger Vos</name>
+
+ <email>rut...@gm...</email>
+
+ <organization>University of Reading</organization>
+
+ <organizationUrl>http://www.reading.ac.uk</organizationUrl>
+
+ <timezone>0</timezone>
+
+ <roles>
+
+ <role>developer</role>
+
+ </roles>
+
</developer>
+
</developers>
<licenses>
<license>
- <name>UCSD</name>
+ <name>BSD</name>
<url>LICENSE.txt</url>
<distribution>manual</distribution>
<comments/>
@@ -123,51 +111,15 @@
<reporting>
<plugins>
+
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
+
<plugin>
<artifactId>maven-clover-plugin</artifactId>
</plugin>
- <!-- plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin -->
- <!-- plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
- <link>http://plexus.codehaus.org/ref/1.0-alpha-9/apidocs</link>
- </links>
- <aggregate>true</aggregate>
- </configuration>
- </plugin -->
- <!-- plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetjdk>1.5</targetjdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/imports.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- <ruleset>/rulesets/finalizers.xml</ruleset>
- </rulesets>
- <format>xml</format>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin -->
- <!-- plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
@@ -180,56 +132,63 @@
</tags>
</configuration>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
+
</plugins>
</reporting>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.cipres.treebase</groupId>
- <artifactId>treebase-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.cipres.treebase</groupId>
- <artifactId>treebase-web</artifactId>
- <version>${project.version}</version>
- </dependency>
+
+ <dependency>
+ <groupId>org.cipres.treebase</groupId>
+ <artifactId>treebase-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.cipres.treebase</groupId>
+ <artifactId>treebase-web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<organization>
- <name>SDSC</name>
- <url>http://biology.sdsc.edu</url>
+ <name>NESCent</name>
+ <url>http://www.nescent.org</url>
</organization>
+
<!-- order of repositories used to compile the project -->
<repositories>
+
<repository>
- <id>m2.remote.repos</id>
- <name>Maven 2 Remote Repository</name>
- <url>http://8ball.sdsc.edu:9999/maven2</url>
- </repository>
- <repository>
<id>maven2</id>
<name>Default Maven2 Repository</name>
<url>http://repo1.maven.org/maven2</url>
</repository>
+
<repository>
<id>repository.jboss.org</id>
<name>JBoss Maven Repository</name>
<url>http://repository.jboss.org/maven2</url>
<layout>default</layout>
</repository>
+
</repositories>
+
<!-- make sure java 1.5 is used for annotations support -->
<build>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -238,16 +197,16 @@
<target>1.5</target>
</configuration>
</plugin>
+
</plugins>
</build>
<distributionManagement>
<site>
<id>website</id>
- <!-- url>file:///var/www/html/sites/treebase</url -->
<url>file:///var/www/html/sites/treebase</url>
</site>
</distributionManagement>
-<profiles>
+ <profiles>
<profile>
<id>ciProfile</id>
<activation>
@@ -258,6 +217,7 @@
</activation>
<build>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
@@ -269,6 +229,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
@@ -279,20 +240,24 @@
</check>
</configuration>
<executions>
+
<execution>
<id>clean</id>
<goals>
<goal>clean</goal>
</goals>
</execution>
+
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
</execution>
+
</executions>
</plugin>
+
</plugins>
</build>
</profile>
Modified: trunk/treebase-core/pom.xml
===================================================================
--- trunk/treebase-core/pom.xml 2009-11-04 16:54:08 UTC (rev 248)
+++ trunk/treebase-core/pom.xml 2009-11-04 17:04:34 UTC (rev 249)
@@ -1,323 +1,222 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.cipres.treebase</groupId>
- <artifactId>treebase-core</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Cipres-treebase-core</name>
- <url>http://www.phylo.org</url>
- <parent>
- <groupId>org.cipres.treebase</groupId>
- <artifactId>treebase</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
+ <groupId>org.cipres.treebase</groupId>
+ <artifactId>treebase-core</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>treebase-core</name>
+ <url>https://sourceforge.net/projects/treebase/</url>
+ <parent>
+ <groupId>org.cipres.treebase</groupId>
+ <artifactId>treebase</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
- <build>
- <defaultGoal>install</defaultGoal>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
- <!-- the following doesn't work due to a bug in maven-install-plugin
- in the latest maven 2.0.4: Cannot override read-only parameter
- You'll need to install the following 2 cipres-dev jar files
- from the command line so treebase-core can compile.
- Refer to read.txt for more information. I leave the code
- here in case maven fixes its bug in a future realease -->
+ <repositories>
-<!--
- <plugins>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Maven Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <layout>default</layout>
+ </repository>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <executions>
+ <repository>
+ <id>maven2</id>
+ <name>Default Maven2 Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
- <execution>
- <id>copy-cipres-framework-jar</id>
- <phase>install</phase>
- <configuration>
- <file>${env.CIPRES_ROOT}/lib/cipres/cipres_framework.jar</file>
- <groupId>org.cipres</groupId>
- <artifactId>framework</artifactId>
- <version>1.0.1</version>
- <packaging>jar</packaging>
- </configuration>
- <goals><goal>install</goal></goals>
- </execution>
+ <repository>
+ <id>m2.remote.repos</id>
+ <name>Maven 2 Remote Repository</name>
+ <url>http://treebase.sourceforge.net/maven2/</url>
+ </repository>
- <execution>
- <id>copy-cipres-cipresapp-jar</id>
- <phase>compile</phase>
- <configuration>
- <file>${env.CIPRES_ROOT}/lib/cipres/cipres_cipresapp.jar</file>
- <groupId>org.cipres</groupId>
- <artifactId>cipresapp</artifactId>
- <version>1.0.1</version>
- <packaging>jar</packaging>
- </configuration>
- <goals><goal>install</goal></goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
--->
- </build>
+ <repository>
+ <id>m2.nexml.repos</id>
+ <name>NeXML Remote Repository</name>
+ <url>http://nexml-dev.nescent.org/.m2/repository/</url>
+ </repository>
-<!-- already defined in parent pom.xml -->
- <repositories>
- <repository>
- <id>m2.nexml.repos</id>
- <name>NeXML Remote Repository</name>
- <url>http://nexml-dev.nescent.org/.m2/repository/</url>
- </repository>
- <repository>
- <id>m2.remote.repos</id>
- <name>Maven 2 Remote Repository</name>
- <url>http://treebase.sourceforge.net/maven2/</url>
- </repository>
- <repository>
- <id>maven2</id>
- <name>Default Maven2 Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Maven Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <layout>default</layout>
- </repository>
-
- </repositories>
-
+ </repositories>
+ <dependencies>
- <dependencies>
- <dependency>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security</artifactId>
- <version>1.0.1</version>
- <exclusions>
- <!-- Maven thinks 2.0 is newer than 2.1-->
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <!-- exclude older versions of Spring -->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security</artifactId>
+ <version>1.0.1</version>
+ <exclusions>
+ <!-- Maven thinks 2.0 is newer than 2.1-->
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <!-- exclude older versions of Spring -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.nexml.model</groupId>
- <artifactId>nexml</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nexml.model</groupId>
+ <artifactId>nexml</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.3.1.GA</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.1.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!--dependency> // defined in hibernate
- <groupId>javax.security</groupId>
- <artifactId>jacc</artifactId>
- <version>1.0</version>
- </dependency-->
-
- <!-- dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>ejb</artifactId>
- <version>3.0-public-draft-20060327</version>
- </dependency-->
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
-<!--
-we no longer use db2
- <dependency>
- <groupId>ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>2.6.80</version>
- </dependency>
--->
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.3-603.jdbc3</version>
- </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.3-603.jdbc3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mesquite</groupId>
+ <artifactId>mesquite</artifactId>
+ <version>2.01.tb</version>
+ </dependency>
- <dependency>
- <groupId>mesquite</groupId>
- <artifactId>mesquite</artifactId>
- <version>2.01.tb</version>
- </dependency>
+ <dependency>
+ <groupId>org.cipres</groupId>
+ <artifactId>framework</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
- <dependency>
- <groupId>org.cipres</groupId>
- <artifactId>framework</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>2.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>2.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>2.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>javax.sql</groupId>
- <artifactId>jdbc-stdext</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>ibm</groupId>
- <artifactId>db2jcc_license_cu</artifactId>
- <version>2.6.80</version>
- </dependency>
- <dependency>
- <groupId>ibm</groupId>
- <artifactId>db2jcc</artifactId>
- <version>2.6.80</version>
- </dependency>
-
- <!--dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>2.2.3</version>
- </dependency-->
-
- <!--dependency>
- <groupId>org.codehaus.xfire</groupId>
- <artifactId>xfire-spring</artifactId>
- <version>1.2.6</version>
- </dependency-->
-
- <!--dependency>
- <groupId>org.codehaus.xfire</groupId>
- <artifactId>xfire-jaxws</artifactId>
- <version>1.2.6</version>
- <This exclusions was inserted on April 23, 2008 Madhu>
- <Just to make sure that there is no XML parsing problem when was war file is created with maven>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
-
- <!-- dependency>
- <stax should be refered by xfire-core, but it does not work for some reason >
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.2.0</version>
- </dependency-->
-
-
-
- </dependencies>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.sql</groupId>
+ <artifactId>jdbc-stdext</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>2.6.80</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>2.6.80</version>
+ </dependency>
+ </dependencies>
+
</project>
Modified: trunk/treebase-web/pom.xml
===================================================================
--- trunk/treebase-web/pom.xml 2009-11-04 16:54:08 UTC (rev 248)
+++ trunk/treebase-web/pom.xml 2009-11-04 17:04:34 UTC (rev 249)
@@ -1,396 +1,312 @@
-<?xml version="1.0"?><project>
- <parent>
- <artifactId>treebase</artifactId>
- <groupId>org.cipres.treebase</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.cipres.treebase</groupId>
- <artifactId>treebase-web</artifactId>
- <packaging>war</packaging>
- <name>Cipres-treebase-web</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <build>
- <defaultGoal>install</defaultGoal>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <finalName>treebase-web</finalName>
- <plugins>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>treebase</artifactId>
+ <groupId>org.cipres.treebase</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.cipres.treebase</groupId>
+ <artifactId>treebase-web</artifactId>
+ <packaging>war</packaging>
+ <name>treebase-web</name>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <finalName>treebase-web</finalName>
+ <plugins>
- <!-- Ant Task plugin-->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
+ <!-- Ant Task plugin-->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- make sure jdbc.properties is copied since it's not checked in -->
+ <execution>
+ <id>copy-jdbc-properties</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${basedir}/src/main/resources" failonerror="true"
+ verbose="true" overwrite="true">
+ <fileset dir="${env.JDBC_HOME}">
+ <include name="jdbc.properties" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+
+ </plugins>
+ </build>
+ <!-- already defined in parent pom.xml -->
+ <repositories>
+
+ <repository>
+ <id>maven2</id>
+ <name>Default Maven2 Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+
+ <repository>
+ <id>m2.remote.repos</id>
+ <name>Maven 2 Remote Repository</name>
+ <url>http://treebase.sourceforge.net/maven2/</url>
+ </repository>
+
+ <repository>
+ <id>m2.nexml.repos</id>
+ <name>NeXML Remote Repository</name>
+ <url>http://nexml-dev.nescent.org/.m2/repository/</url>
+ </repository>
+
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Maven Snapshots</id>
+ <url>http://snapshots.maven.codehaus.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
- <!-- make sure jdbc.properties is copied since it's not checked in -->
- <execution>
- <id>copy-jdbc-properties</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <copy todir="${basedir}/src/main/resources"
- failonerror="true" verbose="true" overwrite="true">
- <fileset dir="${env.JDBC_HOME}">
- <include name="jdbc.properties"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals><goal>run</goal></goals>
- </execution>
+ <dependency>
+ <groupId>org.nexml.model</groupId>
+ <artifactId>nexml</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.cipres.treebase</groupId>
+ <artifactId>treebase-core</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
- <!--
- <execution>
- <id>copy-cipres-dev-resources</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <copy todir="${basedir}/src/main/resources"
- failonerror="true" verbose="true" overwrite="true">
- <fileset dir="${env.CIPRES_ROOT}/resources">
- <include name="cipres_registry.xml"/>
- <include name="cipres_config.properties"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals><goal>run</goal></goals>
- </execution>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
- <execution>
- <id>copy-cipres-jar</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <copy todir="${project.build.directory}/treebase-web/WEB-INF/lib">
- <copy todir="${basedir}/src/main/webapp/WEB-INF/lib">
- failonerror="true" verbose="true" overwrite="true">
- <fileset dir="${env.CIPRES_ROOT}/lib/cipres">
- <include name="cipres_cipresapp.jar"/>
- <include name="cipres_framework.jar"/>
- <include name="classpath.jar"/>
- </fileset>
- <fileset dir="${env.CIPRES_ROOT}/lib/activation/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/axis/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/castor/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/commons-discovery/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/commons-logging/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/forester/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/jacorb/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/javahelp/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/jbcl/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/jcommon/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/jep/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/jfreechart/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/junit/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/log4j/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/pal/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/uddi4j/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/wsdl4j/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/xerces/jars" includes="*.jar"/>
- <fileset dir="${env.CIPRES_ROOT}/lib/xml-apis/jars" includes="*.jar"/>
- </copy>
- </tasks>
- </configuration>
- <goals><goal>run</goal></goals>
- </execution>
- -->
-
- </executions>
- </plugin>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </plugin>
-
- </plugins>
- </build>
- <!-- already defined in parent pom.xml -->
- <repositories>
- <repository>
- <id>m2.nexml.repos</id>
- <name>NeXML Remote Repository</name>
- <url>http://nexml-dev.nescent.org/.m2/repository/</url>
- </repository>
- <repository>
- <id>m2.remote.repos</id>
- <name>Maven 2 Remote Repository</name>
- <url>http://treebase.sourceforge.net/maven2/</url>
- </repository>
- <repository>
- <id>maven2</id>
- <name>Default Maven2 Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- </repositories>
+ <!-- used by Spring framework -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
- <pluginRepositories>
- <pluginRepository>
- <id>Maven Snapshots</id>
- <url>http://snapshots.maven.codehaus.org/maven2</url>
- <snapshots><enabled>true</enabled></snapshots>
- <releases><enabled>false</enabled></releases>
- </pluginRepository>
- </pluginRepositories>
+ <!-- Jin 05/12/08: do we need xalan? dependency-->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
- <dependencies>
-
- <dependency>
- <groupId>org.nexml.model</groupId>
- <artifactId>nexml</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.cipres.treebase</groupId>
- <artifactId>treebase-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.1.4</version>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
- <!-- used by Spring framework -->
- <!--Older ersion not needed-->
- <!-- Commented on April 23, 2008 Madhu-->
- <!--dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency-->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
- <!-- used by Spring framework -->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
-
- <!-- Jin 05/12/08: do we need xalan? dependency-->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
-
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.1.4</version>
- </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>string</artifactId>
+ <version>1.1.0</version>
+ </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ <version>1.2.9</version>
+ </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>sitemesh</artifactId>
+ <version>2.3</version>
+ </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
+ <dependency>
+ <groupId>displaytag</groupId>
+ <artifactId>displaytag</artifactId>
+ <version>1.1.1</version>
+ </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>string</artifactId>
- <version>1.1.0</version>
- </dependency>
+ <dependency>
+ <groupId>struts-menu</groupId>
+ <artifactId>struts-menu</artifactId>
+ <version>2.3</version>
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.9</version>
- </dependency>
+ <exclusions>
+ <!-- Older versions are not needed -->
+ <exclusion>
+ <groupId>taglibs</groupId>
+ <artifactId>string</artifactId>
+ </exclusion>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>sitemesh</artifactId>
- <version>2.3</version>
- </dependency>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
- <dependency>
- <groupId>displaytag</groupId>
- <artifactId>displaytag</artifactId>
- <version>1.1.1</version>
- </dependency>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
- <dependency>
- <groupId>struts-menu</groupId>
- <artifactId>struts-menu</artifactId>
- <version>2.3</version>
-
- <exclusions>
- <!-- Older versions are not needed -->
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>string</artifactId>
- </exclusion>
-
-
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
-
- </exclusions>
-
-
- </dependency>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
- <dependency>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security</artifactId>
- <version>1.0.1</version>
- <exclusions>
- <!-- exclude older versions of Spring -->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-mock</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </exclusion>
- <dependency>
- <groupId>springmodules</groupId>
- <artifactId>springmodules-validator</artifactId>
- <version>0.1</version>
- </dependency>
-
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
-
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- <version>2.0.rc2</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <!-- remove 05/13/08 to avoid xml parser conflicts>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- <version>1.0.2</version>
- </dependency>
- -->
-
- <!-- remove 05/13/08 to avoid xml parser conflicts.>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>1.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>zing.z3950.org</groupId>
- <artifactId>cql-java</artifactId>
- <version>1.0</version>
- </dependency>
+ </exclusions>
- <!--commented on April 23, 2008 Madhu-->
- <!--dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3</version>
- <scope>runtime</scope>
- </dependency-->
-
+ </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security</artifactId>
+ <version>1.0.1</version>
+ <exclusions>
+ <!-- exclude older versions of Spring -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-support</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>springmodules</groupId>
+ <artifactId>springmodules-validator</artifactId>
+ <version>0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ <version>2.0.rc2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>zing.z3950.org</groupId>
+ <artifactId>cql-java</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ </dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-04 16:54:16
|
Revision: 248
http://treebase.svn.sourceforge.net/treebase/?rev=248&view=rev
Author: rvos
Date: 2009-11-04 16:54:08 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Removed outdated CIPRES/SDSC disclaimers
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteATreeBlockController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteATreeController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteStudyController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectMapToPhyloWidgetController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DirectToPhyloWidgetController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DisplayAnalysisController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DisplaySubmissionController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DisplaySubmissionMenuController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAMatrixController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadANexusFileController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadANexusRCTFileController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAStudyController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeBlockController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadATreeController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DownloadAnAnalysisStepController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/EditSetTaxonLabelController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/EditTaxonLabelController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/EditorFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ExportRowSegmentDataController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ExportRowSegmentTemplateController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/HelpController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListAnalysisController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListAnalysisStepController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListAnalyzedDataController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListMatrixController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListMatrixRowController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListMatrixRowSegmentController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListSearchStudyController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListSubmissionController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTaxaController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTaxaSearchController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeBlockController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ListTreeController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixRowSegmentFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/NexusFilesController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PasswordFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PeopleFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PeopleFormSearchController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ProcessUserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadOnlyListTreeController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateStudiesController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/RegisterUserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/RowSegmentDataTableController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchBySubmissionIDController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchResultsAsRDFController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchStudyController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchSummaryController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SelectStudiesController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ShortPathUrlFilenameViewController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SingleRowSegmentController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudyFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SubmissionToJsonController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TestParserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeParserController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeParserResultController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeTopSearchController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UpdateAnalyzedDataListController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UpdateStudyQueryController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UploadFileController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UploadFileSummaryController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UploadRowSegmentDataController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UserFormController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/UserManagementController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ViewAllRowSegmentDataController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/exceptions/DeprecatedFeatureError.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/exceptions/EmptyStudyException.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/exceptions/EmptySubmissionException.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/listeners/EventListener.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/listeners/StartupListener.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AGenericList.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AnalysisCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AnalysisStepCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/AnalyzedDataCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/CitationCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/EditFieldCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/FileBean.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/HelpControllerAction.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/LabelValue.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MatrixRowCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MatrixTreeData.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MultiFileBean.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/MyProgressionListener.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/RowSegmentCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/SearchCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/SearchCriteriaCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/StudyCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/TaxonSearchCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/User.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/ControllerUtil.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/SearchMessageSetter.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/StringUtil.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/WebUtil.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/validators/UserFormValidator.java
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AbstractUserController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddAuthorController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import java.util.List;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AddPersonController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import java.util.Collection;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminAndUserGenericController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import javax.servlet.ServletException;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepOneController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminDeletingUserStepTwoController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingPersonsController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import java.util.ArrayList;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminMergingUsersController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2008, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import java.util.ArrayList;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminOverridingUserFormController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectPersonsController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 20078, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import java.util.ArrayList;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminSelectUsersController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 20078, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import java.util.ArrayList;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AdminUpdatingUserInfoController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxMultipartResolver.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AjaxProgressListener.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisFormController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalysisStepFormController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnalyzedDataFormController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AnyObjectAsRDFController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.cipres.treebase.web.controllers;
import javax.servlet.http.HttpServletRequest;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AppletInteractionController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/AuthorFormController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ChangeStudyStatusController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2007, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.web.controllers;
import java.util.ArrayList;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/CitationFormController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.web.controllers;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteAMatrixController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java 2009-11-04 16:51:46 UTC (rev 247)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/DeleteARowSegmentController.java 2009-11-04 16:54:08 UTC (rev 248)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
...
[truncated message content] |
|
From: <rv...@us...> - 2009-11-04 16:51:54
|
Revision: 247
http://treebase.svn.sourceforge.net/treebase/?rev=247&view=rev
Author: rvos
Date: 2009-11-04 16:51:46 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Removed outdated CIPRES/SDSC disclaimers
Modified Paths:
--------------
trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java
trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java
trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java
trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/taxon/TaxonLabelServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/MockPhyloTreeService.java
trunk/treebase-core/src/test/java/org/cipres/treebase/service/tree/PhyloTreeServiceImplTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/HashFieldReaderTest.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/MockDeleter.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/MockDeleterFactory.java
trunk/treebase-core/src/test/java/org/cipres/treebase/util/ObjectGroupMergerTest.java
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/MockDatabase.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
import java.util.HashSet;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/RangeExpressionTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TBMockObject.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
import org.cipres.treebase.domain.TBPersistable;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TestUtil.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseIDStringTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/TreebaseUtilTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/XMLTestCase.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for educational, research and non-profit purposes, without
- * fee, and without a written agreement is hereby granted, provided that the
- * above copyright notice, this paragraph and the following two paragraphs
- * appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be
- * obtained by contacting us:
- * http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event
- * shall the CIPRES project be liable to any party for direct, indirect,
- * special, incidental, or consequential damages, including lost profits,
- * arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage.
- * The CIPRES project specifically disclaims any warranties, including, but
- * not limited to, the implied warranties of merchantability and fitness for
- * a particular purpose. The CIPRES project has no obligations to provide
- * maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.auxdata;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/AbstractDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.dao;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/EnvironmentTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.dao;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/matrix/RowSegmentDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for educational, research and non-profit purposes, without
- * fee, and without a written agreement is hereby granted, provided that the
- * above copyright notice, this paragraph and the following two paragraphs
- * appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be
- * obtained by contacting us:
- * http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event
- * shall the CIPRES project be liable to any party for direct, indirect,
- * special, incidental, or consequential damages, including lost profits,
- * arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage.
- * The CIPRES project specifically disclaims any warranties, including, but
- * not limited to, the implied warranties of merchantability and fitness for
- * a particular purpose. The CIPRES project has no obligations to provide
- * maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.dao.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/study/AlgorithmDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2007, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.dao.study;
import org.apache.log4j.Logger;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/taxon/TaxonLabelDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.dao.taxon;
import java.util.Set;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/dao/tree/PhyloTreeDAOTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.dao.tree;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/matrix/MatrixTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for educational, research and non-profit purposes, without
- * fee, and without a written agreement is hereby granted, provided that the
- * above copyright notice, this paragraph and the following two paragraphs
- * appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be
- * obtained by contacting us:
- * http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event
- * shall the CIPRES project be liable to any party for direct, indirect,
- * special, incidental, or consequential damages, including lost profits,
- * arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage.
- * The CIPRES project specifically disclaims any warranties, including, but
- * not limited to, the implied warranties of merchantability and fitness for
- * a particular purpose. The CIPRES project has no obligations to provide
- * maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/AbstractPhyloDataSet.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/MesquiteConverterTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/NexusMesquiteDataSetTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM12c11.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetM1389.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/nexus/PhyloDataSetProvider.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.nexus;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/domain/tree/PhyloTreeTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +1,3 @@
-/*
- * Copyright 2007 CIPRES project. http://www.phylo.org/
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for educational, research and non-profit purposes, without
- * fee, and without a written agreement is hereby granted, provided that the
- * above copyright notice, this paragraph and the following two paragraphs
- * appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be
- * obtained by contacting us:
- * http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event
- * shall the CIPRES project be liable to any party for direct, indirect,
- * special, incidental, or consequential damages, including lost profits,
- * arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage.
- * The CIPRES project specifically disclaims any warranties, including, but
- * not limited to, the implied warranties of merchantability and fitness for
- * a particular purpose. The CIPRES project has no obligations to provide
- * maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.domain.tree;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/framework/TSVFileParserTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,27 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for educational, research and non-profit purposes, without
- * fee, and without a written agreement is hereby granted, provided that the
- * above copyright notice, this paragraph and the following two paragraphs
- * appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be
- * obtained by contacting us:
- * http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event
- * shall the CIPRES project be liable to any party for direct, indirect,
- * special, incidental, or consequential damages, including lost profits,
- * arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage.
- * The CIPRES project specifically disclaims any warranties, including, but
- * not limited to, the implied warranties of merchantability and fitness for
- * a particular purpose. The CIPRES project has no obligations to provide
- * maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.framework;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/migration/TBDataMigrationController.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.migration;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/AbstractServiceTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.service;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/admin/DummyUserDAO.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.service.admin;
@@ -63,7 +44,7 @@
mNewUser.setFirstName("New");
mNewUser.setLastName("User");
mNewUser.setPassword("dummyPasswd");
- mNewUser.setEmailAddressString("du...@sd...");
+ mNewUser.setEmailAddressString("du...@tr...");
}
return mNewUser;
}
@@ -81,7 +62,7 @@
mStoredUser.setFirstName("Dummy");
mStoredUser.setLastName("User");
mStoredUser.setPassword("dummyPasswd");
- mStoredUser.setEmailAddressString("du...@sd...");
+ mStoredUser.setEmailAddressString("du...@tr...");
}
return mStoredUser;
}
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/MockMatrixService.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.service.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/matrix/RowSegmentServiceImplTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.service.matrix;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/nexus/NexusParserTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2005- 2006, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase.service.nexus;
import java.io.File;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/AnalysisServiceImplTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2007 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.service.study;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/MockStudyService.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.service.study;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/StudyServiceImplTest.java 2009-11-04 16:51:46 UTC (rev 247)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2006 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.service.study;
Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java
===================================================================
--- trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java 2009-11-04 16:50:37 UTC (rev 246)
+++ trunk/treebase-core/src/test/java/org/cipres/treebase/service/study/SubmissionServiceImplTest.java 2...
[truncated message content] |
|
From: <rv...@us...> - 2009-11-04 16:51:01
|
Revision: 246
http://treebase.svn.sourceforge.net/treebase/?rev=246&view=rev
Author: rvos
Date: 2009-11-04 16:50:37 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Removed outdated CIPRES/SDSC disclaimers
Modified Paths:
--------------
trunk/treebase-core/src/main/java/org/cipres/treebase/Constants.java
trunk/treebase-core/src/main/java/org/cipres/treebase/ContextManager.java
trunk/treebase-core/src/main/java/org/cipres/treebase/RangeExpression.java
trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
trunk/treebase-core/src/main/java/org/cipres/treebase/Version.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Action.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ActionParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AddMetaDataAction.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AlternationParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AnalysisSectionParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentSequenceParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuthorParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxData.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxiliaryDataParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CheckMatrixNChars.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CommitStudy.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ConcatenationParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Filter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/FilterParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/FilterTrivial.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Generator.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/GenericAction.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/GenericAuxDataAction.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/HeadlineParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/HistoryParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/IOParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/InputMatrixParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/LazyList.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/MatrixParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/MultipleMatchError.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/OptionalParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/OutputTreeParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/RDParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/RDParserArgumentFailureException.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/RDParserFailure.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/RDParserResult.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/RepeatedParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/SideCondition.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/SimpleSectionParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/SingleTokenParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/SpecificHeadlineParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/StudyItemParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/StudyParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Token.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/TokenReader.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/TokenSequenceParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/TreeStudyMapping.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/TreebaseStreamTokenizer.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Value.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueAnalysisSection.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueAssignment.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueAssignmentMap.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueHeadline.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueNone.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueSection.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueSequence.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueStudy.java
trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ValueToken.java
trunk/treebase-core/src/main/java/org/cipres/treebase/core/CoreServiceLauncher.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/AbstractDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/admin/HelpDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/admin/PersonDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/admin/UserDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/CompoundElementJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/ContinuousMatrixElementJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/ContinuousMatrixJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/DiscreteMatrixElementJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/DiscreteMatrixJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/ItemDefinitionJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/MatrixColumnJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/MatrixJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/MatrixRowJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/NexusDataSetJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/jdbc/PhyloTreeJDBC.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/CharacterDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/ItemDefinitionDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/MatrixColumnDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/MatrixDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/MatrixDataTypeDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/MatrixElementDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/MatrixRowDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/matrix/RowSegmentDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/AlgorithmDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/AnalysisDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/AnalysisStepDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/AnalyzedDataDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/CitationDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/CitationStatusDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/StudyDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/StudyStatusDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/study/SubmissionDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/taxon/TaxonDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/taxon/TaxonLabelDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/dao/tree/PhyloTreeDAO.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/AbstractPersistedObject.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/AbstractQueryCriteria.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/DomainHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/TBPersistable.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/EmailAddress.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/EmailAddressPropertyEditor.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/Help.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/HelpHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/HelpService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/Person.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/PersonHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/PersonService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/RemotePersonServiceImp.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/User.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/UserHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/UserRole.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/admin/UserService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/AncStateSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/AncestralState.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CSTree.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CSTreeNode.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharGroup.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharPartition.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharWeight.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharWeightSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharacterHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharacterMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CharacterService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CodonPositionSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ColumnRange.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/CompoundMatrixElement.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ContinuousAncState.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ContinuousChar.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ContinuousMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ContinuousMatrixElement.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DiscreteAncState.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DiscreteChar.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DiscreteCharState.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DiscreteMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DiscreteMatrixElement.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DistanceMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/DistanceMatrixElement.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ExcludedCharSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/GapMode.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/GeneticCode.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/GeneticCodeRecord.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/GeneticCodeSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/IntegerCharWeight.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ItemDefinition.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ItemDefinitionHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/ItemValue.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/Matrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixColumn.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixColumnHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixColumnService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixDataType.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixDataTypeHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixElement.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixElementHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixElementService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixKind.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixRow.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixRowHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixRowService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/MatrixService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/PhyloChar.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/PolyTCount.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/PredefinedCharSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/PredefinedCharType.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/RealCharWeight.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/RowSegment.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/RowSegmentHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/RowSegmentService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/SequenceMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/StandardMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/StateChangeSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/StateFormat.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/StateModifier.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/StateSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/StepMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/StepMatrixElement.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/TypeSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/UserDefinedCharSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/UserType.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/UserTypeRecord.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/AbstractNexusConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/NexusDataSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/NexusParserConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/NexusParserFinder.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/NexusService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/ColumnRangeConvertHelper.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteContinuousMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteDistanceMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/mesquite/MesquiteStandardMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/ncl/NCLContinuousMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/ncl/NCLDistanceMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/ncl/NCLMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/ncl/NCLNexusConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/ncl/NCLStandardMatrixConverter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/MatrixSearchResults.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsFrozen.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/StudySearchResults.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/TaxonSearchResults.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/TreeSearchResults.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/UnknownSearchResultsTypeError.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/Algorithm.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AlgorithmHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/Analysis.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalysisHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalysisService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalysisStep.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalysisStepHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalysisStepService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalyzedData.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalyzedDataHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalyzedDataService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalyzedMatrix.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalyzedMatrixHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalyzedTree.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/AnalyzedTreeHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/ArticleCitation.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/BookCitation.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/Citation.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/CitationHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/CitationService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/CitationStatus.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/CitationStatusHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/DistanceAlgorithm.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/InBookCitation.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/LikelihoodAlgorithm.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/OtherAlgorithm.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/ParsimonyAlgorithm.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/Software.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/Study.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/StudyCriteria.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/StudyHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/StudyService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/StudyStatus.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/StudyStatusHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/Submission.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/SubmissionService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/study/UploadFileResult.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/LSIDTaxonLink.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/SpecimenLabel.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/Taxon.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonAuthority.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabel.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabelGroup.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabelHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabelPartition.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabelService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLabelSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonLink.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TaxonVariant.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/taxon/TextTaxonLink.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/NodeAttribute.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTree.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTreeHome.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTreeNode.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/PhyloTreeService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeAttribute.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeBlock.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeGroup.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeKind.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeNode.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeNodeEdge.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreePartition.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeQuality.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeSet.java
trunk/treebase-core/src/main/java/org/cipres/treebase/domain/tree/TreeType.java
trunk/treebase-core/src/main/java/org/cipres/treebase/event/ProgressionListener.java
trunk/treebase-core/src/main/java/org/cipres/treebase/exception/UnimplementedMethodError.java
trunk/treebase-core/src/main/java/org/cipres/treebase/framework/ExecutionResult.java
trunk/treebase-core/src/main/java/org/cipres/treebase/framework/TSVFileParser.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractService.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/admin/HelpServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/admin/PersonServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/admin/UserServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/matrix/CharacterServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/matrix/MatrixColumnServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/matrix/MatrixElementServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/matrix/MatrixRowServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/matrix/MatrixServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/matrix/RowSegmentServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceMesquite.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceNCL.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceRDFa.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/search/SearchServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/AnalysisServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/AnalysisStepServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/AnalyzedDataServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/CitationServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/StudyServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/study/SubmissionServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/taxon/TaxonLabelServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/service/tree/PhyloTreeServiceImpl.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/AbstractStandalone.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/AnnotateTree.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/AuxiliaryDataImporter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/AuxiliaryDataImporterInterface.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/BulkUpload.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/CitationDataImporter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/CitationDataImporterInterface.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/CreateTaxon.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/CreateTaxonVariant.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/DeleteObject.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/DeleteObjectInterface.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/DeleteStudy.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/DestroySubmission.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/DidNexusFile.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/GetOpts.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/LoadTaxonData.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/MergeDuplicateTaxonLabels.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/MergeDuplicateTaxonLabelsInterface.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/ObjectDeleter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/ObjectDeleterFactory.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/ObjectGroupMerger.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/OptionSettings.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/PseudoSubmission.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/PutbackReader.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/RawNexusImporter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/RawNexusImporterInterface.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/RegenerateTaxonLabelSetsInterface.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/RepatriateAuthors.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/RepatriateData.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/Standalone.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/TaxonDeleter.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/UnixOptions.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/WhatsMissing.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/WhatsMissingInterface.java
trunk/treebase-core/src/main/java/org/cipres/treebase/util/package.html
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/Constants.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/Constants.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/Constants.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,24 +1,3 @@
-/*
- * CIPRES Copyright (c) 2009, The Regents of the University of California All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: * Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following disclaimer. * Redistributions
- * in binary form must reproduce the above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other materials provided with the distribution. *
- * Neither the name of the University of California or the San Diego Supercomputer Center nor the
- * names of its contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
- * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/ContextManager.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/ContextManager.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/ContextManager.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/RangeExpression.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/RangeExpression.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/RangeExpression.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/TreebaseUtil.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2005 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/Version.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/Version.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/Version.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -39,6 +39,6 @@
*
*/
public class Version {
- public static final String VCSID = "##VCSID##";
- public static final String VCSDateString = "##VCSDATESTRING##";
+ public static final String VCSID = "245";
+ public static final String VCSDateString = "2009-11-04 15:03:06 +0000 (Wed, 04 Nov 2009)";
}
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Action.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Action.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Action.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.auxdata;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ActionParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ActionParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ActionParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AddMetaDataAction.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AddMetaDataAction.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AddMetaDataAction.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.auxdata;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AlternationParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AlternationParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AlternationParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AnalysisSectionParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AnalysisSectionParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AnalysisSectionParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentSequenceParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentSequenceParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AssignmentSequenceParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuthorParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuthorParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuthorParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxData.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxData.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxData.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxiliaryDataParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxiliaryDataParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/AuxiliaryDataParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.auxdata;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CheckMatrixNChars.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CheckMatrixNChars.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CheckMatrixNChars.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.auxdata;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CommitStudy.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CommitStudy.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/CommitStudy.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008, 2009 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
package org.cipres.treebase.auxdata;
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ConcatenationParser.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ConcatenationParser.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/ConcatenationParser.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that the above copyright notice, this paragraph and the following two
- * paragraphs appear in all copies.
- *
- * Permission to incorporate this software into commercial products may be obtained by contacting
- * us: http://www.phylo.org/contactUs.html
- *
- * The software program and documentation are supplied "as is". In no event shall the CIPRES project
- * be liable to any party for direct, indirect, special, incidental, or consequential damages,
- * including lost profits, arising out of the use of this software and its documentation, even if
- * the CIPRES project has been advised of the possibility of such damage. The CIPRES project
- * specifically disclaims any warranties, including, but not limited to, the implied warranties of
- * merchantability and fitness for a particular purpose. The CIPRES project has no obligations to
- * provide maintenance, support, updates, enhancements, or modifications.
- */
Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Filter.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Filter.java 2009-11-04 15:03:06 UTC (rev 245)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/auxdata/Filter.java 2009-11-04 16:50:37 UTC (rev 246)
@@ -1,22 +1,3 @@
-/*
- * Copyright 2008 CIPRES project. http://www.phylo.org/ All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its documentation for
- * educational, research and non-profit purposes, without fee, and without a written agreement is
- * hereby granted, provided that ...
[truncated message content] |
|
From: <yo...@us...> - 2009-11-04 15:03:12
|
Revision: 245
http://treebase.svn.sourceforge.net/treebase/?rev=245&view=rev
Author: youjun
Date: 2009-11-04 15:03:06 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
delete data_provider_core, use treebase_core instead
Removed Paths:
-------------
trunk/oai-pmh_data_provider/data_provider_core/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-04 15:01:44
|
Revision: 244
http://treebase.svn.sourceforge.net/treebase/?rev=244&view=rev
Author: rvos
Date: 2009-11-04 15:01:38 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Adding NESCent logo
Added Paths:
-----------
trunk/treebase-web/src/main/webapp/images/nescent_logo.gif
Added: trunk/treebase-web/src/main/webapp/images/nescent_logo.gif
===================================================================
(Binary files differ)
Property changes on: trunk/treebase-web/src/main/webapp/images/nescent_logo.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-04 15:00:24
|
Revision: 243
http://treebase.svn.sourceforge.net/treebase/?rev=243&view=rev
Author: rvos
Date: 2009-11-04 15:00:16 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Changed footer links from sdsc.edu to nescent.org
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/common/footer.jsp
Modified: trunk/treebase-web/src/main/webapp/common/footer.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/common/footer.jsp 2009-11-04 14:55:23 UTC (rev 242)
+++ trunk/treebase-web/src/main/webapp/common/footer.jsp 2009-11-04 15:00:16 UTC (rev 243)
@@ -1,8 +1,8 @@
<%@ include file="/common/taglibs.jsp" %>
-<p style="text-align:center"><a href="http://www.sdsc.edu/"></a>Copyright © 2009 <strong>TreeBASE</strong>. All rights reserved. (Revision <%= org.cipres.treebase.Version.VCSID %>)
+<p style="text-align:center"><a href="http://www.nescent.org/"></a>Copyright © 2009 <strong>TreeBASE</strong>. All rights reserved. (Revision <%= org.cipres.treebase.Version.VCSID %>)
<br />
<a href="http://validator.w3.org/check?uri=referer"><img src="<fmt:message key="icons.xhtml" />" alt="XHTML" title="Validate page markup" class="iconButton" style="vertical-align:middle"/></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="<fmt:message key="icons.css"/>" alt="CSS" title="Validate page styles" class="iconButton" style="vertical-align:middle"/></a><br />
- <a href="http://www.sdsc.edu/"><img src="<c:url value="/images/sdsc.gif"/>" alt="SDSC" width="90" height="37" border="0" /></a>
+ <a href="http://www.nescent.org/"><img src="<c:url value="/images/nescent_logo.gif"/>" alt="NESCent" width="101" height="83" border="0" /></a>
</p>
\ 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: <rv...@us...> - 2009-11-04 14:55:34
|
Revision: 242
http://treebase.svn.sourceforge.net/treebase/?rev=242&view=rev
Author: rvos
Date: 2009-11-04 14:55:23 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Removed stale info from readme
Modified Paths:
--------------
trunk/treebase-web/read.txt
Modified: trunk/treebase-web/read.txt
===================================================================
--- trunk/treebase-web/read.txt 2009-11-04 14:54:19 UTC (rev 241)
+++ trunk/treebase-web/read.txt 2009-11-04 14:55:23 UTC (rev 242)
@@ -1,180 +1,5 @@
-Running Treebase-Web in Eclipse (3.2) WTP (1.5):
--------------------------------------------------------------------------------
-I. Eclise Environment Setup:
+The information contained in this file was no longer up-to-date
+and no longer being maintained. For information on configuring,
+building and deploying TreeBASE, consult the wiki:
-+ start eclipse; make sure the following are configured (Windows->Preferences):
- + Java->Installed JRES (jdk1.5+)
- + Java->Build Path->Classpath Variable->M2_REPO (.m2/repository)
- + Java->Compiler->Compiler compliance level: 5.0
- + Server->Installed Runtimes->Add ->Apache Tomcat 5.5
-+ Add a Server:
- + Windows->Show View->Server; New->Server
-
-II. Prepare Treebase-Web for Eclipse Development:
-
-+ Generate .classpath, .project, .settings for Eclipse:
- Start from the parent top-level directory:
- + mvn eclipse:clean; mvn clean:clean
- this cleans the .classpath, .project, .settings files
- + mvn compile
- this downloads the required dependencies to your local maven repository
- from the the remote repoistories, and it also copies cipres-dev resources;
- it also copies some of the resources files from cipres into src/main/resources
- + mvn -Dwtpversion=1.0 -DdownloadSources=true eclipse:eclipse
- this generates .classpath, .project, .settings/ for both
- treebase-core and treebase-web
- * if we check in .classpath and .project, no need to do the above
-
-+ Import treebase-core and treebase-web source into Eclipse:
- + File->Import->General->Existing Projects into Workspace
-
-+ manually copy the following files to treebase's WTP directory, typically in:
- + $HOME/workspace/.metadata/.plugins/org.eclipse.wst.server.core/tmp0/webapps/treebase-web/WEB-INF/lib
- + cp $CIPRES_ROOT/lib/*/jars/*.jar to treebase-web/webapps/WEB-INF/lib/*.jar
- + cp $CIPRES_ROOT/lib/cipres/*.jar to treebase-web/webapps/WEB-INF/lib/*.jar
- + cp $CIPRES_ROOT/resources/cipres_registry.xml & cipres_config.properties
- to treebase-web/src/main/resources
- * it's probably better to copy $CIPRES_ROOT files to the WTP's directory
- workspace/.metadata/.plugins/org.eclipse.wst.server.core/tmp0/webapps/treebase-web)
- so we don't pollute our development environment. But if you delete the
- server in Eclipse, you'll need to copy the files again because the
- directory will be deleted when the server is gone;
-
-Building Treebase-Web using Maven on Linux:
-(This involves integrating treebase-core and cipres-binary)
--------------------------------------------------------------------------------
-I. Prepare cipres-binary for Treebase-Web:
- + download BigCIPRES_dev.tar from www.phylo.org
- + untar file
- + run "sh makeCIPRES.sh 1.0.1 -b"
-+ configure cipres-binary:
- + set preferences for paup, raxml, python: (only need once after untar a new package)
- + from $CIPRES_ROOT: java -jar lib/cipres/cipres.jar
- + generate cipres_dist/resources/cipres_registry.xml + cipres_config.properties:
- + from $CIPRES_ROOT: cd ../; "ant configure"
-+ make sure the following environment variables are set:
- + $CIPRES_ROOT: ${HOME}/../BigCIPRES_dev/CIPRES-1.0.1/cipres/cipres_dist/
- + $M2_REPO: ${HOME}/.m2/repository
- + $JDBC_HOME: (where you have a copy of jdbc.properties since it's not checked in)
-
-II. Build and Deploy Treebase-Web
-+ some files in cipres-binary (resources & jars files) need to be copied into
- treebase-web's WAR for packaging, and I've already taken all of them in pom.xml
- (see pomx.xml for files needed)
-
-+ add to Tomcat the following entry in tomcat-users.xml
- <user username="admin" password="" roles="manager"/>
-
-+ build all the dependencies (including treebase-core), from top-level:
- mvn clean; mvn -Dmaven.test.skip=true install
-
-+ make sure Tomcat has already started, if not:
- tomcat_start
-+ from /treebase-web directory, deply to localhost:8080 (default)
- mvn tomcat:deploy (or mvn tomcat:undeploy)
-
-Maven Remote Repository Server:
--------------------------------------------------------------------------------
-servername: 8ball.sdsc.edu
-port: 9999
-file dir: /var/www/html/maven2
-url: http://8ball.sdsc.edu:9999/maven2/
-start/stop: service httpd reload, servive httpd stop, service httpd start (must be root)
-
-Treebase Web Server:
--------------------------------------------------------------------------------
-servername: marathon.sdsc.edu
-port: 8080
-file dir: ${HOME}/projects/trunk/treebase-web
-url: http://marathon.sdsc.edu/treebase-web
-start/stop: tomcat_start, tomcat_stop
-
-Integration of treebase-web with treebase-core in Eclipse with Tomcat Plugin:
-(This is no longer needed by it's replaced by WTP, but I keep the notes for
-references only)
--------------------------------------------------------------------------------
-1. Download and install the following:
-
- + Eclipse 3.1
- + Tomcat 5.0.28 (5.5 doesn't work on Windows, but OK on *nix)
- + Sysdeo 3.1beta plugin
-
-2. In Eclipse, configure the following:
-
- +. Windows->Preferences->Tomcat:
- specific Tomcat home directory;
-
- +. Windows->Preferences->Java->Compiler
- specify Java compiler version: 5.0
-
- +. Java Build Path -> Libraries -> Add Variable...
- Add "M2_REPO" to your Maven library repository directory
-
-3. Configure DevLoader to allow dynamic reference to dependent Java projects:
-
- After installing Sysdeo's plugin to Eclipse's plugins directory, copy
- "DevLoader.zip" in Eclipse's plugins/com.sysdeo.eclipse.tomcat_xxx/DevLoader.zip
- and unzip this file into Tomcat's server/classes/directory;
-
-4. check out treebase-core from subversion and build it. Make sure the
- following is correct (you shouldn't have to do anything since this
- is already done in .classpath and .project file):
-
- +. Java Build Path -> Source:
- treebase-core/src/main/java
- treebase-core/src/main/resources
- treebase-core/src/test/java
- Default output folder: treebase-core/target/classes
-
-5. check out treebase-web from subversion and build it. Make sure the
- following is correct (you shouldn't have to do anything since this
- is already done in .classpath and .project file for you):
-
- +. Java Build Path -> Source:
- treebase-web/src/main/java
- treebase-web/src/main/resources
- treebase-web/src/test/java
- Default output folder: treebase-web/src/main/webapp/WEB-INF/classes
-
- +. Java Build Path -> Source:
- treebase-core
-
- +. Java Build Path -> Order and Export:
- The following directories are checked:
- treebase-web/src/main/java
- treebase-web/src/main/resources
- treebase-web/src/test/java
- treebase-core
-
- +. To configure treebase-web as a Tomcat application and specify its
- dependency on treebase-core:
-
- Properties -> Tomcat ->General,
- a) is a Tomcat Project
- b) Context name: /treebase (or whatever URL you like)
- c) Can update server.xml (optional)
- d) Mark this context as reloadable
- Subdirectory to set as web applicaiton root: src/main/webapp
- (directory leading up to WEB-INF/ directory)
-
-
- Properties -> Tomcat ->DevLoader Classpath:
- a) Activate DevLoader;
- b) /treebase-core/target/classes (where core is compiled)
- c) /treebase-web/src/main/webapp/WEB-INF/classes (where web is compiled)
-
-6) Copy configuration file:
-
- Copy the following files from treebase-core/src/main/resources to
- treebase-web/src/main/resources:
- a) applicationContext.xml
- b) applicationContext-dao.xml
- c) applicationContext-service.xml
- d) hibernate.cfg.xml
- e) jdbc.properties
- f) log4j.xml
- g) make sure messages.properties files also in treebase-web/src/main/resources
- if you are using one
-
- make sure your webapp/WEB-INF/lib contains all the required *.jar files;
-
+http://sourceforge.net/apps/mediawiki/treebase/
\ 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: <rv...@us...> - 2009-11-04 14:54:33
|
Revision: 241
http://treebase.svn.sourceforge.net/treebase/?rev=241&view=rev
Author: rvos
Date: 2009-11-04 14:54:19 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
Removed retired developers from meta tags.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/common/meta.jsp
Modified: trunk/treebase-web/src/main/webapp/common/meta.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/common/meta.jsp 2009-11-04 14:52:26 UTC (rev 240)
+++ trunk/treebase-web/src/main/webapp/common/meta.jsp 2009-11-04 14:54:19 UTC (rev 241)
@@ -4,9 +4,6 @@
<meta http-equiv="Pragma" content="no-cache"/>
<!-- Prevents caching at the Proxy Server -->
<meta http-equiv="Expires" content="0"/>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-<meta name="author" content="Madhu (ma...@sd...)"/>
-<meta name="author" content="Lucie C. Chan (lc...@sd...)"/>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
<meta name="author" content="Rutger A. Vos (rut...@gm...)"/>
-<meta name="author" content="Mark Jason Dominus (mj...@ge...)"/>
<link rel="icon" href="<c:url value="/images/favicon.ico"/>"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2009-11-04 14:52:34
|
Revision: 240
http://treebase.svn.sourceforge.net/treebase/?rev=240&view=rev
Author: rvos
Date: 2009-11-04 14:52:26 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
s/TreeBase/TreeBASE/ in page title tags
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/decorators/mainTemplate.jsp
trunk/treebase-web/src/main/webapp/decorators/testTemplate.jsp
Modified: trunk/treebase-web/src/main/webapp/decorators/mainTemplate.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/decorators/mainTemplate.jsp 2009-11-04 14:50:28 UTC (rev 239)
+++ trunk/treebase-web/src/main/webapp/decorators/mainTemplate.jsp 2009-11-04 14:52:26 UTC (rev 240)
@@ -7,7 +7,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head><%@ include file="/common/meta.jsp" %>
-<title>TreeBase Web<decorator:title/></title>
+<title>TreeBASE Web<decorator:title/></title>
<link rel="stylesheet" type="text/css" href="<c:url value='/styles/styles.css'/>" />
<link rel="stylesheet" type="text/css" href="<c:url value='/styles/menuExpandable2.css'/>" />
<script type="text/javascript" src="<c:url value='/scripts/prototype/prototype-1.6.0.3.js'/>"></script>
Modified: trunk/treebase-web/src/main/webapp/decorators/testTemplate.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/decorators/testTemplate.jsp 2009-11-04 14:50:28 UTC (rev 239)
+++ trunk/treebase-web/src/main/webapp/decorators/testTemplate.jsp 2009-11-04 14:52:26 UTC (rev 240)
@@ -7,7 +7,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head><%@ include file="/common/meta.jsp" %>
-<title>TreeBase Web<decorator:title/></title>
+<title>TreeBASE Web<decorator:title/></title>
<link rel="stylesheet" type="text/css" href="<c:url value='/styles/styles.css'/>" />
<link rel="stylesheet" type="text/css" media="all" href="<c:url value='/styles/displaytag.css'/>" />
<link rel="stylesheet" type="text/css" href="<c:url value='/styles/menuExpandable2.css'/>" />
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.
