]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-3574: Merging Plain Old XML payload work into trunk.
authorRichard Millet <richard.millet@berkeley.edu>
Tue, 15 Feb 2011 23:40:22 +0000 (23:40 +0000)
committerRichard Millet <richard.millet@berkeley.edu>
Tue, 15 Feb 2011 23:40:22 +0000 (23:40 +0000)
66 files changed:
services/blob/3rdparty/nuxeo-platform-cs-blob/.classpath
services/blob/3rdparty/nuxeo-platform-cs-blob/.project
services/blob/client/.classpath
services/blob/client/.project
services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java
services/blob/client/src/main/java/org/collectionspace/services/client/BlobProxy.java
services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobAuthRefsTest.java
services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobServiceTest.java
services/blob/jaxb/.classpath
services/blob/jaxb/.project
services/blob/jaxb/.settings/org.maven.ide.eclipse.prefs
services/blob/service/.classpath
services/blob/service/.project
services/blob/service/pom.xml
services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java
services/client/.classpath
services/client/.project
services/client/pom.xml
services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java
services/client/src/main/java/org/collectionspace/services/client/PayloadInputPart.java [new file with mode: 0644]
services/client/src/main/java/org/collectionspace/services/client/PayloadOutputPart.java [new file with mode: 0644]
services/client/src/main/java/org/collectionspace/services/client/PayloadPart.java [new file with mode: 0644]
services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java [new file with mode: 0644]
services/client/src/main/java/org/collectionspace/services/client/PoxPayloadIn.java [new file with mode: 0644]
services/client/src/main/java/org/collectionspace/services/client/PoxPayloadOut.java [new file with mode: 0644]
services/client/src/main/java/org/collectionspace/services/client/TestServiceClient.java
services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java
services/common/.classpath
services/common/.project
services/common/.settings/org.maven.ide.eclipse.prefs
services/common/pom.xml
services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
services/common/src/main/java/org/collectionspace/services/common/blob/BlobUtil.java
services/common/src/main/java/org/collectionspace/services/common/context/MultipartServiceContext.java
services/common/src/main/java/org/collectionspace/services/common/context/MultipartServiceContextFactory.java
services/common/src/main/java/org/collectionspace/services/common/context/MultipartServiceContextImpl.java
services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java
services/common/src/main/java/org/collectionspace/services/common/query/QueryContext.java
services/common/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteSubItemDocumentModelHandlerImpl.java
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
services/contact/3rdparty/nuxeo-platform-cs-contact/.classpath
services/contact/3rdparty/nuxeo-platform-cs-contact/.project
services/contact/client/.classpath
services/contact/client/.project
services/contact/client/pom.xml
services/contact/client/src/main/java/org/collectionspace/services/client/ContactClient.java
services/contact/client/src/main/java/org/collectionspace/services/client/ContactClientUtils.java
services/contact/client/src/main/java/org/collectionspace/services/client/ContactProxy.java
services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java
services/contact/jaxb/.classpath
services/contact/jaxb/.project
services/contact/jaxb/.settings/org.maven.ide.eclipse.prefs
services/contact/service/.classpath
services/contact/service/.project
services/contact/service/pom.xml
services/contact/service/src/main/java/org/collectionspace/services/contact/AuthorityResourceWithContacts.java
services/contact/service/src/main/java/org/collectionspace/services/contact/ContactResource.java
services/jaxb/.classpath
services/jaxb/.project
services/jaxb/.settings/org.maven.ide.eclipse.prefs

index 199bbbbdbabba5e7cbae0d055b2ea2d981077cfc..6fd3b85515a211ec87f389f4ff71cbb33c4c6db3 100644 (file)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index 1342197e96b1abeadbfae42fadc7399cd43c97aa..6c1cf7de3526665856dc1d6e26670c55253eb0cf 100644 (file)
@@ -1,23 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.collectionspace.services.blob.3rdparty.nuxeo</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
+  <comment>Blob Nuxeo Document Type. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
+  <projects/>\r
        <buildSpec>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
        </natures>\r
-</projectDescription>\r
+</projectDescription>
\ No newline at end of file
index 425cd1620f3d44a6c3d1d8c43488a67552f09765..f6761bae71cb20c3280b6ee968ae30bbd92040f7 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.2_01/jai_core-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/javax/script/script-api/1.0/script-api-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar" sourcepath="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/EditableImage/0.9.5/EditableImage-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4.jar" sourcepath="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/imagej/imagej/1.4.1.e/imagej-1.4.1.e.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/JAI-Adapter/0.9.5/JAI-Adapter-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/jai_codec/1.1.2_01/jai_codec-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/cup/java-cup/0.11a/java-cup-0.11a.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/1.2.1.GA/jaxrs-api-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.0.4.GA/jboss-common-4.0.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.2.SP1/jboss-remoting-2.2.2.SP1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" sourcepath="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1H.7/jetty-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1H.7/jetty-util-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/metadata-extractor/2.3.1/metadata-extractor-2.3.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/mlib_jai/1.1.2_01/mlib_jai-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.5/mysql-connector-java-5.1.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/common/nuxeo-common/1.6.2/nuxeo-common-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core/1.6.2/nuxeo-core-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-api/1.6.2/nuxeo-core-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-client/1.6.2/nuxeo-core-client-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-convert-api/1.6.2/nuxeo-core-convert-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-event/1.6.2/nuxeo-core-event-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-facade/1.6.2/nuxeo-core-facade-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-io/1.6.2/nuxeo-core-io-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-query/1.6.2/nuxeo-core-query-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-schema/1.6.2/nuxeo-core-schema-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-storage-sql/1.6.2/nuxeo-core-storage-sql-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-commandline-executor/5.3.2/nuxeo-platform-commandline-executor-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-api/5.3.2/nuxeo-platform-filemanager-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-core/5.3.2/nuxeo-platform-filemanager-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-forms-layout-api/5.3.2/nuxeo-platform-forms-layout-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-api/5.3.2/nuxeo-platform-imaging-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-core/5.3.2/nuxeo-platform-imaging-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-mimetype-api/5.3.2/nuxeo-platform-mimetype-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-search-api/5.3.2/nuxeo-platform-search-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-types-api/5.3.2/nuxeo-platform-types-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-versioning-api/5.3.2/nuxeo-platform-versioning-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime/1.6.2/nuxeo-runtime-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-management/1.6.2/nuxeo-runtime-management-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-osgi/1.6.2/nuxeo-runtime-osgi-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/Operations/0.9.5/Operations-0.9.5.jar"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.common"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.person.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.person.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/restlet/org.restlet/1.0.7/org.restlet-1.0.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/relaxngDatatype/1.0/relaxngDatatype-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/1.2.1.GA/resteasy-jaxb-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-multipart-provider/1.2.1.GA/resteasy-multipart-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1H.7/servlet-api-2.5-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/xsom/20060306/xsom-20060306.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index ff7456be878eb1cafb051c3458950a56310a2b0b..3923ea3a7003f722d46c53bdbc47d7e06d8ec6e5 100644 (file)
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.collectionspace.services.blob.client</name>\r
-       <comment></comment>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
        <projects>\r
+    <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>\r
+    <project>org.collectionspace.services.client</project>\r
+    <project>org.collectionspace.services.common</project>\r
+    <project>org.collectionspace.services.contact.client</project>\r
+    <project>org.collectionspace.services.contact.jaxb</project>\r
+    <project>org.collectionspace.services.hyperjaxb</project>\r
+    <project>org.collectionspace.services.jaxb</project>\r
+    <project>org.collectionspace.services.person.client</project>\r
+    <project>org.collectionspace.services.person.jaxb</project>\r
        </projects>\r
        <buildSpec>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
        </natures>\r
-</projectDescription>\r
+</projectDescription>
\ No newline at end of file
index 510d30e5faae5a568db9f463ea0acc6dd19c3211..387f9af63e937699a11d21ad145b53fdef878caa 100644 (file)
@@ -16,7 +16,6 @@
  */
 package org.collectionspace.services.client;
 
-import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
@@ -26,8 +25,6 @@ import org.jboss.resteasy.client.ProxyFactory;
 import org.jboss.resteasy.plugins.providers.RegisterBuiltin;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.client.core.executors.ApacheHttpClientExecutor;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
 /**
@@ -38,20 +35,23 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
  *
  */
 public class BlobClient extends AbstractServiceClientImpl {
-
-    /* (non-Javadoc)
-     * @see org.collectionspace.services.client.AbstractServiceClientImpl#getServicePathComponent()
-     */
+       public static final String SERVICE_NAME = "blobs";
+       public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
+       public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
+       public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
+
+       @Override
+       public String getServiceName() {
+               return SERVICE_NAME;
+       }
+       
+       @Override
     public String getServicePathComponent() {
-        return "blobs"; //Laramie20100824 was blobs, but label was a mismatch.
+        return SERVICE_PATH_COMPONENT;
     }
     /**
      *
      */
-//    private static final BlobClient instance = new BlobClient();
-    /**
-     *
-     */
     private BlobProxy blobProxy;
 
     /**
@@ -115,7 +115,7 @@ public class BlobClient extends AbstractServiceClientImpl {
      * @return
      * @see org.collectionspace.services.client.BlobProxy#getBlob(java.lang.String)
      */
-    public ClientResponse<MultipartInput> read(String csid) {
+    public ClientResponse<String> read(String csid) {
         return blobProxy.read(csid);
     }
 
@@ -124,8 +124,8 @@ public class BlobClient extends AbstractServiceClientImpl {
      * @return
      *
      */
-    public ClientResponse<Response> create(MultipartOutput multipart) {
-        return blobProxy.create(multipart);
+    public ClientResponse<Response> create(PoxPayloadOut xmlPayload) {
+        return blobProxy.create(xmlPayload.getBytes());
     }
 
     /**
@@ -133,8 +133,8 @@ public class BlobClient extends AbstractServiceClientImpl {
      * @param blob
      * @return
      */
-    public ClientResponse<MultipartInput> update(String csid, MultipartOutput multipart) {
-        return blobProxy.update(csid, multipart);
+    public ClientResponse<String> update(String csid, PoxPayloadOut xmlPayload) {
+        return blobProxy.update(csid, xmlPayload.getBytes());
 
     }
 
index 18829d9a0423aa6970cf6395f8b62ffa3b5a3fbf..d6c7ff9d094df57c72596e99456016ea0d841502 100644 (file)
@@ -13,30 +13,28 @@ import javax.ws.rs.core.Response;
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
 import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.jboss.resteasy.client.ClientResponse;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 
 /**
  * @version $Revision: 2108 $
  */
-@Path("/blobs/")
-@Produces({"multipart/mixed"})
-@Consumes({"multipart/mixed"})
+@Path(BlobClient.SERVICE_PATH + "/")
+@Produces({"application/xml"})
+@Consumes({"application/xml"})
 public interface BlobProxy extends CollectionSpaceProxy {
 
     //(C)reate
     @POST
-    ClientResponse<Response> create(MultipartOutput multipart);
+    ClientResponse<Response> create(byte[] xmlPayload);
 
     //(R)ead
     @GET
     @Path("/{csid}")
-    ClientResponse<MultipartInput> read(@PathParam("csid") String csid);
+    ClientResponse<String> read(@PathParam("csid") String csid);
 
     //(U)pdate
     @PUT
     @Path("/{csid}")
-    ClientResponse<MultipartInput> update(@PathParam("csid") String csid, MultipartOutput multipart);
+    ClientResponse<String> update(@PathParam("csid") String csid, byte[] xmlPayload);
 
     //(D)elete
     @DELETE
index b689d0f685d77d1e082a04d230d9400545d49504..46a33466ce8b721e756beee36e252d27f113ed40 100644 (file)
@@ -33,8 +33,11 @@ import javax.ws.rs.core.Response;
 import org.collectionspace.services.PersonJAXBSchema;
 import org.collectionspace.services.client.CollectionSpaceClient;
 import org.collectionspace.services.client.BlobClient;
+import org.collectionspace.services.client.PayloadOutputPart;
 import org.collectionspace.services.client.PersonAuthorityClient;
 import org.collectionspace.services.client.PersonAuthorityClientUtils;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
 import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.blob.BlobsCommon;
@@ -60,7 +63,6 @@ public class BlobAuthRefsTest extends BaseServiceTest {
 
     private final String CLASS_NAME = BlobAuthRefsTest.class.getName();
     private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);
-    final String SERVICE_PATH_COMPONENT = "blob";
     final String PERSON_AUTHORITY_NAME = "BlobPersonAuth";
     private String knownResourceId = null;
     private List<String> blobIdsCreated = new ArrayList<String>();
@@ -69,6 +71,16 @@ public class BlobAuthRefsTest extends BaseServiceTest {
     private String depositorRefName = null;
     private String blobName = null;
 
+    @Override
+       public String getServicePathComponent() {
+               return BlobClient.SERVICE_PATH_COMPONENT;
+       }
+
+       @Override
+       protected String getServiceName() {
+               return BlobClient.SERVICE_NAME;
+       }
+    
     @Override
     protected CollectionSpaceClient getClientInstance() {
         throw new UnsupportedOperationException(); //method not supported (or needed) in this test class
@@ -79,20 +91,15 @@ public class BlobAuthRefsTest extends BaseServiceTest {
         throw new UnsupportedOperationException(); //method not supported (or needed) in this test class
     }
 
-    @Override
-    public String getServicePathComponent() {
-        return SERVICE_PATH_COMPONENT;
-    }
-
-    private MultipartOutput createBlobInstance(String depositorRefName) {
+    private PoxPayloadOut createBlobInstance(String depositorRefName) {
         this.depositorRefName = depositorRefName;
         this.blobName = "testblob-"+createIdentifier();
         BlobsCommon blob = new BlobsCommon();
         blob.setName(this.blobName);
 
-        MultipartOutput multipart = new MultipartOutput();
-        OutputPart commonPart = multipart.addPart(blob, MediaType.APPLICATION_XML_TYPE);
-        commonPart.getHeaders().add("label", new BlobClient().getCommonPartName());
+        PoxPayloadOut multipart = new PoxPayloadOut(BlobClient.SERVICE_PAYLOAD_NAME);
+        PayloadOutputPart commonPart = multipart.addPart(blob, MediaType.APPLICATION_XML_TYPE);
+        commonPart.setLabel(new BlobClient().getCommonPartName());
         logger.debug("to be created, blob common: " + objectAsXmlString(blob, BlobsCommon.class));
         return multipart;
     }
@@ -106,7 +113,7 @@ public class BlobAuthRefsTest extends BaseServiceTest {
         // Create a new Loans In resource. One or more fields in this resource will be PersonAuthority
         //    references, and will refer to Person resources by their refNames.
         BlobClient blobClient = new BlobClient();
-        MultipartOutput multipart = createBlobInstance(depositorRefName);
+        PoxPayloadOut multipart = createBlobInstance(depositorRefName);
         ClientResponse<Response> res = blobClient.create(multipart);
         assertStatusCode(res, testName);
         if (knownResourceId == null) {// Store the ID returned from the first resource created for additional tests below.
@@ -118,7 +125,7 @@ public class BlobAuthRefsTest extends BaseServiceTest {
     protected void createPersonRefs() {
         PersonAuthorityClient personAuthClient = new PersonAuthorityClient();
         // Create a temporary PersonAuthority resource, and its corresponding refName by which it can be identified.
-        MultipartOutput multipart = PersonAuthorityClientUtils.createPersonAuthorityInstance(PERSON_AUTHORITY_NAME, PERSON_AUTHORITY_NAME, personAuthClient.getCommonPartName());
+        PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonAuthorityInstance(PERSON_AUTHORITY_NAME, PERSON_AUTHORITY_NAME, personAuthClient.getCommonPartName());
         ClientResponse<Response> res = personAuthClient.create(multipart);
         assertStatusCode(res, "createPersonRefs (not a surefire test)");
         personAuthCSID = extractId(res);
@@ -141,7 +148,7 @@ public class BlobAuthRefsTest extends BaseServiceTest {
         personInfo.put(PersonJAXBSchema.FORE_NAME, firstName);
         personInfo.put(PersonJAXBSchema.SUR_NAME, surName);
         personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
-        MultipartOutput multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, authRefName, personInfo, personAuthClient.getItemCommonPartName());
+        PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, authRefName, personInfo, personAuthClient.getItemCommonPartName());
         ClientResponse<Response> res = personAuthClient.createItem(personAuthCSID, multipart);
         assertStatusCode(res, "createPerson (not a surefire test)");
         return extractId(res);
@@ -158,9 +165,9 @@ public class BlobAuthRefsTest extends BaseServiceTest {
         logger.debug(testBanner(testName, CLASS_NAME));
         testSetup(STATUS_OK, ServiceRequestType.READ);
         BlobClient blobClient = new BlobClient();
-        ClientResponse<MultipartInput> res = blobClient.read(knownResourceId);
+        ClientResponse<String> res = blobClient.read(knownResourceId);
         assertStatusCode(res, testName);
-        MultipartInput input = (MultipartInput) res.getEntity();
+        PoxPayloadIn input = new PoxPayloadIn(res.getEntity());
         BlobsCommon blob = (BlobsCommon) extractPart(input, blobClient.getCommonPartName(), BlobsCommon.class);
         Assert.assertNotNull(blob);
         logger.debug(objectAsXmlString(blob, BlobsCommon.class));
index 2dea5714d4f6e683e533689c06c6567766ecb4a2..b765a6e336cde3f9573850435d6780bd456adfb1 100644 (file)
@@ -28,6 +28,10 @@ import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.client.CollectionSpaceClient;
 import org.collectionspace.services.client.BlobClient;
+import org.collectionspace.services.client.ContactClient;
+import org.collectionspace.services.client.PayloadOutputPart;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.blob.BlobsCommon;
 
@@ -51,9 +55,18 @@ public class BlobServiceTest extends AbstractServiceTestImpl {
 
     private final String CLASS_NAME = BlobServiceTest.class.getName();
     private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);
-    final String SERVICE_PATH_COMPONENT = "blobs";
     private String knownResourceId = null;
 
+    @Override
+       public String getServicePathComponent() {
+               return BlobClient.SERVICE_PATH_COMPONENT;
+       }
+
+       @Override
+       protected String getServiceName() {
+               return BlobClient.SERVICE_NAME;
+       }
+    
     @Override
     protected CollectionSpaceClient getClientInstance() {
         return new BlobClient();
@@ -70,7 +83,7 @@ public class BlobServiceTest extends AbstractServiceTestImpl {
         logger.debug(testBanner(testName, CLASS_NAME));
         setupCreate();
         BlobClient client = new BlobClient();
-        MultipartOutput multipart = createBlobInstance(createIdentifier());
+        PoxPayloadOut multipart = createBlobInstance(createIdentifier());
         ClientResponse<Response> res = client.create(multipart);
         assertStatusCode(res, testName);
         if (knownResourceId == null) {
@@ -95,9 +108,9 @@ public class BlobServiceTest extends AbstractServiceTestImpl {
         logger.debug(testBanner(testName, CLASS_NAME));
         setupRead();
         BlobClient client = new BlobClient();
-        ClientResponse<MultipartInput> res = client.read(knownResourceId);
+        ClientResponse<String> res = client.read(knownResourceId);
         assertStatusCode(res, testName);
-        MultipartInput input = (MultipartInput) res.getEntity();
+        PoxPayloadIn input = new PoxPayloadIn(res.getEntity());
         BlobsCommon blob = (BlobsCommon) extractPart(input, client.getCommonPartName(), BlobsCommon.class);
         Assert.assertNotNull(blob);
     }
@@ -129,21 +142,21 @@ public class BlobServiceTest extends AbstractServiceTestImpl {
         logger.debug(testBanner(testName, CLASS_NAME));
         setupUpdate();
         BlobClient client = new BlobClient();
-        ClientResponse<MultipartInput> res = client.read(knownResourceId);
+        ClientResponse<String> res = client.read(knownResourceId);
         assertStatusCode(res, testName);
         logger.debug("got object to update with ID: " + knownResourceId);
-        MultipartInput input = (MultipartInput) res.getEntity();
+        PoxPayloadIn input = new PoxPayloadIn(res.getEntity());
         BlobsCommon blob = (BlobsCommon) extractPart(input, client.getCommonPartName(), BlobsCommon.class);
         Assert.assertNotNull(blob);
 
         blob.setName("updated-" + blob.getName());
         logger.debug("Object to be updated:"+objectAsXmlString(blob, BlobsCommon.class));
-        MultipartOutput output = new MultipartOutput();
-        OutputPart commonPart = output.addPart(blob, MediaType.APPLICATION_XML_TYPE);
-        commonPart.getHeaders().add("label", client.getCommonPartName());
+        PoxPayloadOut output = new PoxPayloadOut(BlobClient.SERVICE_PAYLOAD_NAME);
+        PayloadOutputPart commonPart = output.addPart(blob, MediaType.APPLICATION_XML_TYPE);
+        commonPart.setLabel(client.getCommonPartName());
         res = client.update(knownResourceId, output);
         assertStatusCode(res, testName);
-        input = (MultipartInput) res.getEntity();
+        input = new PoxPayloadIn(res.getEntity());
         BlobsCommon updatedBlob = (BlobsCommon) extractPart(input, client.getCommonPartName(), BlobsCommon.class);
         Assert.assertNotNull(updatedBlob);
     }
@@ -157,8 +170,8 @@ public class BlobServiceTest extends AbstractServiceTestImpl {
         // Note: The ID used in this 'create' call may be arbitrary.
         // The only relevant ID may be the one used in update(), below.
         BlobClient client = new BlobClient();
-        MultipartOutput multipart = createBlobInstance(NON_EXISTENT_ID);
-        ClientResponse<MultipartInput> res = client.update(NON_EXISTENT_ID, multipart);
+        PoxPayloadOut multipart = createBlobInstance(NON_EXISTENT_ID);
+        ClientResponse<String> res = client.update(NON_EXISTENT_ID, multipart);
         assertStatusCode(res, testName);
     }
 
@@ -183,7 +196,7 @@ public class BlobServiceTest extends AbstractServiceTestImpl {
         logger.debug(testBanner(testName, CLASS_NAME));
         setupReadNonExistent();
         BlobClient client = new BlobClient();
-        ClientResponse<MultipartInput> res = client.read(NON_EXISTENT_ID);
+        ClientResponse<String> res = client.read(NON_EXISTENT_ID);
         assertStatusCode(res, testName);
     }
 
@@ -242,19 +255,13 @@ public class BlobServiceTest extends AbstractServiceTestImpl {
     // ---------------------------------------------------------------
     // Utility methods used by tests above
     // ---------------------------------------------------------------
-
-    @Override
-    public String getServicePathComponent() {
-        return SERVICE_PATH_COMPONENT;
-    }
-
-    private MultipartOutput createBlobInstance(String exitNumber) {
+    private PoxPayloadOut createBlobInstance(String exitNumber) {
         String identifier = "blobNumber-" + exitNumber;
         BlobsCommon blob = new BlobsCommon();
         blob.setName(identifier);
-        MultipartOutput multipart = new MultipartOutput();
-        OutputPart commonPart = multipart.addPart(blob, MediaType.APPLICATION_XML_TYPE);
-        commonPart.getHeaders().add("label", new BlobClient().getCommonPartName());
+        PoxPayloadOut multipart = new PoxPayloadOut(BlobClient.SERVICE_PAYLOAD_NAME);
+        PayloadOutputPart commonPart = multipart.addPart(blob, MediaType.APPLICATION_XML_TYPE);
+        commonPart.setLabel(new BlobClient().getCommonPartName());
 
         if (logger.isDebugEnabled()) {
             logger.debug("to be created, blob common");
index 557f8a4e07f9616882b7ea73418b64a2bb068cb6..981c9add6c2ff7b71e6d83ff90f79ec51103d75a 100644 (file)
@@ -1,10 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="target/generated-sources/xjc"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="target/generated-sources/xjc"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index 99f9fcfb79fa865cea954ae9acbd9dc9c6fd40d3..04d0bd6db26ed315b1f4a71175dae20d94d160c4 100644 (file)
@@ -1,23 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.collectionspace.services.blob.jaxb</name>\r
-       <comment></comment>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
        <projects>\r
+    <project>org.collectionspace.services.jaxb</project>\r
        </projects>\r
        <buildSpec>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
        </natures>\r
-</projectDescription>\r
+</projectDescription>
\ No newline at end of file
index a342accb7dfbecbed2fd59b11646866c4039498e..8ff0f62ad937145b12826188a89ff5db1def6e8f 100644 (file)
@@ -1,9 +1,9 @@
-#Tue Dec 21 10:25:44 PST 2010\r
+#Wed Jan 19 22:49:19 PST 2011\r
 activeProfiles=\r
 eclipse.preferences.version=1\r
-fullBuildGoals=process-classes\r
+fullBuildGoals=process-test-resources\r
 includeModules=false\r
 resolveWorkspaceProjects=true\r
-resourceFilterGoals=process-classes\r
-skipCompilerPlugin=false\r
+resourceFilterGoals=process-resources resources\:testResources\r
+skipCompilerPlugin=true\r
 version=1\r
index 425cd1620f3d44a6c3d1d8c43488a67552f09765..0d32cead7a0254a11f338c2be0e21b9b84495302 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.2_01/jai_core-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/javax/script/script-api/1.0/script-api-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar" sourcepath="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/EditableImage/0.9.5/EditableImage-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4.jar" sourcepath="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/imagej/imagej/1.4.1.e/imagej-1.4.1.e.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/JAI-Adapter/0.9.5/JAI-Adapter-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/jai_codec/1.1.2_01/jai_codec-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/cup/java-cup/0.11a/java-cup-0.11a.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/1.2.1.GA/jaxrs-api-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.0.4.GA/jboss-common-4.0.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.2.SP1/jboss-remoting-2.2.2.SP1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" sourcepath="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1H.7/jetty-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1H.7/jetty-util-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar" sourcepath="M2_REPO/junit/junit/4.1/junit-4.1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/junit/junit/4.1/junit-4.1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/metadata-extractor/2.3.1/metadata-extractor-2.3.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/mlib_jai/1.1.2_01/mlib_jai-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.5/mysql-connector-java-5.1.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/common/nuxeo-common/1.6.2/nuxeo-common-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core/1.6.2/nuxeo-core-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-api/1.6.2/nuxeo-core-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-client/1.6.2/nuxeo-core-client-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-convert-api/1.6.2/nuxeo-core-convert-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-event/1.6.2/nuxeo-core-event-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-facade/1.6.2/nuxeo-core-facade-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-io/1.6.2/nuxeo-core-io-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-query/1.6.2/nuxeo-core-query-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-schema/1.6.2/nuxeo-core-schema-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-storage-sql/1.6.2/nuxeo-core-storage-sql-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-commandline-executor/5.3.2/nuxeo-platform-commandline-executor-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-api/5.3.2/nuxeo-platform-filemanager-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-core/5.3.2/nuxeo-platform-filemanager-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-forms-layout-api/5.3.2/nuxeo-platform-forms-layout-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-api/5.3.2/nuxeo-platform-imaging-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-core/5.3.2/nuxeo-platform-imaging-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-mimetype-api/5.3.2/nuxeo-platform-mimetype-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-search-api/5.3.2/nuxeo-platform-search-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-types-api/5.3.2/nuxeo-platform-types-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-versioning-api/5.3.2/nuxeo-platform-versioning-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime/1.6.2/nuxeo-runtime-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-management/1.6.2/nuxeo-runtime-management-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-osgi/1.6.2/nuxeo-runtime-osgi-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/Operations/0.9.5/Operations-0.9.5.jar"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.blob.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.common"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.person.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.person.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/restlet/org.restlet/1.0.7/org.restlet-1.0.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/relaxngDatatype/1.0/relaxngDatatype-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/1.2.1.GA/resteasy-jaxb-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-multipart-provider/1.2.1.GA/resteasy-multipart-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1H.7/servlet-api-2.5-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/xsom/20060306/xsom-20060306.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index e2bde3e1ce796cadfe6b0c9ca08bf90224004d18..6501aa4086deec9f59f2c56f08ae54d9d43db145 100644 (file)
@@ -1,23 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.collectionspace.services.blob.service</name>\r
-       <comment></comment>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
        <projects>\r
+    <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>\r
+    <project>org.collectionspace.services.blob.client</project>\r
+    <project>org.collectionspace.services.client</project>\r
+    <project>org.collectionspace.services.common</project>\r
+    <project>org.collectionspace.services.contact.client</project>\r
+    <project>org.collectionspace.services.contact.jaxb</project>\r
+    <project>org.collectionspace.services.hyperjaxb</project>\r
+    <project>org.collectionspace.services.jaxb</project>\r
+    <project>org.collectionspace.services.person.client</project>\r
+    <project>org.collectionspace.services.person.jaxb</project>\r
        </projects>\r
        <buildSpec>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
        </natures>\r
-</projectDescription>\r
+</projectDescription>
\ No newline at end of file
index 9cc5206064421b5ff0c281e989e39135cb8907a4..1cb09b79d6d2aed6e0400cdba286053d1c5008b4 100644 (file)
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.blob.client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
         <!-- External dependencies -->        
         <dependency>
             <groupId>junit</groupId>
index bb0fd3444d86c21f138657f5fa2fe79e4f06e6d0..98b255c08ea909eac1f4786f81e3e62bda8756eb 100644 (file)
@@ -26,6 +26,9 @@ package org.collectionspace.services.blob;
 import java.util.Map;
 import java.util.UUID;
 
+import org.collectionspace.services.client.BlobClient;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.FileUtils;
 import org.collectionspace.services.common.ResourceBase;
 //import org.collectionspace.services.common.ClientType;
@@ -72,9 +75,9 @@ import java.io.File;
 import java.io.InputStream;
 import java.util.List;
 
-@Path("/blobs")
-@Consumes("multipart/mixed")
-@Produces("multipart/mixed")
+@Path(BlobClient.SERVICE_PATH)
+@Consumes({"multipart/mixed", "application/xml"})
+@Produces({"multipart/mixed", "application/xml"})
 public class BlobResource extends ResourceBase {
 
        @Override
@@ -82,7 +85,6 @@ public class BlobResource extends ResourceBase {
         return BlobUtil.BLOB_RESOURCE_NAME;
     }
 
-
     @Override
     protected String getVersionString() {
        final String lastChangeRevision = "$LastChangedRevision: 2108 $";
@@ -110,7 +112,7 @@ public class BlobResource extends ResourceBase {
          return (CommonList) super.search(queryParams, keywords);
     }
     
-    private CommonList getDerivativeList(ServiceContext<MultipartInput, MultipartOutput> ctx,
+    private CommonList getDerivativeList(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
                String csid) throws Exception {
        CommonList result = null;
        
@@ -118,7 +120,7 @@ public class BlobResource extends ResourceBase {
        blobInput.setDerivativeListRequested(true);
        BlobUtil.setBlobInput(ctx, blobInput);
 
-       MultipartOutput response = this.get(csid, ctx);
+       PoxPayloadOut response = this.get(csid, ctx);
        if (logger.isDebugEnabled() == true) {
                logger.debug(response.toString());
        }
@@ -135,12 +137,12 @@ public class BlobResource extends ResourceBase {
        InputStream result = null;
        
        try {
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
                BlobInput blobInput = BlobUtil.getBlobInput(ctx);
                blobInput.setDerivativeTerm(derivativeTerm);
                blobInput.setContentRequested(true);
                
-               MultipartOutput response = this.get(csid, ctx);
+               PoxPayloadOut response = this.get(csid, ctx);
                if (logger.isDebugEnabled() == true) {
                        logger.debug(response.toString());
                }
@@ -210,7 +212,7 @@ public class BlobResource extends ResourceBase {
                @QueryParam("blobUri") String blobUri) {
        Response response = null;       
        try {
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
                BlobInput blobInput = BlobUtil.getBlobInput(ctx);
                blobInput.createBlobFile(req, blobUri);
                response = this.create(null, ctx);
@@ -245,13 +247,13 @@ public class BlobResource extends ResourceBase {
     
     @GET
     @Path("{csid}/derivatives/{derivativeTerm}")
-    public MultipartOutput getDerivative(@PathParam("csid") String csid,
+    public String getDerivative(@PathParam("csid") String csid,
                @PathParam("derivativeTerm") String derivativeTerm) {
-       MultipartOutput result = null;
+       PoxPayloadOut result = null;
        
        ensureCSID(csid, READ);
         try {
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
                BlobInput blobInput = BlobUtil.getBlobInput(ctx);
                blobInput.setDerivativeTerm(derivativeTerm);
             result = get(csid, ctx);
@@ -264,7 +266,7 @@ public class BlobResource extends ResourceBase {
             throw bigReThrow(e, ServiceMessages.READ_FAILED, csid);
         }
         
-        return result;
+        return result.toXML();
     }
         
     @GET
@@ -276,7 +278,7 @@ public class BlobResource extends ResourceBase {
 
        ensureCSID(csid, READ);
         try {
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
             result = this.getDerivativeList(ctx, csid);
             if (result == null) {
                 Response response = Response.status(Response.Status.NOT_FOUND).entity(
index 425cd1620f3d44a6c3d1d8c43488a67552f09765..ac845bf702fa47ac275a9d19babf7c8a60745099 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.2.2/jaxb-api-2.2.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar" sourcepath="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.2/jaxb-impl-2.2.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/1.2.1.GA/jaxrs-api-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" sourcepath="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/1.2.1.GA/resteasy-jaxb-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-multipart-provider/1.2.1.GA/resteasy-multipart-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index c533bc253e16e7d947d0427600a7988f7af2034c..a89fde1269493489e23e29eaba8a42ada3c7e9ba 100644 (file)
@@ -1,24 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.collectionspace.services.client</name>\r
-       <comment></comment>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
        <projects>\r
-               <project>org.collectionspace.services.common</project>\r
+    <project>org.collectionspace.services.jaxb</project>\r
        </projects>\r
        <buildSpec>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
        </natures>\r
-</projectDescription>\r
+</projectDescription>
\ No newline at end of file
index facb89bb21e089fcaec97c5f2dbdc38adb7cc458..d2535166abe0066d6653e4637d203b5cd14633fc 100644 (file)
             <version>1.0.01</version>\r
             <scope>provided</scope>\r
         </dependency>\r
+        <dependency>\r
+                   <groupId>com.sun.xml.bind</groupId>\r
+                   <artifactId>jaxb-impl</artifactId>\r
+                   <version>2.2.2</version>\r
+                   <type>jar</type>\r
+                   <scope>compile</scope>\r
+               </dependency>        \r
         <dependency>\r
             <groupId>dom4j</groupId>\r
             <artifactId>dom4j</artifactId>\r
index 48c6be2cf4c52a9bd4ae8ed9ebb5a7a67eae5e62..53a4e8fa4032527aaadf835c37f6c470364e8594 100644 (file)
@@ -24,6 +24,7 @@
 package org.collectionspace.services.client;\r
 \r
 import java.io.InputStream;\r
+import java.io.UnsupportedEncodingException;\r
 import java.net.URL;\r
 import java.util.Properties;\r
 \r
@@ -74,13 +75,32 @@ public abstract class AbstractServiceClientImpl implements
        return logger;\r
     }\r
     \r
+    abstract public String getServicePathComponent();\r
+    \r
+    /**\r
+     * Returns a UTF-8 encode byte array from 'string'\r
+     *\r
+     * @return UTF-8 encoded byte array\r
+     */\r
+    protected byte[] getBytes(String string) {\r
+       byte[] result = null;\r
+       try {\r
+                       result = string.getBytes("UTF8");\r
+               } catch (UnsupportedEncodingException e) {\r
+                       if (logger.isWarnEnabled() == true) {\r
+                               logger.warn(e.getMessage(), e);\r
+                       }\r
+               }\r
+               return result;\r
+    }\r
+    \r
     /**\r
      * Gets the common part name.\r
      *\r
      * @return the common part name\r
      */\r
     public String getCommonPartName() {\r
-        return getCommonPartName(getServicePathComponent());\r
+        return getCommonPartName(getServiceName());\r
     }\r
 \r
     /**\r
@@ -90,16 +110,16 @@ public abstract class AbstractServiceClientImpl implements
      *            the service path component\r
      * @return the common part name\r
      */\r
-    public String getCommonPartName(String servicePathComponent) {\r
-        return servicePathComponent + PART_LABEL_SEPARATOR + PART_COMMON_LABEL;\r
+    protected String getCommonPartName(String commonPrefix) {\r
+        return commonPrefix + PART_LABEL_SEPARATOR + PART_COMMON_LABEL;\r
     }\r
 \r
-    /**\r
-     * Gets the service path component.\r
-     *\r
-     * @return the service path component\r
-     */\r
-    abstract public String getServicePathComponent();\r
+//    /**\r
+//     * Gets the service path component.\r
+//     *\r
+//     * @return the service path component\r
+//     */\r
+//    abstract public String getServicePathComponent();\r
 \r
     /**\r
      * Instantiates a new abstract service client impl.\r
index f61b18b2adb2cd8f279930317e11a89405aff06d..b785d1d3b4d93cfaca620e9eecc8002a468c496f 100644 (file)
@@ -53,6 +53,8 @@ public interface CollectionSpaceClient {
      * @return the base url
      */
     String getBaseURL();
+    
+    String getServiceName();
 
     /**
      * Gets the http client.
index c2236dfd49f00ba6087bdb6771373750700cb59c..4cd6764e713e36c5fe80368b25aae73ab21f2b81 100644 (file)
@@ -100,6 +100,29 @@ public class CollectionSpaceClientUtils {
      * @return the object\r
      * @throws Exception the exception\r
      */\r
+    static protected Object extractPart(PoxPayloadIn input, String label, Class<?> clazz)\r
+            throws Exception {\r
+       Object result = null;\r
+       PayloadInputPart payloadInputPart = input.getPart(label);\r
+        if (payloadInputPart != null) {\r
+               result = payloadInputPart.getBody();\r
+        } else if (logger.isWarnEnabled() == true) {\r
+               logger.warn("Payload part: " + label +\r
+                               " is missing from payload: " + input.getName());\r
+        }\r
+        return result;\r
+    }\r
+    \r
+    /**\r
+     * Extract part.\r
+     *\r
+     * @param input the input\r
+     * @param label the label\r
+     * @param clazz the clazz\r
+     * @return the object\r
+     * @throws Exception the exception\r
+     */\r
+    @Deprecated\r
     static public Object extractPart(MultipartInput input, String label, Class<?> clazz)\r
             throws Exception {\r
         Object obj = null;\r
diff --git a/services/client/src/main/java/org/collectionspace/services/client/PayloadInputPart.java b/services/client/src/main/java/org/collectionspace/services/client/PayloadInputPart.java
new file mode 100644 (file)
index 0000000..af3b5d7
--- /dev/null
@@ -0,0 +1,36 @@
+package org.collectionspace.services.client;\r
+\r
+import javax.ws.rs.core.MediaType;\r
+import org.dom4j.Element;\r
+\r
+public class PayloadInputPart extends PayloadPart {\r
+//     private Element elementBody;\r
+       \r
+       public PayloadInputPart(String label, Object body) {\r
+               super(label, body);\r
+       }\r
+       \r
+       public PayloadInputPart(String label, Object body, Element elementBody) {\r
+               super(label, body, elementBody);\r
+       }\r
+       \r
+       public PayloadInputPart(String label, Element elementBody) {\r
+               super(label, elementBody);\r
+       }\r
+       \r
+       @Override\r
+       public String asXML() {\r
+               String result = null;\r
+               Object body = getBody();\r
+               if (getElementBody() != null) {\r
+                       result = getElementBody().asXML();\r
+               } else if (body != null) {\r
+                       result = PoxPayload.toElement(getBody()).asXML();\r
+               }\r
+               return result;\r
+       }\r
+\r
+       public MediaType getMediaType() {\r
+               return MediaType.APPLICATION_XML_TYPE;  \r
+       }\r
+}\r
diff --git a/services/client/src/main/java/org/collectionspace/services/client/PayloadOutputPart.java b/services/client/src/main/java/org/collectionspace/services/client/PayloadOutputPart.java
new file mode 100644 (file)
index 0000000..96e1f1a
--- /dev/null
@@ -0,0 +1,48 @@
+package org.collectionspace.services.client;\r
+\r
+import org.dom4j.DocumentException;\r
+import org.dom4j.Element;\r
+\r
+public class PayloadOutputPart extends PayloadPart {\r
+       \r
+       //\r
+       // Constructors\r
+       //\r
+       PayloadOutputPart(String label, Object body) {\r
+               super(label, body);\r
+       }\r
+       \r
+       PayloadOutputPart(String label, Element elementBody) {\r
+               super(label, elementBody);\r
+       }\r
+       \r
+       PayloadOutputPart(String label, String xmlBody) throws DocumentException {\r
+               super(label, xmlBody);\r
+       }       \r
+       \r
+       PayloadOutputPart(String label, Object body, Element elementBody) {\r
+               super(label, body, elementBody);\r
+       }\r
+       \r
+       //\r
+       // Utility Methods\r
+       //\r
+       \r
+       @Override\r
+       public String asXML() {\r
+               String result = null;\r
+                               \r
+               Element elementBody = getElementBody();\r
+               if (elementBody != null) {\r
+                       result = elementBody.asXML();\r
+               } else { \r
+                       Object body = getBody();\r
+                       if (body != null) {\r
+                               result = PoxPayload.toElement(body).asXML();\r
+                       }\r
+               }\r
+               \r
+               return result;\r
+       }\r
+       \r
+}\r
diff --git a/services/client/src/main/java/org/collectionspace/services/client/PayloadPart.java b/services/client/src/main/java/org/collectionspace/services/client/PayloadPart.java
new file mode 100644 (file)
index 0000000..9cdece3
--- /dev/null
@@ -0,0 +1,77 @@
+package org.collectionspace.services.client;\r
+\r
+import org.dom4j.DocumentException;\r
+import org.dom4j.Element;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
+public abstract class PayloadPart {\r
+       protected final Logger logger = LoggerFactory.getLogger(PayloadPart.class);\r
+               \r
+       private String label;\r
+       private Object body;\r
+       private Element elementBody;\r
+\r
+       public PayloadPart(String label) {\r
+               this.label = label;\r
+       }\r
+       \r
+       public PayloadPart(String label, Object body) {\r
+               this(label);\r
+               this.body = body;\r
+       }\r
+               \r
+       /**\r
+        * Instantiates a new payload part by parsing the XML string 'xmlPayload'\r
+        *\r
+        * @param label the label\r
+        * @param xmlPayload the xml payload\r
+        * @throws DocumentException the document exception\r
+        */\r
+       public PayloadPart(String label, String xmlPayload) throws DocumentException {\r
+               this(label);\r
+               Element element = PoxPayload.toElement(xmlPayload);\r
+               this.elementBody = element;\r
+               \r
+       }\r
+\r
+       public PayloadPart(String label, Object body, Element elementBody) {\r
+               this(label, body);\r
+               this.elementBody = elementBody;\r
+       }\r
+\r
+       public PayloadPart(String label, Element elementBody) {\r
+               this(label);\r
+               this.elementBody = elementBody;\r
+       }\r
+\r
+       abstract public String asXML();\r
+       \r
+       public Element asElement() {\r
+               Element result = elementBody;\r
+               // if we don't already have an Element, let's try to create one from a JAXB object\r
+               if (result == null) {\r
+                       if (body != null) {\r
+                               //toElement(body) will return null if not given an JAXB object\r
+                               result = PoxPayload.toElement(body);\r
+                       }\r
+               }\r
+               return result;\r
+       }\r
+       \r
+       public Object getBody() {\r
+               return body;\r
+       }\r
+       \r
+       public Element getElementBody() {\r
+               return elementBody;\r
+       }\r
+\r
+       public void setLabel(String label) {\r
+               this.label = label;\r
+       }\r
+\r
+       public String getLabel() {\r
+               return this.label;\r
+       }\r
+}\r
diff --git a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java
new file mode 100644 (file)
index 0000000..32ffddf
--- /dev/null
@@ -0,0 +1,304 @@
+package org.collectionspace.services.client;\r
+\r
+import java.io.ByteArrayOutputStream;\r
+import java.io.File;\r
+import java.io.IOException;\r
+import java.io.StringReader;\r
+import java.util.ArrayList;\r
+import java.util.Iterator;\r
+import java.util.List;\r
+\r
+import javax.xml.bind.JAXBContext;\r
+import javax.xml.bind.Marshaller;\r
+import javax.xml.bind.Unmarshaller;\r
+import javax.xml.transform.stream.StreamSource;\r
+\r
+import com.sun.xml.bind.api.impl.NameConverter;\r
+import org.apache.commons.io.FileUtils;\r
+\r
+import org.dom4j.Document;\r
+import org.dom4j.DocumentException;\r
+import org.dom4j.DocumentHelper;\r
+import org.dom4j.Element;\r
+import org.dom4j.Namespace;\r
+import org.dom4j.io.SAXReader;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
+// TODO: Auto-generated Javadoc\r
+/**\r
+ * The Class PoxPayload.\r
+ *\r
+ * @param <PT> the generic type\r
+ */\r
+public abstract class PoxPayload<PT extends PayloadPart> {     \r
+       \r
+       /** The Constant logger. */\r
+       protected static final Logger logger = LoggerFactory.getLogger(PayloadPart.class);      \r
+       \r
+       /** The xml text. */\r
+       private String xmlPayload;\r
+       \r
+       private Document domDocument;\r
+       \r
+       /** The payload name. */\r
+       private String payloadName;\r
+       \r
+       // The list of POX parts contained in the xmlText payload\r
+       /** The parts. */\r
+       private List<PT> parts = new ArrayList<PT>();   \r
+       \r
+       /**\r
+        * Instantiates a new pox payload.\r
+        */\r
+       protected PoxPayload() {\r
+               //empty\r
+       }\r
+       \r
+       final protected void setPayloadName(String name) {\r
+               this.payloadName = name;\r
+       }\r
+       \r
+       private void setDomDocument(Document dom) throws DocumentException {\r
+               this.domDocument = dom;\r
+               String label = domDocument.getRootElement().getName();\r
+               if (label != null) {\r
+                       this.payloadName = label;\r
+               } else if (logger.isWarnEnabled() == true) {\r
+                       logger.warn("Incoming message payload is missing a name/label.");\r
+                       logger.warn(this.xmlPayload);\r
+               }\r
+               parseParts();\r
+       }\r
+       \r
+       /**\r
+        * Instantiates a new PoxPayload by parsing the payload into a DOM4j\r
+        * Document instance\r
+        *\r
+        * @param payloadName the payload name\r
+        */\r
+       protected PoxPayload(String xmlPayload) throws DocumentException {\r
+               this.xmlPayload = xmlPayload;\r
+               SAXReader reader = new SAXReader();\r
+               Document dom  = reader.read(new StringReader(xmlPayload));\r
+               setDomDocument(dom);\r
+       }\r
+       \r
+    /**\r
+     * Instantiates a new payload, saves the original xml, creates a DOM and parses it into parts\r
+     *\r
+     * @param file the file\r
+     * @throws DocumentException the document exception\r
+     * @throws IOException Signals that an I/O exception has occurred.\r
+     */\r
+    protected PoxPayload(File file) throws DocumentException, IOException {\r
+       this.xmlPayload = FileUtils.readFileToString(file);\r
+        SAXReader reader = new SAXReader();\r
+        Document dom = reader.read(file);\r
+               setDomDocument(dom);\r
+    }  \r
+       \r
+       /**\r
+        * Creates the part -either an PayloadOutputPart or a PayloadInputPart\r
+        *\r
+        * @param label the part label\r
+        * @param jaxbObject the JAXB object\r
+        * @param element the DOM4j element\r
+        * @return the pT\r
+        */\r
+       abstract protected PT createPart(String label, Object jaxbObject, Element element);\r
+       \r
+       /**\r
+        * Creates the part -either an PayloadOutputPart or a PayloadInputPart\r
+        *\r
+        * @param label the part label\r
+        * @param element the DOM4j element\r
+        * @return the pT\r
+        */\r
+       abstract protected PT createPart(String label, Element element);        \r
+       \r
+       /**\r
+        * Parse the DOM object into schema parts.\r
+        *\r
+        * @throws DocumentException the document exception\r
+        */\r
+       protected void parseParts() throws DocumentException {\r
+               Iterator<Element> it = getDOMDocument().getRootElement().elementIterator();\r
+               PT payloadPart = null;\r
+               while (it.hasNext() == true) {\r
+                       Element element = (Element) it.next();\r
+                       String label = element.getName();\r
+                       Object jaxbObject = PoxPayload.toObject(element);                       \r
+                       if (jaxbObject != null) {\r
+                               payloadPart = createPart(label, jaxbObject, element);\r
+                       } else {\r
+                               payloadPart = createPart(label, element);\r
+                       }\r
+                       if (payloadPart != null) {\r
+                               this.addPart(payloadPart);\r
+                       }\r
+               }\r
+       }\r
+       \r
+       /**\r
+        * Gets the name of the payload.\r
+        *\r
+        * @return the name\r
+        */\r
+       public String getName() {\r
+               return payloadName;\r
+       }\r
+       \r
+       /**\r
+        * Gets the DOM object that we created at init time.  This should never be null;\r
+        *\r
+        * @return the dOM document\r
+        */\r
+       public Document getDOMDocument() {\r
+               return this.domDocument;\r
+       }\r
+               \r
+       /**\r
+        * Gets the xml text.\r
+        *\r
+        * @return the xml text\r
+        */\r
+       public String getXmlPayload() {\r
+               return xmlPayload;\r
+       }\r
+       \r
+       /**\r
+        * Gets the POX part with name match 'label'.\r
+        *\r
+        * @param label the label\r
+        * @return the part\r
+        */\r
+       public PT getPart(String label) {\r
+               PT result = null;\r
+               if (parts != null) {\r
+                       Iterator<PT> it = parts.iterator();\r
+                       while (it.hasNext() == true) {\r
+                               PT part = it.next();\r
+                               if (part.getLabel().equalsIgnoreCase(label) == true) {\r
+                                       result = part;\r
+                                       break;\r
+                               }\r
+                       }\r
+               }\r
+               return result;\r
+       }\r
+       \r
+       /**\r
+        * Gets a list of the POX parts.\r
+        *\r
+        * @return the parts\r
+        */\r
+       public List<PT> getParts() {\r
+               return parts;\r
+       }\r
+               \r
+       /**\r
+        * Adds a POX part to the list of existing parts with the label 'label'.\r
+        *\r
+        * @param label the label\r
+        * @param entity the entity\r
+        * @return the pT\r
+        */\r
+       public PT addPart(String label, PT entity) {\r
+               parts.add(entity);\r
+               return entity;\r
+       }\r
+       \r
+       /**\r
+        * Adds a POX part -assuming the part already has a label name.\r
+        *\r
+        * @param entity the entity\r
+        * @return the pT\r
+        */\r
+       public PT addPart(PT entity) {\r
+               parts.add(entity);\r
+               return entity;\r
+       }       \r
+               \r
+    /**\r
+     * Gets the Java package name from the specified namespace.  This method\r
+     * assumes the Namespace is a xjc (JAXB compiler) generate namespace from\r
+     * which we can extract the Java package name.\r
+     *\r
+     * @param namespace the namespace\r
+     * @return the Java package name\r
+     */\r
+    private static String getPackage(Namespace namespace) {\r
+        NameConverter nc = NameConverter.standard;\r
+               String namespaceURI = namespace.getURI();\r
+        return nc.toPackageName(namespaceURI);\r
+    }\r
+      \r
+    /**\r
+     * Attempts to marshal a DOM4j element into an instance of a JAXB object\r
+     *\r
+     * @param elementInput the element input\r
+     * @return the object\r
+     */\r
+    public static Object toObject(Element elementInput) {\r
+       Object result = null;\r
+       try {\r
+               Namespace namespace = elementInput.getNamespace();              \r
+               String thePackage = getPackage(namespace);\r
+               JAXBContext jc = JAXBContext.newInstance(thePackage);\r
+               Unmarshaller um = jc.createUnmarshaller();\r
+               result = um.unmarshal(\r
+                               new StreamSource(new StringReader(elementInput.asXML())));                              \r
+       } catch (Exception e) {\r
+               if (logger.isTraceEnabled() == true) {\r
+                       logger.trace(e.getMessage());\r
+               }\r
+       }\r
+       \r
+       return result;\r
+    }\r
+       \r
+    /**\r
+     * Attempts to unmarshal a JAXB object to a DOM4j element.\r
+     *\r
+     * @param jaxbObject the jaxb object\r
+     * @return the element\r
+     */\r
+    public static Element toElement(Object jaxbObject) {\r
+       Element result = null;\r
+       String text = null;\r
+       ByteArrayOutputStream outputStream = new ByteArrayOutputStream();\r
+       try {\r
+               String thePackage = jaxbObject.getClass().getPackage().getName();\r
+               JAXBContext jc = JAXBContext.newInstance(thePackage);\r
+               //Create marshaller\r
+               Marshaller m = jc.createMarshaller();\r
+               m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, false);\r
+               //Marshal object into file.\r
+               m.marshal(jaxbObject, outputStream);\r
+               text = outputStream.toString("UTF8");\r
+\r
+               Document doc = DocumentHelper.parseText(text);\r
+               result = doc.getRootElement(); //FIXME: REM - call .detach() to free the element\r
+       } catch (Exception e) {\r
+               e.printStackTrace(); //FIXME: REM - Please use proper logger.isWarning() statement\r
+       }\r
+       \r
+       return result;\r
+    }\r
+    \r
+    /**\r
+     * Attempts to unmarshal a JAXB object to a DOM4j element.\r
+     *\r
+     * @param jaxbObject the jaxb object\r
+     * @return the element\r
+     */\r
+    public static Element toElement(String xmlPayload) throws DocumentException {\r
+       Element result = null;\r
+               Document doc = DocumentHelper.parseText(xmlPayload);\r
+               result = doc.getRootElement(); //FIXME: REM - .detach();\r
+       return result;\r
+    }  \r
+    \r
+       \r
+}\r
diff --git a/services/client/src/main/java/org/collectionspace/services/client/PoxPayloadIn.java b/services/client/src/main/java/org/collectionspace/services/client/PoxPayloadIn.java
new file mode 100644 (file)
index 0000000..585a0f3
--- /dev/null
@@ -0,0 +1,51 @@
+package org.collectionspace.services.client;\r
+\r
+//import java.io.ByteArrayInputStream; //FIXME: REM - Remove these unneeded import statements\r
+//import java.io.InputStream;\r
+//import java.io.Reader;\r
+//import java.io.StringReader;\r
+//import java.util.Iterator;\r
+//import java.util.List;\r
+\r
+//import javax.xml.transform.Source;\r
+//import javax.xml.transform.stream.StreamSource;\r
+\r
+//import org.dom4j.Attribute;\r
+//import org.dom4j.Document;\r
+import org.dom4j.DocumentException;\r
+import org.dom4j.Element;\r
+//import org.dom4j.Namespace;\r
+//import org.dom4j.io.SAXReader;\r
+//import org.xml.sax.InputSource;\r
+\r
+public class PoxPayloadIn extends PoxPayload<PayloadInputPart> {\r
+\r
+       /*\r
+        * Parse the POX 'xmlPayload' into individual parts.  Each part is saved\r
+        * as a DOM4j Element and, if possible, a JAXB object instance as well.\r
+        */\r
+       public PoxPayloadIn(String xmlPayload) throws DocumentException {\r
+               super(xmlPayload);\r
+       }\r
+       \r
+       /* (non-Javadoc)\r
+        * @see org.collectionspace.services.client.PoxPayload#createPart(java.lang.String, java.lang.Object, org.dom4j.Element)\r
+        * \r
+        * We need this method because the generic base class has no way of calling our constructor.\r
+        */\r
+       @Override\r
+       protected PayloadInputPart createPart(String label, Object jaxbObject, Element element) {\r
+               return new PayloadInputPart(label, jaxbObject, element);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.collectionspace.services.client.PoxPayload#createPart(java.lang.String, org.dom4j.Element)\r
+        * \r
+        * We need this method because the generic base class has no way of calling our constructor.\r
+        */\r
+       @Override\r
+       protected PayloadInputPart createPart(String label, Element element) {\r
+               return new PayloadInputPart(label, element);\r
+       }\r
+       \r
+}\r
diff --git a/services/client/src/main/java/org/collectionspace/services/client/PoxPayloadOut.java b/services/client/src/main/java/org/collectionspace/services/client/PoxPayloadOut.java
new file mode 100644 (file)
index 0000000..3bae323
--- /dev/null
@@ -0,0 +1,174 @@
+package org.collectionspace.services.client;\r
+\r
+import javax.ws.rs.core.MediaType;\r
+\r
+import org.dom4j.Document;\r
+import org.dom4j.DocumentException;\r
+import org.dom4j.DocumentHelper;\r
+import org.dom4j.Element;\r
+import org.dom4j.io.SAXReader;\r
+\r
+import java.io.File;\r
+import java.io.IOException;\r
+import java.io.UnsupportedEncodingException;\r
+import java.util.Iterator;\r
+\r
+// TODO: Auto-generated Javadoc\r
+/**\r
+ * The Class PoxPayloadOut.\r
+ */\r
+public class PoxPayloadOut extends PoxPayload<PayloadOutputPart> {\r
+                       \r
+       /**\r
+        * Instantiates a new pox payload out.\r
+        *\r
+        * @param payloadName the payload name\r
+        * @throws DocumentException the document exception\r
+        */\r
+       public PoxPayloadOut(String payloadName) {\r
+               super();\r
+               setPayloadName(payloadName);\r
+       }\r
+               \r
+       public PoxPayloadOut(byte[] xmlPayload) throws DocumentException {\r
+               super(new String(xmlPayload));\r
+       }\r
+       \r
+       /**\r
+        * Instantiates a new PoxPayloadOut, saves the xml, creates a DOM, and parses the parts.\r
+        *\r
+        * @param file the file\r
+        * @throws DocumentException the document exception\r
+        * @throws IOException Signals that an I/O exception has occurred.\r
+        */\r
+       protected PoxPayloadOut(File file) throws DocumentException, IOException {\r
+               super(file);            \r
+       }\r
+               \r
+       /* (non-Javadoc)\r
+        * @see org.collectionspace.services.client.PoxPayload#createPart(java.lang.String, java.lang.Object, org.dom4j.Element)\r
+        * \r
+        * We need this method because the generic base class has no way of calling our constructor.\r
+        */\r
+       @Override\r
+       protected PayloadOutputPart createPart(String label, Object jaxbObject, Element element) {\r
+               return new PayloadOutputPart(label, jaxbObject, element);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.collectionspace.services.client.PoxPayload#createPart(java.lang.String, org.dom4j.Element)\r
+        * \r
+        * We need this method because the generic base class has no way of calling our constructor.\r
+        */\r
+       @Override\r
+       protected PayloadOutputPart createPart(String label, Element element) {\r
+               return new PayloadOutputPart(label, element);\r
+       }\r
+       \r
+       /**\r
+        * Creates and returns an XML string representation of ourself.\r
+        *\r
+        * @return the string\r
+        */\r
+       public String toXML() {\r
+               String result = null;\r
+        Document document = DocumentHelper.createDocument();\r
+        document.setXMLEncoding("UTF-8");\r
+        document.setName(getName());\r
+        Element root = document.addElement( "document" );\r
+        root.addAttribute("name", getName());        \r
+               \r
+               Iterator<PayloadOutputPart> it = getParts().iterator();\r
+               while (it.hasNext() == true) {\r
+                       PayloadOutputPart outPart = it.next();\r
+                       Element element = outPart.asElement();                  \r
+                       if (element != null) {\r
+                               root.add(element.detach());\r
+                       } else {\r
+                               //Add if (logger.isTraceEnabled() == true) logger.trace("Output part: " + outPart.getLabel() + " was empty.");\r
+                       }\r
+               }\r
+               result = document.asXML();\r
+               return result;\r
+       }\r
+               \r
+       /**\r
+        * Adds the part.\r
+        *\r
+        * @param entity the entity\r
+        * @param mediaType the media type\r
+        * @return the payload output part\r
+        */\r
+       @Deprecated\r
+       public PayloadOutputPart addPart(Object entity, MediaType mediaType) {\r
+               PayloadOutputPart result = addPart("unlabelled", entity);\r
+               return result;\r
+       }\r
+       \r
+       @Deprecated\r
+       public PayloadOutputPart addPart(String xmlPayload, MediaType mediaType) throws DocumentException {\r
+               PayloadOutputPart result = addPart("unlabelled", xmlPayload);\r
+               return result;\r
+       }\r
+       \r
+       \r
+       /**\r
+        * Adds a DOM4j Element part.\r
+        *\r
+        * @param label the label\r
+        * @param elementBody the element body\r
+        * @return the payload output part\r
+        */\r
+       public PayloadOutputPart addPart(String label, Element elementBody) { \r
+               PayloadOutputPart result = new PayloadOutputPart(label, elementBody);\r
+               getParts().add(result);\r
+               return result;\r
+       }\r
+       \r
+       /**\r
+        * Adds a DOM4j Element part.\r
+        *\r
+        * @param label the label\r
+        * @param elementBody the element body\r
+        * @return the payload output part\r
+        */\r
+       public PayloadOutputPart addPart(String label, String xmlBody) throws DocumentException { \r
+               PayloadOutputPart result = new PayloadOutputPart(label, xmlBody);\r
+               getParts().add(result);\r
+               return result;\r
+       }\r
+       \r
+       \r
+       /**\r
+        * Adds a JAXB object part.\r
+        *\r
+        * @param label the label\r
+        * @param entity the entity\r
+        * @return the payload output part\r
+        */\r
+       public PayloadOutputPart addPart(String label, Object entity) {\r
+               PayloadOutputPart result = new PayloadOutputPart(label, entity);\r
+               getParts().add(result);\r
+               return result;\r
+       }       \r
+       \r
+       /* (non-Javadoc)\r
+        * @see java.lang.Object#toString()\r
+        * This method calls our "toXML()" method to return an XML representation of ourself.\r
+        */\r
+       @Override\r
+       public String toString() {\r
+               return toXML();\r
+       }\r
+       \r
+       public byte[] getBytes() {\r
+               byte[] result = null;\r
+               try {\r
+                       result = toString().getBytes("UTF8");\r
+               } catch (UnsupportedEncodingException e) {\r
+                       // TODO Auto-generated catch block\r
+                       e.printStackTrace(); //FIXME: REM - Add proper logging statement here\r
+               }\r
+               return result;\r
+       }\r
+}\r
index faf5fdc16efd3266e5dcc5389afa5a1c71a186fb..a65ab0004789124c73f9396e4ed7162ee655a0a6 100644 (file)
@@ -57,5 +57,10 @@ public class TestServiceClient extends AbstractServiceClientImpl {
 
     public ClientResponse<Response> delete(String csid) {
        throw new UnsupportedOperationException();
+    }
+
+       @Override
+       public String getServiceName() {
+               throw new UnsupportedOperationException();
     } 
 }
index 007a19005849f28daa679ff77f783a46910b8a58..cea08b4c7e8ecdc80754f2a2119b018af930abfd 100644 (file)
@@ -546,6 +546,16 @@ public abstract class AbstractServiceTestImpl extends BaseServiceTest implements
         }
     }
 
+//     @Override
+//     protected CollectionSpaceClient getClientInstance() {
+//             throw new UnsupportedOperationException(); //FIXME: REM - See http://issues.collectionspace.org/browse/CSPACE-3498
+//     }
+//     
+//     @Override
+//     protected String getServiceName() {
+//             throw new UnsupportedOperationException(); //FIXME: REM - See http://issues.collectionspace.org/browse/CSPACE-3498
+//     }
+
 }
 
 
index 80b4495b241696612e68ac1efa05b93689cb7727..b32d6ee59c2d6a38280942d48f7128846f221c8f 100644 (file)
@@ -46,10 +46,7 @@ import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PutMethod;\r
 import org.apache.commons.httpclient.methods.StringRequestEntity;\r
 import org.apache.commons.io.FileUtils;\r
-import org.collectionspace.services.client.TestServiceClient;\r
 import org.jboss.resteasy.client.ClientResponse;\r
-import org.jboss.resteasy.plugins.providers.multipart.InputPart;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.testng.Assert;\r
@@ -57,6 +54,10 @@ import org.testng.annotations.DataProvider;
 import org.w3c.dom.Document;\r
 \r
 import org.collectionspace.services.client.CollectionSpaceClient;\r
+import org.collectionspace.services.client.PayloadInputPart;\r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.TestServiceClient;\r
+\r
 import org.collectionspace.services.jaxb.AbstractCommonList;\r
 \r
 /**\r
@@ -101,6 +102,20 @@ public abstract class BaseServiceTest {
         "\n" + BANNER_SEPARATOR_LINE + "\n";\r
     private static final String BANNER_SUFFIX =\r
         "\n" + BANNER_SEPARATOR_LINE;\r
+\r
+    // A Unicode UTF-8 data fragment for use in test payloads: a random sequence,\r
+    // unlikely to be encountered in actual collections data, and capable of\r
+    // being rendered by the default fonts in many modern operating systems.\r
+    //\r
+    // This fragment consists of a run of USASCII characters, followed by\r
+    // four non-USASCII range Unicode UTF-8 characters:\r
+    //\r
+    // Î” : Greek capital letter Delta (U+0394)\r
+    // Ð– : Cyrillic capital letter Zhe with breve (U+04C1)\r
+    // Å´ : Latin capital letter W with circumflex (U+0174)\r
+    // Î© : Greek capital letter Omega (U+03A9)\r
+    private final static String UTF8_DATA_FRAGMENT = "utf-8-data-fragment:"\r
+            + '\u0394' + '\u04C1' + '\u0174' +'\u03A9';\r
     \r
     protected static final int STATUS_BAD_REQUEST =\r
         Response.Status.BAD_REQUEST.getStatusCode();\r
@@ -161,6 +176,8 @@ public abstract class BaseServiceTest {
      * @return The URL path component of the service.\r
      */\r
     protected abstract String getServicePathComponent();\r
+    \r
+    protected abstract String getServiceName();\r
 \r
     /**\r
      * Reinitializes setup values, to help expose any unintended reuse\r
@@ -172,8 +189,7 @@ public abstract class BaseServiceTest {
     }\r
 \r
     /**\r
-     * Initializes setup values for a given test.  Returns a banner\r
-     * identifying the test being run, using the local logger for this class.\r
+     * Initializes setup values for a given test.\r
      *\r
      * @param expectedStatusCode  A status code expected to be returned in the response.\r
      *\r
@@ -214,7 +230,7 @@ public abstract class BaseServiceTest {
      * @return The root URL for a service.\r
      */\r
     protected String getServiceRootURL() {\r
-        return serviceClient.getBaseURL() + getServicePathComponent();\r
+        return serviceClient.getBaseURL() + getServiceName(); //FIXME: REM - This should probably be calling getServicePathComponent() and not getServiceName();\r
     }\r
 \r
     public String getServiceClientTenantID() {\r
@@ -359,59 +375,18 @@ public abstract class BaseServiceTest {
      * @return the object\r
      * @throws Exception the exception\r
      */\r
-    static protected Object extractPart(MultipartInput input, String label, Class<?> clazz)\r
+    static protected Object extractPart(PoxPayloadIn input, String label, Class<?> clazz)\r
             throws Exception {\r
-        Object obj = null;\r
-        String partLabel = "";\r
-        List<InputPart> parts = input.getParts();\r
-        if (parts.size() == 0) {\r
-            logger.warn("No parts found in multipart body.");\r
-        }\r
-        if (logger.isDebugEnabled()) {\r
-            logger.debug("Parts:");\r
-            for (InputPart part : parts) {\r
-                partLabel = part.getHeaders().getFirst("label");\r
-                logger.debug("part = " + partLabel);\r
-            }\r
+       Object result = null;\r
+       PayloadInputPart payloadInputPart = input.getPart(label);\r
+        if (payloadInputPart != null) {\r
+               result = payloadInputPart.getBody();\r
+        } else if (logger.isWarnEnabled() == true) {\r
+               logger.warn("Payload part: " + label +\r
+                               " is missing from payload: " + input.getName());\r
         }\r
-        boolean partLabelMatched = false;\r
-        for (InputPart part : parts) {\r
-            partLabel = part.getHeaders().getFirst("label");\r
-            if (label.equalsIgnoreCase(partLabel)) {\r
-                partLabelMatched = true;\r
-                if (logger.isDebugEnabled()) {\r
-                    logger.debug("found part" + partLabel);\r
-                }\r
-                String partStr = part.getBodyAsString();\r
-                if (partStr == null || partStr.trim().isEmpty()) {\r
-                    logger.warn("Part '" + label + "' in multipart body is empty.");\r
-                } else {\r
-                    if (logger.isDebugEnabled()) {\r
-                        logger.debug("extracted part as str=\n" + partStr);\r
-                    }\r
-                    try {\r
-                        obj = part.getBody(clazz, null);\r
-                        if (logger.isDebugEnabled()) {\r
-                            logger.debug("extracted part as obj="+objectAsXmlString(obj, clazz));\r
-                        }\r
-                    } catch (Throwable t) {\r
-                        logger.error("Could not get part body based on content and classname. "+ clazz.getName()+ " error: "+t);\r
-                    }\r
-                }\r
-                break;\r
+        return result;\r
             }\r
-        }\r
-        if (!partLabelMatched) {\r
-            logger.warn("Could not find part '" + label + "' in multipart body.");\r
-            // In the event that getBodyAsString() or getBody(), above, do *not*\r
-            // throw an IOException, but getBody() nonetheless retrieves a null object.\r
-            // This *may* be unreachable.\r
-        } else if (obj == null) {\r
-            logger.warn("Could not extract part '" + label\r
-                    + "' in multipart body as an object.");\r
-        }\r
-        return obj;\r
-    }\r
 \r
     /**\r
      * Gets the part object.\r
@@ -421,6 +396,7 @@ public abstract class BaseServiceTest {
      * @return the part object\r
      * @throws JAXBException the jAXB exception\r
      */\r
+    @Deprecated\r
     static protected Object getPartObject(String partStr, Class<?> clazz)\r
             throws JAXBException {\r
         JAXBContext jc = JAXBContext.newInstance(clazz);\r
@@ -509,8 +485,8 @@ public abstract class BaseServiceTest {
      * @throws Exception the exception\r
      */\r
     static protected String getXmlDocumentAsString(String fileName) throws Exception {\r
-        byte[] b = FileUtils.readFileToByteArray(new File(fileName));\r
-        return new String(b);\r
+        String result = FileUtils.readFileToString(new File(fileName), "UTF8");\r
+        return result;\r
     }\r
 \r
     /**\r
@@ -611,5 +587,8 @@ public abstract class BaseServiceTest {
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);\r
     }\r
 \r
+    public static String getUTF8DataFragment() {\r
+        return UTF8_DATA_FRAGMENT;\r
+    }\r
 \r
 }\r
index c9fc5a5af4124d7db01212698b29678a48e983c0..46ae1135b867e4ac13ce9570686ae424d218cf9e 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry including="**/*.java" kind="src" output="target/classes" path="target/generated-sources/xjc"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="target/generated-sources/xjc"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/security/jacc/1.0/jacc-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.2_01/jai_core-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/javax/script/script-api/1.0/script-api-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar" sourcepath="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/EditableImage/0.9.5/EditableImage-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4.jar" sourcepath="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/imagej/imagej/1.4.1.e/imagej-1.4.1.e.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/JAI-Adapter/0.9.5/JAI-Adapter-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/jai_codec/1.1.2_01/jai_codec-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/cup/java-cup/0.11a/java-cup-0.11a.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/1.2.1.GA/jaxrs-api-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.0.4.GA/jboss-common-4.0.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.2.SP8/jboss-remoting-2.2.2.SP8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.3.GA/jbosssx-4.2.3.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" sourcepath="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1H.7/jetty-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1H.7/jetty-util-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/metadata-extractor/2.3.1/metadata-extractor-2.3.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/mlib_jai/1.1.2_01/mlib_jai-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.5/mysql-connector-java-5.1.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/common/nuxeo-common/1.6.2/nuxeo-common-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core/1.6.2/nuxeo-core-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-api/1.6.2/nuxeo-core-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-client/1.6.2/nuxeo-core-client-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-convert-api/1.6.2/nuxeo-core-convert-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-event/1.6.2/nuxeo-core-event-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-facade/1.6.2/nuxeo-core-facade-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-io/1.6.2/nuxeo-core-io-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-query/1.6.2/nuxeo-core-query-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-schema/1.6.2/nuxeo-core-schema-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-storage-sql/1.6.2/nuxeo-core-storage-sql-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-commandline-executor/5.3.2/nuxeo-platform-commandline-executor-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-api/5.3.2/nuxeo-platform-filemanager-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-core/5.3.2/nuxeo-platform-filemanager-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-forms-layout-api/5.3.2/nuxeo-platform-forms-layout-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-api/5.3.2/nuxeo-platform-imaging-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-core/5.3.2/nuxeo-platform-imaging-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-mimetype-api/5.3.2/nuxeo-platform-mimetype-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-search-api/5.3.2/nuxeo-platform-search-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-types-api/5.3.2/nuxeo-platform-types-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-versioning-api/5.3.2/nuxeo-platform-versioning-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime/1.6.2/nuxeo-runtime-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-management/1.6.2/nuxeo-runtime-management-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-osgi/1.6.2/nuxeo-runtime-osgi-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/Operations/0.9.5/Operations-0.9.5.jar"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.authentication.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.authentication.service"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.authorization.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.authorization.service"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/restlet/org.restlet/1.0.7/org.restlet-1.0.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/relaxngDatatype/1.0/relaxngDatatype-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/1.2.1.GA/resteasy-jaxb-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-multipart-provider/1.2.1.GA/resteasy-multipart-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1H.7/servlet-api-2.5-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/xsom/20060306/xsom-20060306.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index 53ae6fb19c273fc156cb598edb5d5959431276a4..dbbed086a4cf6c0d451d41d9c590ab3677b83dbd 100644 (file)
@@ -1,23 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.collectionspace.services.common</name>\r
-       <comment></comment>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
        <projects>\r
+    <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>\r
+    <project>org.collectionspace.services.authentication.jaxb</project>\r
+    <project>org.collectionspace.services.authentication.service</project>\r
+    <project>org.collectionspace.services.authorization.jaxb</project>\r
+    <project>org.collectionspace.services.authorization.service</project>\r
+    <project>org.collectionspace.services.client</project>\r
+    <project>org.collectionspace.services.hyperjaxb</project>\r
+    <project>org.collectionspace.services.jaxb</project>\r
        </projects>\r
        <buildSpec>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
        </natures>\r
-</projectDescription>\r
+</projectDescription>
\ No newline at end of file
index 578bdf135a672dff5117d8e8d69931ac1ee04e4d..2a7cb62bf6d0353d882cf07115b2d14c86adf412 100644 (file)
@@ -1,9 +1,9 @@
-#Fri Dec 03 15:42:16 PST 2010\r
+#Wed Jan 19 22:49:24 PST 2011\r
 activeProfiles=\r
 eclipse.preferences.version=1\r
 fullBuildGoals=process-test-resources\r
 includeModules=false\r
 resolveWorkspaceProjects=true\r
 resourceFilterGoals=process-resources resources\:testResources\r
-skipCompilerPlugin=false\r
+skipCompilerPlugin=true\r
 version=1\r
index 1188517422352d3ee4fea31e365ea969e1ee987e..f9661ec5a82ebc429a75eb8e35e49a49dd54c4c1 100644 (file)
         </dependency>\r
 \r
         <!--fixme where is jaxen needed? -->\r
-        <dependency>\r
+<!--        <dependency>\r
             <groupId>jaxen</groupId>\r
             <artifactId>jaxen</artifactId>\r
             <version>1.1.1</version>\r
-        </dependency>\r
+        </dependency> -->\r
                <dependency>\r
                    <groupId>commons-fileupload</groupId>\r
                    <artifactId>commons-fileupload</artifactId>\r
index 4e5b1d4f28270a735e5ca76b1e1161b8c0dd926c..a557ba7578931cadd4d29e5388687295d5cd18ec 100644 (file)
@@ -26,6 +26,9 @@
  */\r
 package org.collectionspace.services.common;\r
 \r
+import org.collectionspace.services.client.PayloadInputPart;\r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.common.context.MultipartServiceContext;\r
 import org.collectionspace.services.common.context.MultipartServiceContextFactory;\r
 import org.collectionspace.services.common.context.ServiceContext;\r
@@ -41,18 +44,18 @@ import org.slf4j.LoggerFactory;
  * The Class AbstractMultiPartCollectionSpaceResourceImpl.\r
  */\r
 public abstract class AbstractMultiPartCollectionSpaceResourceImpl extends\r
-               AbstractCollectionSpaceResourceImpl<MultipartInput, MultipartOutput> {\r
+               AbstractCollectionSpaceResourceImpl<PoxPayloadIn, PoxPayloadOut> {\r
 \r
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());\r
 \r
     @Override\r
-    public ServiceContextFactory<MultipartInput, MultipartOutput> getServiceContextFactory() {\r
+    public ServiceContextFactory<PoxPayloadIn, PoxPayloadOut> getServiceContextFactory() {\r
        return MultipartServiceContextFactory.get();\r
     }\r
 \r
     @Override\r
-    public DocumentHandler createDocumentHandler(ServiceContext<MultipartInput, MultipartOutput> ctx) throws Exception {\r
-       return createDocumentHandler(ctx, ctx.getCommonPartLabel(),getCommonPartClass());\r
+    public DocumentHandler createDocumentHandler(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx) throws Exception {\r
+       return createDocumentHandler(ctx, ctx.getCommonPartLabel(), getCommonPartClass());\r
     }\r
     \r
     /**\r
@@ -66,15 +69,19 @@ public abstract class AbstractMultiPartCollectionSpaceResourceImpl extends
      * \r
      * @throws Exception the exception\r
      */\r
-    public DocumentHandler createDocumentHandler(ServiceContext<MultipartInput, MultipartOutput> serviceContext,\r
+    public DocumentHandler createDocumentHandler(ServiceContext<PoxPayloadIn, PoxPayloadOut> serviceContext,\r
                String schemaName, \r
                Class<?> commonClass) throws Exception {\r
+       DocumentHandler result = null;\r
+       \r
        MultipartServiceContext ctx = (MultipartServiceContext)serviceContext;\r
        Object commonPart = null;\r
        if (ctx.getInput() != null) {\r
-               commonPart = ctx.getInputPart(schemaName, commonClass);\r
+               commonPart = ctx.getInputPart(schemaName);\r
         }\r
-        return super.createDocumentHandler(ctx, commonPart);\r
+        result = super.createDocumentHandler(ctx, commonPart);\r
+        \r
+        return result;\r
     }\r
     \r
     /**\r
@@ -88,7 +95,7 @@ public abstract class AbstractMultiPartCollectionSpaceResourceImpl extends
      * @throws Exception the exception\r
      */\r
     public DocumentHandler createDocumentHandler(\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx,\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
                Class<Object> commonClass) throws Exception {\r
        return createDocumentHandler(ctx, ctx.getCommonPartLabel(), commonClass);\r
     }\r
index 923a51b312f3e919af94a0d4a54adb2810c349da..ab0f3ff6550357e68cdccd4f66b16e3d39c72e3a 100644 (file)
@@ -1,5 +1,7 @@
 package org.collectionspace.services.common;\r
 \r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.common.authorityref.AuthorityRefList;\r
 import org.collectionspace.services.common.context.MultipartServiceContextImpl;\r
 import org.collectionspace.services.common.context.ServiceBindingUtils;\r
@@ -90,16 +92,17 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
     //======================= CREATE ====================================================\r
 \r
     @POST\r
-    public Response create(MultipartInput input) {\r
+    public Response create(String xmlPayload) {\r
         try {\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(input);\r
+               PoxPayloadIn input = new PoxPayloadIn(xmlPayload);\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(input);\r
             return create(input, ctx);\r
         } catch (Exception e) {\r
             throw bigReThrow(e, ServiceMessages.CREATE_FAILED);\r
         }\r
     }\r
     \r
-    protected Response create(MultipartInput input, ServiceContext<MultipartInput, MultipartOutput> ctx) {\r
+    protected Response create(PoxPayloadIn input, ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx) {\r
         try {\r
             DocumentHandler handler = createDocumentHandler(ctx);\r
             UriBuilder path = UriBuilder.fromResource(this.getClass());\r
@@ -110,8 +113,8 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
     }\r
 \r
     /** Subclasses may override this overload, which gets called from @see #create(MultipartInput)   */\r
-    protected Response create(MultipartInput input,\r
-                              ServiceContext<MultipartInput, MultipartOutput> ctx,\r
+    protected Response create(PoxPayloadIn input,\r
+                              ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
                               DocumentHandler handler,\r
                               UriBuilder path)\r
     throws Exception {\r
@@ -125,34 +128,37 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
 \r
     @PUT\r
     @Path("{csid}")\r
-    public MultipartOutput update(@PathParam("csid") String csid, MultipartInput theUpdate) {\r
+    public byte[] update(@PathParam("csid") String csid, String xmlPayload) {\r
+        PoxPayloadOut result = null;\r
         ensureCSID(csid, UPDATE);\r
         try {\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(theUpdate);\r
-            return update(csid, theUpdate, ctx); //==> CALL implementation method, which subclasses may override.\r
+               PoxPayloadIn theUpdate = new PoxPayloadIn(xmlPayload);\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(theUpdate);\r
+            result = update(csid, theUpdate, ctx); //==> CALL implementation method, which subclasses may override.\r
         } catch (Exception e) {\r
             throw bigReThrow(e, ServiceMessages.UPDATE_FAILED, csid);\r
         }\r
+        return result.getBytes();\r
     }\r
 \r
     /** Subclasses may override this overload, which gets called from #udpate(String,MultipartInput)   */\r
-    protected MultipartOutput update(String csid,\r
-                                     MultipartInput theUpdate,\r
-                                     ServiceContext<MultipartInput, MultipartOutput> ctx)\r
+    protected PoxPayloadOut update(String csid,\r
+               PoxPayloadIn theUpdate,\r
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx)\r
     throws Exception {\r
         DocumentHandler handler = createDocumentHandler(ctx);\r
         getRepositoryClient(ctx).update(ctx, csid, handler);\r
-        return (MultipartOutput) ctx.getOutput();\r
+        return ctx.getOutput();\r
     }\r
 \r
     /** Subclasses may override this overload, which gets called from #udpate(String,MultipartInput)   */\r
-    protected MultipartOutput update(String csid,\r
+    protected PoxPayloadOut update(String csid,\r
                                      MultipartInput theUpdate,\r
-                                     ServiceContext<MultipartInput, MultipartOutput> ctx,\r
+                                     ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
                                      DocumentHandler handler)\r
     throws Exception {\r
         getRepositoryClient(ctx).update(ctx, csid, handler);\r
-        return (MultipartOutput) ctx.getOutput();\r
+        return ctx.getOutput();\r
     }\r
 \r
     //======================= DELETE ====================================================\r
@@ -162,7 +168,7 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
     public Response delete(@PathParam("csid") String csid) {\r
         ensureCSID(csid, DELETE);\r
         try {\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();\r
             return delete(csid, ctx);  //==> CALL implementation method, which subclasses may override.\r
         } catch (Exception e) {\r
             throw bigReThrow(e, ServiceMessages.DELETE_FAILED, csid);\r
@@ -171,7 +177,7 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
 \r
     /** subclasses may override this method, which is called from #delete(String)\r
      *  which handles setup of ServiceContext, and does Exception handling.  */\r
-    protected Response delete(String csid, ServiceContext<MultipartInput, MultipartOutput> ctx)\r
+    protected Response delete(String csid, ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx)\r
     throws Exception {\r
         getRepositoryClient(ctx).delete(ctx, csid);\r
         return Response.status(HttpResponseCodes.SC_OK).build();   \r
@@ -182,25 +188,27 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
 \r
     @GET\r
     @Path("{csid}")\r
-    public MultipartOutput get(@PathParam("csid") String csid) {\r
+    public byte[] get(@PathParam("csid") String csid) {\r
+       PoxPayloadOut result = null;\r
         ensureCSID(csid, READ);\r
         try {\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();\r
-            MultipartOutput result = get(csid, ctx);// ==> CALL implementation method, which subclasses may override.\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();\r
+               result = get(csid, ctx);// ==> CALL implementation method, which subclasses may override.\r
             if (result == null) {\r
                 Response response = Response.status(Response.Status.NOT_FOUND).entity(\r
                     ServiceMessages.READ_FAILED + ServiceMessages.resourceNotFoundMsg(csid)).type("text/plain").build();\r
                 throw new WebApplicationException(response);\r
             }\r
-            return result;\r
         } catch (Exception e) {\r
             throw bigReThrow(e, ServiceMessages.READ_FAILED, csid);\r
         }\r
+        \r
+        return result.getBytes();\r
     }\r
     \r
-    protected MultipartOutput get(@PathParam("csid") String csid,\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx) throws Exception {\r
-       MultipartOutput result = null;\r
+    protected PoxPayloadOut get(@PathParam("csid") String csid,\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx) throws Exception {\r
+       PoxPayloadOut result = null;\r
        \r
        ensureCSID(csid, READ);\r
         DocumentHandler handler = createDocumentHandler(ctx);\r
@@ -219,18 +227,17 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
 \r
     /** subclasses may override this method, which is called from #get(String)\r
      *  which handles setup of ServiceContext and DocumentHandler, and Exception handling.*/\r
-    protected MultipartOutput get(String csid,\r
-                               ServiceContext<MultipartInput, MultipartOutput> ctx,\r
+    protected PoxPayloadOut get(String csid,\r
+                               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
                                DocumentHandler handler)\r
     throws Exception {\r
         getRepositoryClient(ctx).get(ctx, csid, handler);\r
-        return (MultipartOutput) ctx.getOutput();\r
+        return ctx.getOutput();\r
     }\r
 \r
     //======================= GET without csid. List, search, etc. =====================================\r
 \r
        @GET\r
-       @Produces("application/xml")\r
        public AbstractCommonList getList(@Context UriInfo ui,\r
                        @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords) {\r
                MultivaluedMap<String, String> queryParams = ui.getQueryParameters();\r
@@ -243,7 +250,7 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
 \r
     protected AbstractCommonList getList(MultivaluedMap<String, String> queryParams) {\r
         try {\r
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(queryParams);\r
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);\r
             DocumentHandler handler = createDocumentHandler(ctx);\r
             getRepositoryClient(ctx).getFiltered(ctx, handler);\r
             return (AbstractCommonList)handler.getCommonPartList();\r
@@ -254,7 +261,7 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
 \r
     protected AbstractCommonList search(MultivaluedMap<String, String> queryParams, String keywords) {\r
         try {\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(queryParams);\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);\r
             DocumentHandler handler = createDocumentHandler(ctx);\r
             // perform a keyword search\r
             if (keywords != null && !keywords.isEmpty()) {\r
@@ -276,7 +283,7 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
     @Deprecated\r
     public AbstractCommonList getList(List<String> csidList) {\r
         try {\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();\r
             DocumentHandler handler = createDocumentHandler(ctx);\r
             getRepositoryClient(ctx).get(ctx, csidList, handler);\r
             return (AbstractCommonList)handler.getCommonPartList();\r
@@ -296,9 +303,9 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
        AuthorityRefList authRefList = null;\r
         try {\r
                MultivaluedMap<String, String> queryParams = ui.getQueryParameters();\r
-               ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(queryParams);\r
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);\r
             DocumentWrapper<DocumentModel> docWrapper = getRepositoryClient(ctx).getDoc(ctx, csid);\r
-            DocumentModelHandler<MultipartInput, MultipartOutput> handler = (DocumentModelHandler<MultipartInput, MultipartOutput>)createDocumentHandler(ctx);\r
+            DocumentModelHandler<PoxPayloadIn, PoxPayloadOut> handler = (DocumentModelHandler<PoxPayloadIn, PoxPayloadOut>)createDocumentHandler(ctx);\r
             List<String> authRefFields =\r
                    ((MultipartServiceContextImpl) ctx).getCommonPartPropertyValues(\r
                                ServiceBindingUtils.AUTH_REF_PROP, ServiceBindingUtils.QUALIFIED_PROP_NAMES);\r
index 3c04bc0d84284d3e6af4b8b19284efb3f1a63f73..57c67baa0f1ae718829e6b3e095a3cb24a955469 100644 (file)
@@ -1,5 +1,7 @@
 package org.collectionspace.services.common.blob;\r
 \r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.common.context.ServiceContext;\r
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;\r
@@ -11,7 +13,7 @@ public class BlobUtil {
        public static String BLOB_RESOURCE_NAME = "blobs";\r
        private static final Logger logger = LoggerFactory.getLogger(BlobUtil.class);\r
        \r
-    public static BlobInput getBlobInput(ServiceContext<MultipartInput, MultipartOutput> ctx) {\r
+    public static BlobInput getBlobInput(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx) {\r
        BlobInput result = (BlobInput)ctx.getProperty(BlobInput.class.getName());\r
        if (result == null) {\r
                result = new BlobInput();\r
@@ -20,13 +22,13 @@ public class BlobUtil {
        return result;\r
        }\r
     \r
-    public static BlobInput resetBlobInput(ServiceContext<MultipartInput, MultipartOutput> ctx) {\r
+    public static BlobInput resetBlobInput(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx) {\r
        BlobInput blobInput = new BlobInput();\r
        setBlobInput(ctx, blobInput);\r
        return blobInput;\r
     }\r
     \r
-    public static void setBlobInput(ServiceContext<MultipartInput, MultipartOutput> ctx,\r
+    public static void setBlobInput(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
                BlobInput blobInput) {\r
        ctx.setProperty(BlobInput.class.getName(), blobInput);                  \r
        }       \r
index 7063485a1a52a87fb282a74686bc2b25c181c78a..3c6fe48b3596b481f1f6a94e58cc9d3094764e33 100644 (file)
@@ -25,23 +25,27 @@ package org.collectionspace.services.common.context;
 
 import java.io.IOException;
 import java.io.InputStream;
+
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
+import org.dom4j.Element;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
-import org.w3c.dom.Document;
+import org.dom4j.Document;
 
 /**
  * RemoteServiceContext is used to encapsulate the service context of a
  * remotely invokable service
  */
 public interface MultipartServiceContext
-        extends RemoteServiceContext<MultipartInput, MultipartOutput> {
+        extends RemoteServiceContext<PoxPayloadIn, PoxPayloadOut> {
 
     /**
      * Get input parts as received over the wire from service consumer
      * @return the input
      */
     @Override
-    public MultipartInput getInput();
+    public PoxPayloadIn getInput();
 
     /**
      * setInput is used to set request input before starting to
@@ -49,21 +53,21 @@ public interface MultipartServiceContext
      * @param input
      */
     @Override
-    public void setInput(MultipartInput input);
+    public void setInput(PoxPayloadIn input);
 
     /**
      * Get output parts to send over the wire to service consumer
      * @return the output
      */
     @Override
-    public MultipartOutput getOutput();
+    public PoxPayloadOut getOutput();
 
     /**
      * Set output parts to send over the wire to service consumer
      * @return the output
      */
     @Override
-    public void setOutput(MultipartOutput output);
+    public void setOutput(PoxPayloadOut output);
 
     /**
      * getInputPart returns the input part object for given label and clazz
@@ -71,7 +75,17 @@ public interface MultipartServiceContext
      * @param clazz class of the object
      * @return part
      */
-    public Object getInputPart(String label, Class clazz) throws IOException;
+    @Deprecated
+    public Object getInputPart(String label, Class<?> clazz) throws IOException;
+    
+    /**
+     * Gets the input part.
+     *
+     * @param label the label
+     * @return the input part
+     * @throws IOException Signals that an I/O exception has occurred.
+     */
+    public Object getInputPart(String label) throws IOException;
 
     /**
      * getInputPartAsString returns the input part with given label in the string form
@@ -94,5 +108,5 @@ public interface MultipartServiceContext
      * @param document
      * @param contentType media type
      */
-    public void addOutputPart(String label, Document doc, String contentType) throws Exception;
+    public void addOutputPart(String label, Element doc, String contentType) throws Exception;
 }
index 535b092e52fe4d800a6c471dcab7e8977eca8d90..ba86262068e44e8628f6de074c75f265480b19d0 100644 (file)
@@ -25,6 +25,8 @@ package org.collectionspace.services.common.context;
 
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 
@@ -35,7 +37,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
  *
  */
 public class MultipartServiceContextFactory
-        implements ServiceContextFactory<MultipartInput, MultipartOutput> {
+        implements ServiceContextFactory<PoxPayloadIn, PoxPayloadOut> {
 
     /** The Constant self. */
     final private static MultipartServiceContextFactory self = new MultipartServiceContextFactory();
@@ -58,7 +60,7 @@ public class MultipartServiceContextFactory
      * @see org.collectionspace.services.common.context.ServiceContextFactory#createServiceContext(java.lang.String)
      */
     @Override
-    public ServiceContext<MultipartInput, MultipartOutput> createServiceContext(String serviceName) throws Exception {
+    public ServiceContext<PoxPayloadIn, PoxPayloadOut> createServiceContext(String serviceName) throws Exception {
         MultipartServiceContext ctx = new MultipartServiceContextImpl(serviceName);
         return ctx;
     }
@@ -67,8 +69,8 @@ public class MultipartServiceContextFactory
      * @see org.collectionspace.services.common.context.ServiceContextFactory#createServiceContext(java.lang.String, java.lang.Object)
      */
     @Override
-    public ServiceContext<MultipartInput, MultipartOutput> createServiceContext(String serviceName,
-               MultipartInput input) throws Exception {
+    public ServiceContext<PoxPayloadIn, PoxPayloadOut> createServiceContext(String serviceName,
+               PoxPayloadIn input) throws Exception {
         MultipartServiceContext ctx = new MultipartServiceContextImpl(serviceName, input);
         return ctx;
     }
@@ -77,11 +79,11 @@ public class MultipartServiceContextFactory
      * @see org.collectionspace.services.common.context.ServiceContextFactory#createServiceContext(java.lang.String, java.lang.Object, javax.ws.rs.core.MultivaluedMap)
      */
     @Override
-    public ServiceContext<MultipartInput, MultipartOutput> createServiceContext(String serviceName,
-               MultipartInput input, 
+    public ServiceContext<PoxPayloadIn, PoxPayloadOut> createServiceContext(String serviceName,
+               PoxPayloadIn input, 
                MultivaluedMap<String, String> queryParams)
                        throws Exception {
-       ServiceContext<MultipartInput, MultipartOutput> ctx = new MultipartServiceContextImpl(serviceName,
+       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = new MultipartServiceContextImpl(serviceName,
                        input,
                        queryParams);
        return ctx;
@@ -91,8 +93,8 @@ public class MultipartServiceContextFactory
      * @see org.collectionspace.services.common.context.ServiceContextFactory#createServiceContext(java.lang.String, java.lang.Object, javax.ws.rs.core.MultivaluedMap, java.lang.String, java.lang.String)
      */
     @Override
-    public ServiceContext<MultipartInput, MultipartOutput> createServiceContext(String serviceName, 
-               MultipartInput input,
+    public ServiceContext<PoxPayloadIn, PoxPayloadOut> createServiceContext(String serviceName, 
+               PoxPayloadIn input,
                MultivaluedMap<String, String> queryParams,
                String documentType,
                String entityName) throws Exception {
index d760ecbf6a7787990a5376263f7b370dbabdde07..cc068a2832c5970b83036e72be5ec3aec25bbd2c 100644 (file)
 package org.collectionspace.services.common.context;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.collectionspace.services.common.document.DocumentUtils;
+import org.collectionspace.services.client.PayloadInputPart;
+import org.collectionspace.services.client.PayloadOutputPart;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.security.UnauthorizedException;
-import org.jboss.resteasy.plugins.providers.multipart.InputPart;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
-import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+//import org.jboss.resteasy.plugins.providers.multipart.InputPart;
+//import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
+//import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
+//import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
 
 /**
  * MultipartServiceContextImpl takes Multipart Input/Output
@@ -48,7 +50,7 @@ import org.w3c.dom.Document;
  * $LastChangedDate: $
  */
 public class MultipartServiceContextImpl
-        extends RemoteServiceContextImpl<MultipartInput, MultipartOutput>
+        extends RemoteServiceContextImpl<PoxPayloadIn, PoxPayloadOut>
         implements MultipartServiceContext {
 
     /** The logger. */
@@ -62,9 +64,9 @@ public class MultipartServiceContextImpl
      * @throws UnauthorizedException the unauthorized exception
      */
     protected MultipartServiceContextImpl(String serviceName)
-                       throws UnauthorizedException {
+               throws DocumentException, UnauthorizedException {
        super(serviceName);
-       setOutput(new MultipartOutput());
+       setOutput(new PoxPayloadOut(serviceName));
     }
     
     /**
@@ -74,10 +76,10 @@ public class MultipartServiceContextImpl
      * 
      * @throws UnauthorizedException the unauthorized exception
      */
-    protected MultipartServiceContextImpl(String serviceName, MultipartInput theInput)
-               throws UnauthorizedException {
+    protected MultipartServiceContextImpl(String serviceName, PoxPayloadIn theInput)
+               throws DocumentException, UnauthorizedException {
         super(serviceName, theInput);
-        setOutput(new MultipartOutput());
+        setOutput(new PoxPayloadOut(serviceName));
     }
 
     /**
@@ -89,62 +91,49 @@ public class MultipartServiceContextImpl
      * @throws UnauthorizedException the unauthorized exception
      */
     protected MultipartServiceContextImpl(String serviceName,
-               MultipartInput theInput,
-               MultivaluedMap<String, String> queryParams) throws UnauthorizedException {
+               PoxPayloadIn theInput,
+               MultivaluedMap<String, String> queryParams) 
+                       throws DocumentException, UnauthorizedException {
        super(serviceName, theInput, queryParams);
-       setOutput(new MultipartOutput());
+       setOutput(new PoxPayloadOut(serviceName));
     }
 
-    /**
-     * Gets the input part.
-     * 
-     * @param label the label
-     * 
-     * @return the input part
-     * 
-     * @throws IOException Signals that an I/O exception has occurred.
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.common.context.MultipartServiceContext#getInputPart(java.lang.String, java.lang.Class)
      */
-    private InputPart getInputPart(String label) throws IOException {
-        if (getInput() != null) {
-            MultipartInput fdip = getInput();
-
-            for (InputPart part : fdip.getParts()) {
-                String partLabel = part.getHeaders().getFirst("label");
-                if (label.equalsIgnoreCase(partLabel)) {
-                    if (logger.isTraceEnabled()) {
-                        logger.trace("getInputPart found part with label=" + partLabel
-                                + "\npayload=" + part.getBodyAsString());
+    @Override
+    @Deprecated
+    public Object getInputPart(String label, Class clazz) throws IOException {
+        return getInputPart(label);
                     }
-                    return part;
-                }
-            }
-        }
-        return null;
-    }
-
+    
     /* (non-Javadoc)
      * @see org.collectionspace.services.common.context.MultipartServiceContext#getInputPart(java.lang.String, java.lang.Class)
      */
     @Override
-    public Object getInputPart(String label, Class clazz) throws IOException {
-        Object obj = null;
-        InputPart part = getInputPart(label);
-        if (part != null) {
-            obj = part.getBody(clazz, null);
+    public Object getInputPart(String label) throws IOException {
+       Object result = null;
+        PayloadInputPart payloadInputPart = getInput().getPart(label);
+        if (payloadInputPart != null) {
+               result = payloadInputPart.getBody();
         }
-        return obj;
+        return result;
     }
-
+    
     /* (non-Javadoc)
      * @see org.collectionspace.services.common.context.MultipartServiceContext#getInputPartAsString(java.lang.String)
      */
     @Override
     public String getInputPartAsString(String label) throws IOException {
-        InputPart part = getInputPart(label);
+       String result = null;
+       PayloadInputPart part = getInput().getPart(label);
         if (part != null) {
-            return part.getBodyAsString();
+               Element element = part.asElement();
+               if (element != null) {
+                       result = element.asXML();
         }
-        return null;
+    }
+        return result;
     }
 
     /* (non-Javadoc)
@@ -152,34 +141,25 @@ public class MultipartServiceContextImpl
      */
     @Override
     public InputStream getInputPartAsStream(String label) throws IOException {
-        InputPart part = getInputPart(label);
+       InputStream result = null;
+       String part = getInputPartAsString(label);
         if (part != null) {
-            return new ByteArrayInputStream(part.getBodyAsString().getBytes());
+               result = new ByteArrayInputStream(part.getBytes());
         }
-        return null;
+        return result;
     }
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.common.context.MultipartServiceContext#addOutputPart(java.lang.String, org.w3c.dom.Document, java.lang.String)
      */
     @Override
-    public void addOutputPart(String label, Document doc, String contentType) throws Exception {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try {
-            DocumentUtils.writeDocument(doc, baos);
-            baos.close();
-            OutputPart part = getOutput().addPart(new String(baos.toByteArray()),
-                    MediaType.valueOf(contentType));
-            part.getHeaders().add("label", label);
-        } finally {
-            if (baos != null) {
-                try {
-                    baos.close();
-                } catch (Exception e) {
+    public void addOutputPart(String label, Element element, String contentType) throws Exception {
+           PayloadOutputPart part = getOutput().addPart(label, element);
+           if (logger.isTraceEnabled() == true) {
+               logger.trace("Adding part:" + label +
+                               " to " + getOutput().getName() + " document.");
                 }
             }
-        }
-    }
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.common.context.RemoteServiceContextImpl#getLocalContext(java.lang.String)
index c8d2978912d0f7fc8de2cf7587309c6b1c292005..9559c3903bb27059ebc5d8f109bac4562a1df809 100644 (file)
@@ -59,6 +59,7 @@ import org.collectionspace.services.common.datetime.DateTimeFormatUtils;
 import org.collectionspace.services.common.service.ObjectPartContentType;
 import org.collectionspace.services.common.service.ObjectPartType;
 import org.collectionspace.services.common.service.XmlContentType;
+import org.dom4j.io.DOMReader;
 
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.jboss.resteasy.plugins.providers.multipart.InputPart;
@@ -93,8 +94,9 @@ import org.w3c.dom.Text;
 
 //import org.dom4j.Document;
 //import org.dom4j.Element;
-//import org.dom4j.*;
-
+//import org.dom4j.Node;
+//import org.dom4j.NodeList;
+//import org.dom4j.Text;
 
 /**
  * DocumentUtils is a collection of utilities related to document management
@@ -295,9 +297,8 @@ public class DocumentUtils {
                        result = db.parse(payload);
 
                        // Write it to the log so we can see what we've created.
-                       if (logger.isDebugEnabled() == true) {
-                               logger.debug(xmlToString(result));
-                               //System.out.println(xmlToString(result)); //FIXME: REM - Need this until we figure out why messages are not showing up in logger.
+                       if (logger.isTraceEnabled() == true) {
+                               logger.trace(xmlToString(result));
                        }
                } finally {
                        if (payload != null) {
@@ -493,7 +494,7 @@ public class DocumentUtils {
         * @return Document
         * @throws Exception
         */
-       public static Document buildDocument(ObjectPartType partMeta, String rootElementName,
+       public static org.dom4j.Element buildDocument(ObjectPartType partMeta, String rootElementName,
                        Map<String, Object> objectProps)
        throws Exception {
                ObjectPartContentType partContentMeta = partMeta.getContent();
@@ -505,27 +506,42 @@ public class DocumentUtils {
                //FIXME: We support XML validation on the way in, so we should add it here (on the way out) as well.
                DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
                Document document = builder.newDocument();
-               document.setXmlStandalone(true);
-               //JAXB unmarshaller recognizes the following kind of namespace qualification
-               //only. More investigation is needed to use other prefix
-               // <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-               // <ns2:collectionobjects-common xmlns:ns2="http://collectionspace.org/services/collectionobject">
-               // <objectNumber>objectNumber-1252960222412</objectNumber>
-               // <objectName>objectName-1252960222412</objectName>
-               // </ns2:collectionobjects-common>
+               document.setXmlStandalone(true); //FIXME: REM - Can we set this to false since it is not really standalone?
+
+               /*
+                * JAXB unmarshaller recognizes the following kind of namespace
+                * qualification only. More investigation is needed to use other prefix
+                * 
+                * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                * <ns2:collectionobjects-common xmlns:ns2="http://collectionspace.org/services/collectionobject">
+                *              <objectNumber>objectNumber-1252960222412</objectNumber>
+                *              <objectName>objectName-1252960222412</objectName>
+                * </ns2:collectionobjects-common>
+                */
 
                String ns = "ns2";
                Element root = document.createElementNS(xc.getNamespaceURI(), ns + ":" + rootElementName);
                root.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-               root.setAttribute("xsi:schemaLocation", xc.getSchemaLocation());
+               
+//             String getSchemaLocation = xc.getSchemaLocation();                                      //FIXME: REM - w3c Document to DOM4j Document mangles this attribute
+//             root.setAttribute("xsi:schemaLocation", xc.getSchemaLocation());
+               
+               String getNamespaceURI = xc.getNamespaceURI();
                root.setAttribute("xmlns:" + ns, xc.getNamespaceURI());
                document.appendChild(root);
 
                Schema schema = getSchemaFromName(partMeta.getLabel());
 
                buildDocument(document, root, objectProps, schema);
+               String w3cDocumentStr = xmlToString(document);
+               
 
-               return document;
+               DOMReader reader = new DOMReader();
+               org.dom4j.Document dom4jDoc = reader.read(document);
+               org.dom4j.Element result = dom4jDoc.getRootElement();
+               result.detach(); //return just the root element detached from the DOM document
+               
+               return result;//FIXME: REM - Add if (logger.isTraceEnabled() == true) logger.trace(document.asXML());
        }
 
        /**
@@ -1076,22 +1092,23 @@ public class DocumentUtils {
         * @return the map
         */
        public static Map<String, Object> parseProperties(ObjectPartType partMeta,
-                       Document document, ServiceContext ctx) throws Exception {
+                       org.dom4j.Element document, ServiceContext ctx) throws Exception {
                Map<String, Object> result = null;
                String schemaName = partMeta.getLabel();
                Schema schema = getSchemaFromName(schemaName);
-               
-               org.dom4j.io.DOMReader xmlReader = new org.dom4j.io.DOMReader();
-               org.dom4j.Document dom4jDocument = xmlReader.read(document);
+
+               //              org.dom4j.io.DOMReader xmlReader = new org.dom4j.io.DOMReader();
+               //              org.dom4j.Document dom4jDocument = xmlReader.read(document);
                try {
-                    result = loadSchema(schema, dom4jDocument.getRootElement(), ctx);
+                       //                    result = loadSchema(schema, dom4jDocument.getRootElement(), ctx);
+                       result = loadSchema(schema, document, ctx);
                 } catch (IllegalArgumentException iae) {
                     throw iae;
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();
                }
-               
+
                return result;
        }
        
@@ -1106,7 +1123,7 @@ public class DocumentUtils {
        @SuppressWarnings("unchecked")
        static private Map<String, Object> loadSchema(Schema schema, org.dom4j.Element schemaElement, ServiceContext ctx)
        throws Exception {
-               String schemaName1 = schemaElement.attributeValue(ExportConstants.NAME_ATTR);
+               String schemaName1 = schemaElement.attributeValue(ExportConstants.NAME_ATTR);//FIXME: Do we need this local var?
                String schemaName = schema.getName();
 
                Map<String, Object> data = new HashMap<String, Object>();
index b70a0e18546abb8b10b5737a4b52c949dbabb2d8..5d31c9c27e2772e582305baf29ff8002f0011e94 100644 (file)
@@ -1,5 +1,7 @@
 package org.collectionspace.services.common.query;\r
 \r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.common.context.ServiceContext;\r
 import org.collectionspace.services.common.document.DocumentException;\r
 import org.collectionspace.services.common.document.DocumentFilter;\r
@@ -35,7 +37,7 @@ public class QueryContext {
      * @throws DocumentNotFoundException the document not found exception\r
      * @throws DocumentException the document exception\r
      */\r
-    QueryContext(ServiceContext<MultipartInput, MultipartOutput> ctx) throws DocumentNotFoundException, DocumentException {\r
+    QueryContext(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx) throws DocumentNotFoundException, DocumentException {\r
         docType = ctx.getDocumentType();\r
         if (docType == null) {\r
             throw new DocumentNotFoundException(\r
@@ -57,7 +59,7 @@ public class QueryContext {
      * @throws DocumentNotFoundException the document not found exception\r
      * @throws DocumentException the document exception\r
      */\r
-    public QueryContext(ServiceContext<MultipartInput, MultipartOutput> ctx,\r
+    public QueryContext(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
             String theWhereClause) throws DocumentNotFoundException, DocumentException {\r
         this(ctx);\r
         whereClause = theWhereClause;\r
@@ -71,7 +73,7 @@ public class QueryContext {
      * @throws DocumentNotFoundException the document not found exception\r
      * @throws DocumentException the document exception\r
      */\r
-    public QueryContext(ServiceContext<MultipartInput, MultipartOutput> ctx,\r
+    public QueryContext(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
             DocumentHandler handler) throws DocumentNotFoundException, DocumentException {\r
         this(ctx);\r
         if (handler == null) {\r
index b639f0ff026d5bf46e4324b387d42a3085fb1dc1..cf7eb078900a3189ab8e1c8918c2f5e4feab98ff 100644 (file)
@@ -42,6 +42,8 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
 import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
 import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityItemDocumentModelHandler;
@@ -63,21 +65,18 @@ import org.collectionspace.services.common.security.UnauthorizedException;
 import org.collectionspace.services.common.query.IQueryManager;
 import org.collectionspace.services.common.query.QueryManager;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.util.HttpResponseCodes;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * The Class VocabularyResource.
+ * The Class AuthorityResource.
  */
-@Path("/vocabularies")
-@Consumes("multipart/mixed")
-@Produces("multipart/mixed")
+@Consumes("application/xml")
+@Produces("application/xml")
 public abstract class AuthorityResource<AuthCommon, AuthCommonList, AuthItemCommonList, AuthItemHandler> extends
-AbstractMultiPartCollectionSpaceResourceImpl {
+       AbstractMultiPartCollectionSpaceResourceImpl {
 
        protected Class<AuthCommon> authCommonClass;
        protected Class<?> resourceClass;
@@ -179,7 +178,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         * @throws Exception the exception
         */
        public DocumentHandler createItemDocumentHandler(
-                       ServiceContext<MultipartInput, MultipartOutput> ctx,
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
                        String inAuthority)
        throws Exception {
                AuthItemHandler docHandler;
@@ -200,9 +199,10 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         * @return the response
         */
        @POST
-       public Response createAuthority(MultipartInput input) {
+       public Response createAuthority(String xmlPayload) {
                try {
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(input);
+                       PoxPayloadIn input = new PoxPayloadIn(xmlPayload);
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(input);
                        DocumentHandler handler = createDocumentHandler(ctx);
                        String csid = getRepositoryClient(ctx).create(ctx, handler);
                        UriBuilder path = UriBuilder.fromResource(resourceClass);
@@ -252,13 +252,13 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         */
        @GET
        @Path("{csid}")
-       public MultipartOutput getAuthority(@PathParam("csid") String specifier) {
-               MultipartOutput result = null;
+       public String getAuthority(@PathParam("csid") String specifier) {
+               PoxPayloadOut result = null;
                try {
                        Specifier spec = getSpecifier(specifier, "getAuthority", "GET");
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
                        DocumentHandler handler = createDocumentHandler(ctx);
-                       if(spec.form==SpecifierForm.CSID) {
+                       if(spec.form == SpecifierForm.CSID) {
                                if (logger.isDebugEnabled()) {
                                        logger.debug("getAuthority with csid=" + spec.value);
                                }
@@ -269,7 +269,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                                handler.setDocumentFilter(myFilter);
                                getRepositoryClient(ctx).get(ctx, handler);
                        }
-                       result = (MultipartOutput) ctx.getOutput();
+                       result = ctx.getOutput();
                } catch (UnauthorizedException ue) {
                        Response response = Response.status(
                                        Response.Status.UNAUTHORIZED).entity("Get failed reason " + ue.getErrorReason()).type("text/plain").build();
@@ -298,7 +298,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                        throw new WebApplicationException(response);
                }
 
-               return result;
+               return result.toXML();
        }
 
        /**
@@ -313,7 +313,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
     public AuthCommonList getAuthorityList(@Context UriInfo ui) {
                try {
                        MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(queryParams);
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);
                        DocumentHandler handler = createDocumentHandler(ctx);
                        DocumentFilter myFilter = handler.getDocumentFilter();
                        String nameQ = queryParams.getFirst("refName");
@@ -346,13 +346,14 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         */
        @PUT
        @Path("{csid}")
-       public MultipartOutput updateAuthority(
+       public String updateAuthority(
                        @PathParam("csid") String specifier,
-                       MultipartInput theUpdate) {
-               MultipartOutput result = null;
+                       String xmlPayload) {
+               PoxPayloadOut result = null;
                try {
+                       PoxPayloadIn theUpdate = new PoxPayloadIn(xmlPayload);
                        Specifier spec = getSpecifier(specifier, "updateAuthority", "UPDATE");
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(theUpdate);
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(theUpdate);
                        DocumentHandler handler = createDocumentHandler(ctx);
                        String csid;
                        if(spec.form==SpecifierForm.CSID) {
@@ -362,7 +363,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                                csid = getRepositoryClient(ctx).findDocCSID(ctx, whereClause);
                        }
                        getRepositoryClient(ctx).update(ctx, csid, handler);
-                       result = (MultipartOutput) ctx.getOutput();
+                       result = ctx.getOutput();
                } catch (UnauthorizedException ue) {
                        Response response = Response.status(
                                        Response.Status.UNAUTHORIZED).entity("Update failed reason " + ue.getErrorReason()).type("text/plain").build();
@@ -380,7 +381,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                                        Response.Status.INTERNAL_SERVER_ERROR).entity("Update failed").type("text/plain").build();
                        throw new WebApplicationException(response);
                }
-               return result;
+               return result.toXML();
        }
 
        /**
@@ -405,7 +406,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                        throw new WebApplicationException(response);
                }
                try {
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
                        getRepositoryClient(ctx).delete(ctx, csid);
                        return Response.status(HttpResponseCodes.SC_OK).build();
                } catch (UnauthorizedException ue) {
@@ -436,9 +437,10 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         *************************************************************************/
        @POST
        @Path("{csid}/items")
-       public Response createAuthorityItem(@PathParam("csid") String specifier, MultipartInput input) {
+       public Response createAuthorityItem(@PathParam("csid") String specifier, String xmlPayload) {
                try {
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+                       PoxPayloadIn input = new PoxPayloadIn(xmlPayload);
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        Specifier spec = getSpecifier(specifier, "createAuthorityItem", "CREATE_ITEM");
                        String parentcsid;
                        if(spec.form==SpecifierForm.CSID) {
@@ -483,15 +485,15 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         */
        @GET
        @Path("{csid}/items/{itemcsid}")
-       public MultipartOutput getAuthorityItem(
+       public String getAuthorityItem(
                        @PathParam("csid") String parentspecifier,
                        @PathParam("itemcsid") String itemspecifier) {
-               MultipartOutput result = null;
+               PoxPayloadOut result = null;
                try {
                        Specifier parentSpec = getSpecifier(parentspecifier, "getAuthorityItem(parent)", "GET_ITEM");
                        Specifier itemSpec = getSpecifier(itemspecifier, "getAuthorityItem(item)", "GET_ITEM");
                        // Note that we have to create the service context for the Items, not the main service
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -512,7 +514,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                    getRepositoryClient(ctx).get(ctx, handler);
                        }
                        // TODO should we assert that the item is in the passed vocab?
-                       result = (MultipartOutput) ctx.getOutput();
+                       result = ctx.getOutput();
                } catch (UnauthorizedException ue) {
                        Response response = Response.status(
                                        Response.Status.UNAUTHORIZED).entity("Get failed reason " + ue.getErrorReason()).type("text/plain").build();
@@ -539,7 +541,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                                        "text/plain").build();
                        throw new WebApplicationException(response);
                }
-               return result;
+               return result.toXML();
        }
 
 
@@ -566,7 +568,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                        Specifier spec = getSpecifier(specifier, "getAuthorityItemList", "LIST");
                        MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
                        // Note that docType defaults to the ServiceName, so we're fine with that.
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(spec.form==SpecifierForm.CSID) {
                                parentcsid = spec.value;
@@ -640,7 +642,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                        Specifier itemSpec = getSpecifier(itemspecifier, 
                                        "getReferencingObjects(item)", "GET_ITEM_REF_OBJS");
                        // Note that we have to create the service context for the Items, not the main service
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -728,7 +730,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                        Specifier itemSpec = getSpecifier(itemspecifier, "getAuthorityItemAuthRefs(item)", "GET_ITEM_AUTH_REFS");
                        // Note that we have to create the service context for the Items, not the main service
             MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -769,8 +771,6 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         return authRefList;
     }
 
-
-
        /**
         * Update authorityItem.
         * 
@@ -782,18 +782,19 @@ AbstractMultiPartCollectionSpaceResourceImpl {
         */
        @PUT
        @Path("{csid}/items/{itemcsid}")
-       public MultipartOutput updateAuthorityItem(
+       public String updateAuthorityItem(
                        @PathParam("csid") String parentspecifier,
                        @PathParam("itemcsid") String itemspecifier,
-                       MultipartInput theUpdate) {
-               MultipartOutput result = null;
+                       String xmlPayload) {
+               PoxPayloadOut result = null;
                try {
+                       PoxPayloadIn theUpdate = new PoxPayloadIn(xmlPayload);
                        Specifier parentSpec = getSpecifier(parentspecifier, 
                                        "updateAuthorityItem(parent)", "UPDATE_ITEM");
                        Specifier itemSpec = getSpecifier(itemspecifier, 
                                        "updateAuthorityItem(item)", "UPDATE_ITEM");
                        // Note that we have to create the service context for the Items, not the main service
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -814,7 +815,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                        // Note that we have to create the service context for the Items, not the main service
                        DocumentHandler handler = createItemDocumentHandler(ctx, parentcsid);
                        getRepositoryClient(ctx).update(ctx, itemcsid, handler);
-                       result = (MultipartOutput) ctx.getOutput();
+                       result = ctx.getOutput();
                } catch (BadRequestException bre) {
                        Response response = Response.status(
                                        Response.Status.BAD_REQUEST).entity("Create failed reason " + bre.getErrorReason()).type("text/plain").build();
@@ -836,7 +837,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                                        Response.Status.INTERNAL_SERVER_ERROR).entity("Update failed").type("text/plain").build();
                        throw new WebApplicationException(response);
                }
-               return result;
+               return result.toXML();
        }
 
        /**
@@ -871,7 +872,7 @@ AbstractMultiPartCollectionSpaceResourceImpl {
                }
                try {
                        // Note that we have to create the service context for the Items, not the main service
-                       ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(getItemServiceName());
+                       ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(getItemServiceName());
                        getRepositoryClient(ctx).delete(ctx, itemcsid);
                        return Response.status(HttpResponseCodes.SC_OK).build();
                } catch (UnauthorizedException ue) {
index 829f7f9c0703ada0488ce423dabb162d4cf1ad1c..d13c122a24003244826f8ded52fe5ad5f3282495 100644 (file)
@@ -36,6 +36,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.jaxb.AbstractCommonList;
+import org.collectionspace.services.client.PayloadInputPart;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
 import org.collectionspace.services.common.context.MultipartServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
@@ -46,6 +49,7 @@ import org.collectionspace.services.common.document.DocumentFilter;
 import org.collectionspace.services.common.document.DocumentHandler.Action;
 import org.collectionspace.services.common.service.ObjectPartType;
 import org.collectionspace.services.common.vocabulary.RefNameUtils;
+import org.dom4j.Element;
 
 import org.jboss.resteasy.plugins.providers.multipart.InputPart;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
@@ -59,7 +63,7 @@ import org.nuxeo.ecm.core.schema.types.Schema;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
+import org.dom4j.Document;
 
 /**
  * RemoteDocumentModelHandler
@@ -79,7 +83,7 @@ public abstract class RemoteDocumentModelHandlerImpl<T, TL>
      * @see org.collectionspace.services.common.document.AbstractDocumentHandlerImpl#setServiceContext(org.collectionspace.services.common.context.ServiceContext)
      */
     @Override
-    public void setServiceContext(ServiceContext ctx) {  //FIXME: Apply proper generics to ServiceContext<MultipartInput, MultipartOutput>
+    public void setServiceContext(ServiceContext ctx) {  //FIXME: Apply proper generics to ServiceContext<PoxPayloadIn, PoxPayloadOut>
         if (ctx instanceof MultipartServiceContext) {
             super.setServiceContext(ctx);
         } else {
@@ -97,11 +101,11 @@ public abstract class RemoteDocumentModelHandlerImpl<T, TL>
         //return at least those document part(s) that were received
         Map<String, ObjectPartType> partsMetaMap = getServiceContext().getPartsMetadata();
         MultipartServiceContext ctx = (MultipartServiceContext) getServiceContext();
-        MultipartInput input = ctx.getInput();
+        PoxPayloadIn input = ctx.getInput();
         if (input != null) {
-               List<InputPart> inputParts = ctx.getInput().getParts();
-               for (InputPart part : inputParts) {
-                   String partLabel = part.getHeaders().getFirst("label");
+               List<PayloadInputPart> inputParts = ctx.getInput().getParts();
+               for (PayloadInputPart part : inputParts) {
+                   String partLabel = part.getLabel();
                    ObjectPartType partMeta = partsMetaMap.get(partLabel);
        //            extractPart(docModel, partLabel, partMeta);
                    Map<String, Object> unQObjectProperties = extractPart(docModel, partLabel, partMeta);
@@ -125,10 +129,10 @@ public abstract class RemoteDocumentModelHandlerImpl<T, TL>
      */
     private void addOutputPart(Map<String, Object> unQObjectProperties, String schema, ObjectPartType partMeta)
             throws Exception {
-        Document doc = DocumentUtils.buildDocument(partMeta, schema,
+        Element doc = DocumentUtils.buildDocument(partMeta, schema,
                 unQObjectProperties);
         if (logger.isDebugEnabled() == true) {
-            logger.debug(DocumentUtils.xmlToString(doc));
+            logger.debug(doc.asXML());
         }
         MultipartServiceContext ctx = (MultipartServiceContext) getServiceContext();
         ctx.addOutputPart(schema, doc, partMeta.getContent().getContentType());
@@ -191,7 +195,7 @@ public abstract class RemoteDocumentModelHandlerImpl<T, TL>
         //not an ideal way of populating objects.
         DocumentModel docModel = wrapDoc.getWrappedObject();
         MultipartServiceContext ctx = (MultipartServiceContext) getServiceContext();
-        MultipartInput input = ctx.getInput();
+        PoxPayloadIn input = ctx.getInput();
         if (input.getParts().isEmpty()) {
             String msg = "No payload found!";
             logger.error(msg + "Ctx=" + getServiceContext().toString());
@@ -201,10 +205,10 @@ public abstract class RemoteDocumentModelHandlerImpl<T, TL>
         Map<String, ObjectPartType> partsMetaMap = getServiceContext().getPartsMetadata();
 
         //iterate over parts received and fill those parts
-        List<InputPart> inputParts = input.getParts();
-        for (InputPart part : inputParts) {
+        List<PayloadInputPart> inputParts = input.getParts();
+        for (PayloadInputPart part : inputParts) {
 
-            String partLabel = part.getHeaders().getFirst("label");
+            String partLabel = part.getLabel();
             if (partLabel == null) {
                 String msg = "Part label is missing or empty!";
                 logger.error(msg + "Ctx=" + getServiceContext().toString());
@@ -228,24 +232,21 @@ public abstract class RemoteDocumentModelHandlerImpl<T, TL>
      * @param partMeta metadata for the object to fill
      * @throws Exception
      */
-    protected void fillPart(InputPart part, DocumentModel docModel,
-            ObjectPartType partMeta, Action action, ServiceContext ctx)
+    protected void fillPart(PayloadInputPart part, DocumentModel docModel,
+            ObjectPartType partMeta, Action action, ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx)
             throws Exception {
-        InputStream payload = part.getBody(InputStream.class, null);
-
         //check if this is an xml part
         if (part.getMediaType().equals(MediaType.APPLICATION_XML_TYPE)) {
-            if (payload != null) {
-                Document document = DocumentUtils.parseDocument(payload, partMeta,
-                        false /*don't validate*/);
-                Map<String, Object> objectProps = DocumentUtils.parseProperties(partMeta, document, ctx);
+//                Document document = DocumentUtils.parseDocument(payload, partMeta,
+//                        false /*don't validate*/);
+               Element element = part.getElementBody();
+            Map<String, Object> objectProps = DocumentUtils.parseProperties(partMeta, element, ctx);
                 if (action == Action.UPDATE) {
                     this.filterReadOnlyPropertiesForPart(objectProps, partMeta);
                 }
                 docModel.setProperties(partMeta.getLabel(), objectProps);
             }
         }
-    }
 
     /**
      * Filters out read only properties, so they cannot be set on update.
@@ -283,11 +284,11 @@ public abstract class RemoteDocumentModelHandlerImpl<T, TL>
             throws Exception {
         Map<String, Object> result = null;
 
-        MediaType mt = MediaType.valueOf(partMeta.getContent().getContentType());
+        MediaType mt = MediaType.valueOf(partMeta.getContent().getContentType()); //FIXME: REM - This is no longer needed.  Everything is POX
         if (mt.equals(MediaType.APPLICATION_XML_TYPE)) {
             Map<String, Object> objectProps = docModel.getProperties(schema);
             //unqualify properties before sending the doc over the wire (to save bandwidh)
-            //FIXME: is there a better way to avoid duplication of a collection?
+            //FIXME: is there a better way to avoid duplication of a Map/Collection?
             Map<String, Object> unQObjectProperties =
                     (addToMap != null) ? addToMap : (new HashMap<String, Object>());
             Set<Entry<String, Object>> qualifiedEntries = objectProps.entrySet();
index baabb0adb38e1d53276c55091f6b6e02be47d53e..37856ad86dd955f96d5d427fc9a4c67312b6678b 100644 (file)
 package org.collectionspace.services.nuxeo.client.java;\r
 \r
 import java.io.InputStream;\r
+import java.io.ByteArrayInputStream;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
+import org.collectionspace.services.client.PayloadInputPart;\r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.common.context.ServiceContext;\r
 import org.collectionspace.services.common.document.DocumentUtils;\r
 import org.collectionspace.services.common.service.ObjectPartType;\r
@@ -66,10 +70,11 @@ public abstract class RemoteSubItemDocumentModelHandlerImpl<T, TL> extends
      * @throws Exception\r
      */\r
        @Override\r
-    protected void fillPart(InputPart part, DocumentModel docModel, \r
-                                               ObjectPartType partMeta, Action action, ServiceContext ctx)\r
+    protected void fillPart(PayloadInputPart part, DocumentModel docModel, \r
+                                               ObjectPartType partMeta, Action action, ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx)\r
             throws Exception {\r
-        InputStream payload = part.getBody(InputStream.class, null);\r
+               ByteArrayInputStream bas = new ByteArrayInputStream(part.getElementBody().asXML().getBytes());\r
+        InputStream payload = bas;//part.getBody(/*InputStream.class, null*/);\r
 \r
         //check if this is an xml part\r
         // TODO - we could configure the parts that have subitem content, \r
index cc6ba105b1759be7fa58b5ba200b42b2d02f4351..5fd93790790af6ce19c9a311df1f5de21894797b 100644 (file)
@@ -24,6 +24,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils;
 import org.collectionspace.services.common.query.IQueryManager;
@@ -91,7 +93,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient {
      * @param documentModel the document model
      * @throws ClientException the client exception
      */
-    private void setCollectionSpaceCoreValues(ServiceContext<MultipartInput, MultipartOutput> ctx,
+    private void setCollectionSpaceCoreValues(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
             DocumentModel documentModel,
             Action action) throws ClientException {
         //
index 199bbbbdbabba5e7cbae0d055b2ea2d981077cfc..6fd3b85515a211ec87f389f4ff71cbb33c4c6db3 100644 (file)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index a0168ccf7e32344bfb0f7aa019a6ed6aae5e39a6..d3a9126e85a478f0d401ca152f9b4d7b697e5e97 100644 (file)
@@ -1,6 +1,6 @@
 <projectDescription>\r
   <name>org.collectionspace.services.contact.3rdparty.nuxeo</name>\r
-  <comment>Contact Nuxeo Document Type</comment>\r
+  <comment>Contact Nuxeo Document Type. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
   <projects/>\r
   <buildSpec>\r
     <buildCommand>\r
index 425cd1620f3d44a6c3d1d8c43488a67552f09765..77bfde7e1f0ae848b48dc4d263714e93f7379a9f 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar" sourcepath="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/1.2.1.GA/jaxrs-api-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" sourcepath="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/1.2.1.GA/resteasy-jaxb-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-multipart-provider/1.2.1.GA/resteasy-multipart-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index b5aa0b19672a788bf5df551998a3dd0e6356f1db..2144e437040e06ba168c0234d631c014329569c8 100644 (file)
@@ -1,10 +1,10 @@
 <projectDescription>\r
   <name>org.collectionspace.services.contact.client</name>\r
-  <comment/>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
   <projects>\r
-       <project>org.collectionspace.services.common</project>\r
        <project>org.collectionspace.services.client</project>\r
        <project>org.collectionspace.services.contact.jaxb</project>\r
+    <project>org.collectionspace.services.jaxb</project>\r
   </projects>\r
   <buildSpec>\r
     <buildCommand>\r
index d780e2a687b34582291637eaaee85bc03317da33..df284332eaa73db3351adef2c2b26cb6fde0e4da 100644 (file)
             <version>${project.version}</version>
         </dependency>
         <!-- External dependencies -->
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
index 284d2065b595303ba3449e65520257f3eff61d5c..ff80b7b92d5a7165ca437e205ef7bf213ed3774a 100644 (file)
@@ -24,8 +24,6 @@ import org.jboss.resteasy.client.ProxyFactory;
 import org.jboss.resteasy.plugins.providers.RegisterBuiltin;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.client.core.executors.ApacheHttpClientExecutor;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
 /**
@@ -36,12 +34,20 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
  */
  
 public class ContactClient extends AbstractServiceClientImpl {
-
-       /* (non-Javadoc)
-        * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent()
-        */
+       public static final String SERVICE_NAME = "contacts";
+       public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
+       public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
+       public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/";     
+       public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
+
+       @Override
+       public String getServiceName() {
+               return SERVICE_NAME;
+       }
+       
+       @Override
        public String getServicePathComponent() {
-               return "contacts";
+        return SERVICE_PATH_COMPONENT;
        }
 
        /**
@@ -106,7 +112,7 @@ public class ContactClient extends AbstractServiceClientImpl {
      * @see org.collectionspace.services.client.Contact#getContact(java.lang.String)
      */
 
-    public ClientResponse<MultipartInput> read(String csid) {
+    public ClientResponse<String> read(String csid) {
         return contactProxy.read(csid);
     }
 
@@ -115,8 +121,8 @@ public class ContactClient extends AbstractServiceClientImpl {
      * @return
      * @see org.collectionspace.services.client.Contact#createContact(org.collectionspace.services.Contact)
      */
-    public ClientResponse<Response> create(MultipartOutput multipart) {
-        return contactProxy.create(multipart);
+    public ClientResponse<Response> create(PoxPayloadOut xmlPayload) {
+        return contactProxy.create(xmlPayload.getBytes());
     }
 
     /**
@@ -125,8 +131,8 @@ public class ContactClient extends AbstractServiceClientImpl {
      * @return
      * @see org.collectionspace.services.client.Contact#updateContact(java.lang.Long, org.collectionspace.services.Contact)
      */
-    public ClientResponse<MultipartInput> update(String csid, MultipartOutput multipart) {
-        return contactProxy.update(csid, multipart);
+    public ClientResponse<String> update(String csid, PoxPayloadOut xmlPayload) {
+        return contactProxy.update(csid, xmlPayload.getBytes());
 
     }
 
index 01a6755b1d7cf31bdba8341ec7604ddd1eed9946..39d173de4d188c64d71c06f8b845f0b15485666b 100644 (file)
@@ -4,8 +4,7 @@ import javax.ws.rs.core.MediaType;
 
 import org.collectionspace.services.client.ContactClient;
 import org.collectionspace.services.contact.ContactsCommon;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
-import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
+//import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +14,7 @@ public class ContactClientUtils {
     private static final Logger logger =
         LoggerFactory.getLogger(ContactClientUtils.class);
 
-    public static MultipartOutput createContactInstance(String identifier, String headerLabel) {
+    public static PoxPayloadOut createContactInstance(String identifier, String headerLabel) {
         final String inAuthority = "";
         final String inItem = "";
         return createContactInstance(
@@ -27,7 +26,7 @@ public class ContactClientUtils {
             headerLabel);
     }
 
-    public static MultipartOutput createContactInstance(
+    public static PoxPayloadOut createContactInstance(
         String inAuthority, String inItem, String identifier, String headerLabel) {
         return createContactInstance(
             inAuthority,
@@ -38,7 +37,7 @@ public class ContactClientUtils {
             headerLabel);
     }
 
-    public static MultipartOutput createContactInstance(
+    public static PoxPayloadOut createContactInstance(
         String inAuthority, String inItem, String addressType,
         String addressPlace, String email, String headerLabel) {
         ContactsCommon contact = new ContactsCommon();
@@ -47,11 +46,12 @@ public class ContactClientUtils {
         contact.setAddressType(addressType);
         contact.setAddressPlace(addressPlace);
         contact.setEmail(email);
-        MultipartOutput multipart = new MultipartOutput();
-        OutputPart commonPart =
+        PoxPayloadOut multipart = new PoxPayloadOut(ContactClient.SERVICE_PAYLOAD_NAME);
+        @SuppressWarnings("deprecation")
+               PayloadOutputPart commonPart =
             multipart.addPart(contact, MediaType.APPLICATION_XML_TYPE);
-        ContactClient client = new ContactClient();
-        commonPart.getHeaders().add("label", headerLabel);
+//        ContactClient client = new ContactClient();
+        commonPart.setLabel(headerLabel);
 
         if(logger.isDebugEnabled()){
             logger.debug("to be created, contact common");
index 35ff0fdbddf43abcc7d7d60d0f1e193e6a1d9336..d62a4ee7a5494beb35d880634a1d648d2e699ec2 100644 (file)
@@ -12,34 +12,31 @@ import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.contact.ContactsCommonList;
 import org.jboss.resteasy.client.ClientResponse;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 
 /**
  * @version $Revision:$
  */
-@Path("/contacts/")
-@Produces({"multipart/mixed"})
-@Consumes({"multipart/mixed"})
+@Path(ContactClient.SERVICE_PATH_PROXY)
+@Produces({"application/xml"})
+@Consumes({"application/xml"})
 public interface ContactProxy extends CollectionSpaceProxy {
 
     @GET
-    @Produces({"application/xml"})
     ClientResponse<ContactsCommonList> readList();
 
     //(C)reate
     @POST
-    ClientResponse<Response> create(MultipartOutput multipart);
+    ClientResponse<Response> create(byte[] xmlPayload);
 
     //(R)ead
     @GET
     @Path("/{csid}")
-    ClientResponse<MultipartInput> read(@PathParam("csid") String csid);
+    ClientResponse<String> read(@PathParam("csid") String csid);
 
     //(U)pdate
     @PUT
     @Path("/{csid}")
-    ClientResponse<MultipartInput> update(@PathParam("csid") String csid, MultipartOutput multipart);
+    ClientResponse<String> update(@PathParam("csid") String csid, byte[] xmlPayload);
 
     //(D)elete
     @DELETE
index c5475391b64e53dfc27b75e89769e2470527a622..b70255bc50ef83dc9436274376d6ce078925c004 100644 (file)
@@ -22,7 +22,6 @@
  */
 package org.collectionspace.services.client.test;
 
-import java.util.ArrayList;
 import java.util.List;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -30,15 +29,16 @@ import javax.ws.rs.core.Response;
 import org.collectionspace.services.client.CollectionSpaceClient;
 import org.collectionspace.services.client.ContactClient;
 import org.collectionspace.services.client.ContactClientUtils;
+import org.collectionspace.services.client.PayloadOutputPart;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.contact.ContactsCommon;
 import org.collectionspace.services.contact.ContactsCommonList;
 import org.collectionspace.services.jaxb.AbstractCommonList;
 
 import org.jboss.resteasy.client.ClientResponse;
+//import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
 
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
-import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
@@ -54,14 +54,24 @@ import org.slf4j.LoggerFactory;
  * $LastChangedDate: 2009-11-06 12:20:28 -0800 (Fri, 06 Nov 2009) $
  */
 public class ContactServiceTest extends AbstractServiceTestImpl {
-
     private final String CLASS_NAME = ContactServiceTest.class.getName();
-    private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);
+    private final Logger logger = LoggerFactory.getLogger(ContactServiceTest.class);
 
     // Instance variables specific to this test.
-    final String SERVICE_PATH_COMPONENT = "contacts";
+//    final String SERVICE_PATH_COMPONENT = "contacts";
+    
     private String knownResourceId = null;
 
+       @Override
+       public String getServicePathComponent() {
+               return ContactClient.SERVICE_PATH_COMPONENT;
+       }
+
+       @Override
+       protected String getServiceName() {
+               return ContactClient.SERVICE_NAME;
+       }
+    
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
      */
@@ -98,7 +108,7 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
         // Submit the request to the service and store the response.
         ContactClient client = new ContactClient();
         String identifier = createIdentifier();
-        MultipartOutput multipart =
+        PoxPayloadOut multipart =
             ContactClientUtils.createContactInstance(identifier, client.getCommonPartName());
         ClientResponse<Response> res = client.create(multipart);
 
@@ -264,7 +274,7 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
 
         // Submit the request to the service and store the response.
         ContactClient client = new ContactClient();
-        ClientResponse<MultipartInput> res = client.read(knownResourceId);
+        ClientResponse<String> res = client.read(knownResourceId);
         int statusCode = res.getStatus();
 
         // Check the status code of the response: does it match
@@ -276,7 +286,7 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
                 invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
 
-        MultipartInput input = (MultipartInput) res.getEntity();
+        PoxPayloadIn input = new PoxPayloadIn(res.getEntity());
         ContactsCommon contact = (ContactsCommon) extractPart(input,
                 client.getCommonPartName(), ContactsCommon.class);
         Assert.assertNotNull(contact);
@@ -296,7 +306,7 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
 
         // Submit the request to the service and store the response.
         ContactClient client = new ContactClient();
-        ClientResponse<MultipartInput> res = client.read(NON_EXISTENT_ID);
+        ClientResponse<String> res = client.read(NON_EXISTENT_ID);
         int statusCode = res.getStatus();
 
         // Check the status code of the response: does it match
@@ -377,8 +387,7 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
 
         // Submit the request to the service and store the response.
         ContactClient client = new ContactClient();
-        ClientResponse<MultipartInput> res =
-                client.read(knownResourceId);
+        ClientResponse<String> res = client.read(knownResourceId);
         if(logger.isDebugEnabled()){
             logger.debug(testName + ": read status = " + res.getStatus());
         }
@@ -387,7 +396,7 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
         if(logger.isDebugEnabled()){
             logger.debug("got object to update with ID: " + knownResourceId);
         }
-        MultipartInput input = (MultipartInput) res.getEntity();
+        PoxPayloadIn input = new PoxPayloadIn(res.getEntity());
         ContactsCommon contact = (ContactsCommon) extractPart(input,
                 client.getCommonPartName(), ContactsCommon.class);
         Assert.assertNotNull(contact);
@@ -401,9 +410,9 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
             logger.debug(objectAsXmlString(contact, ContactsCommon.class));
         }
         // Submit the request to the service and store the response.
-        MultipartOutput output = new MultipartOutput();
-        OutputPart commonPart = output.addPart(contact, MediaType.APPLICATION_XML_TYPE);
-        commonPart.getHeaders().add("label", client.getCommonPartName());
+        PoxPayloadOut output = new PoxPayloadOut(ContactClient.SERVICE_PAYLOAD_NAME);
+        PayloadOutputPart commonPart = output.addPart(contact, MediaType.APPLICATION_XML_TYPE);
+        commonPart.setLabel(client.getCommonPartName());
 
         res = client.update(knownResourceId, output);
         int statusCode = res.getStatus();
@@ -416,7 +425,7 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
 
 
-        input = (MultipartInput) res.getEntity();
+        input = new PoxPayloadIn(res.getEntity());
         ContactsCommon updatedContact =
                 (ContactsCommon) extractPart(input,
                         client.getCommonPartName(), ContactsCommon.class);
@@ -553,9 +562,9 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
         // Note: The ID used in this 'create' call may be arbitrary.
         // The only relevant ID may be the one used in update(), below.
         ContactClient client = new ContactClient();
-        MultipartOutput multipart =
+        PoxPayloadOut multipart =
                 ContactClientUtils.createContactInstance(NON_EXISTENT_ID, client.getCommonPartName());
-        ClientResponse<MultipartInput> res =
+        ClientResponse<String> res =
                 client.update(NON_EXISTENT_ID, multipart);
         int statusCode = res.getStatus();
 
@@ -653,12 +662,4 @@ public class ContactServiceTest extends AbstractServiceTestImpl {
         Assert.assertEquals(statusCode, EXPECTED_STATUS);
 
     }
-
-    // ---------------------------------------------------------------
-    // Utility methods used by tests above
-    // ---------------------------------------------------------------
-    @Override
-    public String getServicePathComponent() {
-        return SERVICE_PATH_COMPONENT;
-    }
 }
index 1707f3e6fb88893614aa06d54f2339211c0fb104..0d593e17f64eac4731c629bee4d91259e0b2b4f7 100644 (file)
@@ -1,11 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="target/generated-sources/xjc"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="target/generated-sources/xjc"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index ca0775f80da5b2cdf1518288952f50630ec3928b..444821230f04fd4f8e96f22edc74a6103bf7e21d 100644 (file)
@@ -1,7 +1,9 @@
 <projectDescription>\r
   <name>org.collectionspace.services.contact.jaxb</name>\r
-  <comment/>\r
-  <projects/>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
+  <projects>\r
+    <project>org.collectionspace.services.jaxb</project>\r
+  </projects>\r
   <buildSpec>\r
     <buildCommand>\r
       <name>org.eclipse.jdt.core.javabuilder</name>\r
index e51e8e7114e194f4ac2608a95dbcb31dad973918..dd2ea026f99f1845aabe10703d034818a7965676 100644 (file)
@@ -1,9 +1,9 @@
-#Tue Dec 21 09:59:48 PST 2010\r
+#Wed Jan 19 22:49:48 PST 2011\r
 activeProfiles=\r
 eclipse.preferences.version=1\r
-fullBuildGoals=process-classes\r
+fullBuildGoals=process-test-resources\r
 includeModules=false\r
 resolveWorkspaceProjects=true\r
-resourceFilterGoals=process-classes\r
-skipCompilerPlugin=false\r
+resourceFilterGoals=process-resources resources\:testResources\r
+skipCompilerPlugin=true\r
 version=1\r
index 3a317acf08b96646f675bc8289783b6e6797aeec..bb2110fea898e54bc5a777f04a8145c74549eee0 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.2_01/jai_core-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/javax/script/script-api/1.0/script-api-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0/stax-api-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6.jar" sourcepath="M2_REPO/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/james/apache-mime4j/0.6/apache-mime4j-0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1.jar" sourcepath="M2_REPO/classworlds/classworlds/1.1/classworlds-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet/1.0.7/com.noelios.restlet-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7.jar" sourcepath="M2_REPO/com/noelios/restlet/com.noelios.restlet.ext.httpclient/1.0.7/com.noelios.restlet.ext.httpclient-1.0.7-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar" sourcepath="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-jexl/2.0.1/commons-jexl-2.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar" sourcepath="M2_REPO/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/EditableImage/0.9.5/EditableImage-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4.jar" sourcepath="M2_REPO/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/hyperjaxb3/hyperjaxb3-ejb-runtime/0.5.4/hyperjaxb3-ejb-runtime-0.5.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/imagej/imagej/1.4.1.e/imagej-1.4.1.e.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/JAI-Adapter/0.9.5/JAI-Adapter-0.9.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/jai_codec/1.1.2_01/jai_codec-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/cup/java-cup/0.11a/java-cup-0.11a.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/jaxb2-basics-runtime/0.5.2/jaxb2-basics-runtime-0.5.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/1.2.1.GA/jaxrs-api-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.0.4.GA/jboss-common-4.0.4.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.2.SP1/jboss-remoting-2.2.2.SP1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" sourcepath="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1H.7/jetty-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1H.7/jetty-util-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/joda-time/joda-time/1.6/joda-time-1.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.27/jsch-0.1.27-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/metadata-extractor/2.3.1/metadata-extractor-2.3.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/media/mlib_jai/1.1.2_01/mlib_jai-1.1.2_01.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.5/mysql-connector-java-5.1.5.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/common/nuxeo-common/1.6.2/nuxeo-common-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core/1.6.2/nuxeo-core-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-api/1.6.2/nuxeo-core-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-client/1.6.2/nuxeo-core-client-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-convert-api/1.6.2/nuxeo-core-convert-api-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-event/1.6.2/nuxeo-core-event-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-facade/1.6.2/nuxeo-core-facade-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-io/1.6.2/nuxeo-core-io-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-query/1.6.2/nuxeo-core-query-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-schema/1.6.2/nuxeo-core-schema-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/core/nuxeo-core-storage-sql/1.6.2/nuxeo-core-storage-sql-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-commandline-executor/5.3.2/nuxeo-platform-commandline-executor-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-api/5.3.2/nuxeo-platform-filemanager-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-filemanager-core/5.3.2/nuxeo-platform-filemanager-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-forms-layout-api/5.3.2/nuxeo-platform-forms-layout-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-api/5.3.2/nuxeo-platform-imaging-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-imaging-core/5.3.2/nuxeo-platform-imaging-core-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-mimetype-api/5.3.2/nuxeo-platform-mimetype-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-search-api/5.3.2/nuxeo-platform-search-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-types-api/5.3.2/nuxeo-platform-types-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/ecm/platform/nuxeo-platform-versioning-api/5.3.2/nuxeo-platform-versioning-api-5.3.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime/1.6.2/nuxeo-runtime-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-management/1.6.2/nuxeo-runtime-management-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/nuxeo/runtime/nuxeo-runtime-osgi/1.6.2/nuxeo-runtime-osgi-1.6.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/net/java/dev/mistral/Operations/0.9.5/Operations-0.9.5.jar"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.3rdparty.nuxeo.quote-api"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.common"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.contact.client"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.contact.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.hyperjaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/restlet/org.restlet/1.0.7/org.restlet-1.0.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/relaxngDatatype/1.0/relaxngDatatype-1.0.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/1.2.1.GA/resteasy-jaxb-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA.jar" sourcepath="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/1.2.1.GA/resteasy-jaxrs-1.2.1.GA-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-multipart-provider/1.2.1.GA/resteasy-multipart-provider-1.2.1.GA.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1H.7/servlet-api-2.5-6.1H.7.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-api/2.4.3/surefire-api-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3.jar" sourcepath="M2_REPO/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/surefire/surefire-booter/2.4.3/surefire-booter-2.4.3-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/xsom/20060306/xsom-20060306.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
 </classpath>
\ No newline at end of file
index 97e7939d069a5f96d48388cc326d5f177f7f04a3..ae6b995bf9553dd1f6e66876a405f4dd0117b6fa 100644 (file)
@@ -1,9 +1,13 @@
 <projectDescription>\r
   <name>org.collectionspace.services.contact.service</name>\r
-  <comment/>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
   <projects>\r
-    <project>org.collectionspace.services.contact.jaxb</project>\r
+    <project>org.collectionspace.services.3rdparty.nuxeo.quote-api</project>\r
+    <project>org.collectionspace.services.client</project>\r
     <project>org.collectionspace.services.common</project>\r
+    <project>org.collectionspace.services.contact.client</project>\r
+    <project>org.collectionspace.services.contact.jaxb</project>\r
+    <project>org.collectionspace.services.hyperjaxb</project>\r
     <project>org.collectionspace.services.jaxb</project>\r
   </projects>\r
   <buildSpec>\r
index 102b21148f8ebf14fcbce04fe32e3eb2331e6689..6f53aa677fff901b7bde79b9694a993b4c026b02 100644 (file)
             <artifactId>org.collectionspace.services.contact.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.contact.client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
index 19971c8ee51294863bcdd3b92e5e7f4be7c3d887..b2fe3d3d689dad11d04bc4302936985dc69341f1 100644 (file)
@@ -23,7 +23,7 @@
  */
 package org.collectionspace.services.contact;
 
-import java.util.List;
+//import java.util.List;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -33,7 +33,7 @@ import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+//import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MultivaluedMap;
@@ -41,54 +41,53 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.vocabulary.AuthorityResource;
-import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
-import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
-import org.collectionspace.services.common.vocabulary.AuthorityResource.Specifier;
-import org.collectionspace.services.common.vocabulary.AuthorityResource.SpecifierForm;
-import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityItemDocumentModelHandler;
-import org.collectionspace.services.common.AbstractMultiPartCollectionSpaceResourceImpl;
-import org.collectionspace.services.common.ClientType;
-import org.collectionspace.services.common.ServiceMain;
-import org.collectionspace.services.common.authorityref.AuthorityRefDocList;
-import org.collectionspace.services.common.authorityref.AuthorityRefList;
-import org.collectionspace.services.common.context.MultipartServiceContextImpl;
-import org.collectionspace.services.common.context.ServiceBindingUtils;
+//import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
+//import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
+//import org.collectionspace.services.common.vocabulary.AuthorityResource.Specifier;
+//import org.collectionspace.services.common.vocabulary.AuthorityResource.SpecifierForm;
+//import org.collectionspace.services.common.vocabulary.nuxeo.AuthorityItemDocumentModelHandler;
+//import org.collectionspace.services.common.AbstractMultiPartCollectionSpaceResourceImpl;
+//import org.collectionspace.services.common.ClientType;
+//import org.collectionspace.services.common.ServiceMain;
+//import org.collectionspace.services.common.authorityref.AuthorityRefDocList;
+//import org.collectionspace.services.common.authorityref.AuthorityRefList;
+//import org.collectionspace.services.common.context.MultipartServiceContextImpl;
+//import org.collectionspace.services.common.context.ServiceBindingUtils;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.BadRequestException;
 import org.collectionspace.services.common.document.DocumentFilter;
 import org.collectionspace.services.common.document.DocumentHandler;
 import org.collectionspace.services.common.document.DocumentNotFoundException;
-import org.collectionspace.services.common.document.DocumentWrapper;
+//import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.contact.ContactResource;
 import org.collectionspace.services.contact.ContactsCommon;
 import org.collectionspace.services.contact.ContactsCommonList;
 import org.collectionspace.services.contact.ContactJAXBSchema;
 import org.collectionspace.services.contact.nuxeo.ContactDocumentModelHandler;
-import org.collectionspace.services.common.repository.RepositoryClient;
+//import org.collectionspace.services.common.repository.RepositoryClient;
 import org.collectionspace.services.common.security.UnauthorizedException;
 import org.collectionspace.services.common.query.IQueryManager;
-import org.collectionspace.services.common.query.QueryManager;
-import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
-import org.jboss.remoting.samples.chat.exceptions.InvalidArgumentException;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
+//import org.collectionspace.services.common.query.QueryManager;
+//import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
+//import org.jboss.remoting.samples.chat.exceptions.InvalidArgumentException;
 import org.jboss.resteasy.util.HttpResponseCodes;
-import org.nuxeo.ecm.core.api.DocumentModel;
+//import org.nuxeo.ecm.core.api.DocumentModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * The Class AuthorityResourceWithContacts.
  */
-@Path("/vocabularies")
-@Consumes("multipart/mixed")
-@Produces("multipart/mixed")
-public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList, AuthItemCommonList, AuthItemHandler> extends 
+@Consumes("application/xml")
+@Produces("application/xml")
+public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList, AuthItemCommonList, AuthItemHandler> extends //FIXME: REM - Why is this resource in this package instead of somewhere in 'common'?
      AuthorityResource<AuthCommon, AuthCommonList, AuthItemCommonList, AuthItemHandler> {
 
     /** The contact resource. */
-    private ContactResource contactResource = new ContactResource();
+    private ContactResource contactResource = new ContactResource(); // Warning: ContactResource is a singleton.
 
     final Logger logger = LoggerFactory.getLogger(AuthorityResourceWithContacts.class);
 
@@ -125,7 +124,7 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
      * @throws Exception the exception
      */
     private DocumentHandler createContactDocumentHandler(
-               ServiceContext<MultipartInput, MultipartOutput> ctx, String inAuthority,
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx, String inAuthority,
             String inItem) throws Exception {
        
        ContactDocumentModelHandler docHandler = (ContactDocumentModelHandler)createDocumentHandler(
@@ -150,14 +149,15 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
     public Response createContact(
             @PathParam("parentcsid") String parentspecifier,
             @PathParam("itemcsid") String itemspecifier,
-            MultipartInput input) {
+            String xmlPayload) {
         try {
+               PoxPayloadIn input = new PoxPayloadIn(xmlPayload);
                        Specifier parentSpec = getSpecifier(parentspecifier, 
                                        "createContact(authority)", "CREATE_ITEM_CONTACT");
                        Specifier itemSpec = getSpecifier(itemspecifier, 
                                        "createContact(item)", "CREATE_ITEM_CONTACT");
                        // Note that we have to create the service context for the Items, not the main service
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -237,7 +237,7 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
                        Specifier itemSpec = getSpecifier(itemspecifier, 
                                        "getContactList(item)", "GET_CONTACT_LIST");
                        // Note that we have to create the service context for the Items, not the main service
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -303,18 +303,18 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
      */
     @GET
     @Path("{parentcsid}/items/{itemcsid}/contacts/{csid}")
-    public MultipartOutput getContact(
+    public String getContact(
             @PathParam("parentcsid") String parentspecifier,
             @PathParam("itemcsid") String itemspecifier,
             @PathParam("csid") String csid) {
-        MultipartOutput result = null;
+       PoxPayloadOut result = null;
         try {
                        Specifier parentSpec = getSpecifier(parentspecifier, 
                                        "getContact(parent)", "GET_ITEM_CONTACT");
                        Specifier itemSpec = getSpecifier(itemspecifier, 
                                        "getContact(item)", "GET_ITEM_CONTACT");
                        // Note that we have to create the service context for the Items, not the main service
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -337,7 +337,7 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
                ctx = createServiceContext(getContactServiceName());
             DocumentHandler handler = createContactDocumentHandler(ctx, parentcsid, itemcsid);
             getRepositoryClient(ctx).get(ctx, csid, handler);
-            result = (MultipartOutput) ctx.getOutput();
+            result = ctx.getOutput();
         } catch (UnauthorizedException ue) {
             Response response = Response.status(
                     Response.Status.UNAUTHORIZED).entity("Get failed reason " + ue.getErrorReason()).type("text/plain").build();
@@ -367,7 +367,7 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
                 .type("text/plain").build();
             throw new WebApplicationException(response);
         }
-        return result;
+        return result.toXML();
 
     }
 
@@ -383,19 +383,20 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
      */
     @PUT
     @Path("{parentcsid}/items/{itemcsid}/contacts/{csid}")
-    public MultipartOutput updateContact(
+    public String updateContact(
             @PathParam("parentcsid") String parentspecifier,
             @PathParam("itemcsid") String itemspecifier,
             @PathParam("csid") String csid,
-            MultipartInput theUpdate) {
-        MultipartOutput result = null;
+            String xmlPayload) {
+       PoxPayloadOut result = null;
         try {
+               PoxPayloadIn theUpdate = new PoxPayloadIn(xmlPayload);
                        Specifier parentSpec = getSpecifier(parentspecifier, 
                                        "updateContact(authority)", "UPDATE_CONTACT");
                        Specifier itemSpec = getSpecifier(itemspecifier, 
                                        "updateContact(item)", "UPDATE_CONTACT");
                        // Note that we have to create the service context for the Items, not the main service
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
@@ -418,7 +419,7 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
                ctx = createServiceContext(getContactServiceName(), theUpdate);
             DocumentHandler handler = createContactDocumentHandler(ctx, parentcsid, itemcsid);
             getRepositoryClient(ctx).update(ctx, csid, handler);
-            result = (MultipartOutput) ctx.getOutput();
+            result = ctx.getOutput();
         } catch (BadRequestException bre) {
             Response response = Response.status(
                     Response.Status.BAD_REQUEST).entity("Create failed reason " + bre.getErrorReason()).type("text/plain").build();
@@ -442,7 +443,7 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
                     Response.Status.INTERNAL_SERVER_ERROR).entity("Update failed").type("text/plain").build();
             throw new WebApplicationException(response);
         }
-        return result;
+        return result.toXML();
     }
 
     /**
@@ -466,7 +467,7 @@ public abstract class AuthorityResourceWithContacts<AuthCommon, AuthCommonList,
                        Specifier itemSpec = getSpecifier(itemspecifier, 
                                        "deleteContact(item)", "DELETE_CONTACT");
                        // Note that we have to create the service context for the Items, not the main service
-            ServiceContext<MultipartInput, MultipartOutput> ctx = null;
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = null;
                        String parentcsid;
                        if(parentSpec.form==SpecifierForm.CSID) {
                                parentcsid = parentSpec.value;
index 438e59e00b04d139ee3d64e746081afb138f9e90..774b19ba0f8ddb38fd328b1333331311c1c9833f 100644 (file)
@@ -38,6 +38,9 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
+import org.collectionspace.services.client.ContactClient;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.common.AbstractMultiPartCollectionSpaceResourceImpl;
 import org.collectionspace.services.common.ClientType;
 import org.collectionspace.services.common.ServiceMain;
@@ -45,9 +48,6 @@ import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.document.DocumentHandler;
 
-
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.util.HttpResponseCodes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,17 +55,16 @@ import org.slf4j.LoggerFactory;
 /**
  * The Class ContactResource.
  */
-@Path("/contacts")
-@Consumes("multipart/mixed")
-@Produces("multipart/mixed")
+@Path(ContactClient.SERVICE_PATH)
+@Consumes("application/xml")
+@Produces("application/xml")
 public class ContactResource extends 
                AbstractMultiPartCollectionSpaceResourceImpl {
-
-    /** The Constant serviceName. */
-    private final static String serviceName = "contacts";
-    
-    /** The logger. */
+       //
+    // The logger init
+       //
     final Logger logger = LoggerFactory.getLogger(ContactResource.class);
+    
     //FIXME retrieve client type from configuration
     /** The Constant CLIENT_TYPE. */
     final static ClientType CLIENT_TYPE = ServiceMain.getInstance().getClientType();
@@ -92,7 +91,7 @@ public class ContactResource extends
      */
     @Override
     public String getServiceName() {
-        return serviceName;
+        return ContactClient.SERVICE_NAME;
     }
 
     /* (non-Javadoc)
@@ -103,7 +102,7 @@ public class ContactResource extends
        return ContactsCommon.class;
     }
     
-//    @Override
+//    @Override  //FIXME: REM - Remove this dead code please
 //    public DocumentHandler createDocumentHandler(ServiceContext ctx) throws Exception {
 //        DocumentHandler docHandler = ctx.getDocumentHandler();
 //        if (ctx.getInput() != null) {
@@ -117,15 +116,15 @@ public class ContactResource extends
 
     /**
  * Creates the contact.
- * 
- * @param input the input
- * 
+     *
+     * @param xmlPayload the xml payload
  * @return the response
  */
-@POST
-    public Response createContact(MultipartInput input) {
+    @POST
+    public Response createContact(String xmlPayload) {
         try {
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(input);
+               PoxPayloadIn input = new PoxPayloadIn(xmlPayload);
+               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(input);
             DocumentHandler handler = createDocumentHandler(ctx);
             String csid = getRepositoryClient(ctx).create(ctx, handler);
             //contactObject.setCsid(csid);
@@ -152,24 +151,24 @@ public class ContactResource extends
      */
     @GET
     @Path("{csid}")
-    public MultipartOutput getContact(
+    public String getContact(
             @PathParam("csid") String csid) {
         if (logger.isDebugEnabled()) {
             logger.debug("getContact with csid=" + csid);
         }
-        if (csid == null || "".equals(csid)) {
+        if (csid == null || "".equals(csid)) {  //FIXME: REM - This is a silly check?  We can't reach this resource if CSID is blank in the URL
             logger.error("getContact: missing csid!");
             Response response = Response.status(Response.Status.BAD_REQUEST).entity(
                     "Get failed on Contact csid=" + csid).type(
                     "text/plain").build();
             throw new WebApplicationException(response);
         }
-        MultipartOutput result = null;
+        PoxPayloadOut result = null;
         try {
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
             DocumentHandler handler = createDocumentHandler(ctx);
             getRepositoryClient(ctx).get(ctx, csid, handler);
-            result = (MultipartOutput) ctx.getOutput();
+            result = ctx.getOutput();
         } catch (DocumentNotFoundException dnfe) {
             if (logger.isDebugEnabled()) {
                 logger.debug("getContact", dnfe);
@@ -192,7 +191,7 @@ public class ContactResource extends
                     "text/plain").build();
             throw new WebApplicationException(response);
         }
-        return result;
+        return result.toXML();
     }
 
     /**
@@ -208,7 +207,7 @@ public class ContactResource extends
        MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
         ContactsCommonList contactObjectList = new ContactsCommonList();
         try {
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(queryParams);
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);
             DocumentHandler handler = createDocumentHandler(ctx);
             getRepositoryClient(ctx).getFiltered(ctx, handler);
             contactObjectList = (ContactsCommonList) handler.getCommonPartList();
@@ -233,25 +232,26 @@ public class ContactResource extends
      */
     @PUT
     @Path("{csid}")
-    public MultipartOutput updateContact(
+    public String updateContact(
             @PathParam("csid") String csid,
-            MultipartInput theUpdate) {
+            String xmlPayload) {
         if (logger.isDebugEnabled()) {
             logger.debug("updateContact with csid=" + csid);
         }
-        if (csid == null || "".equals(csid)) {
+        if (csid == null || "".equals(csid)) {//FIXME: REM - This is a silly check?  We can't reach this resource if CSID is blank in the URL.
             logger.error("updateContact: missing csid!");
             Response response = Response.status(Response.Status.BAD_REQUEST).entity(
                     "update failed on Contact csid=" + csid).type(
                     "text/plain").build();
             throw new WebApplicationException(response);
         }
-        MultipartOutput result = null;
+        PoxPayloadOut result = null;
         try {
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(theUpdate);
+               PoxPayloadIn theUpdate = new PoxPayloadIn(xmlPayload);
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(theUpdate);
             DocumentHandler handler = createDocumentHandler(ctx);
             getRepositoryClient(ctx).update(ctx, csid, handler);
-            result = (MultipartOutput) ctx.getOutput();
+            result = ctx.getOutput();
         } catch (DocumentNotFoundException dnfe) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Caught exception in updateContact", dnfe);
@@ -265,7 +265,7 @@ public class ContactResource extends
                     Response.Status.INTERNAL_SERVER_ERROR).entity("Update failed").type("text/plain").build();
             throw new WebApplicationException(response);
         }
-        return result;
+        return result.toXML();
     }
 
     /**
@@ -290,7 +290,7 @@ public class ContactResource extends
             throw new WebApplicationException(response);
         }
         try {
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
             getRepositoryClient(ctx).delete(ctx, csid);
             return Response.status(HttpResponseCodes.SC_OK).build();
         } catch (DocumentNotFoundException dnfe) {
index 557f8a4e07f9616882b7ea73418b64a2bb068cb6..2ffc8054631eb713ba184da72a4ef656e5122b2c 100644 (file)
@@ -1,10 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="target/generated-sources/xjc"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>\r
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>\r
+  <classpathentry kind="src" path="target/generated-sources/xjc"/>\r
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>\r
        <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.1/jaxb-xjc-2.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0.jar" sourcepath="M2_REPO/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2-commons/property-listener-injector/1.0/property-listener-injector-1.0-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4.jar" sourcepath="M2_REPO/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-sources.jar">\r
+    <attributes>\r
+      <attribute value="jar:file:/C:/Documents%20and%20Settings/remillet/.m2/repository/org/jvnet/jaxb2_commons/runtime/0.4.1.4/runtime-0.4.1.4-javadoc.jar!/" name="javadoc_location"/>\r
+    </attributes>\r
+  </classpathentry>\r
+  <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.6/testng-5.6-jdk15.jar"/>\r
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+</classpath>
\ No newline at end of file
index a0fdd4162f182c2c7a16a2f941aa39ea9ba8b19e..fabf3e79fcc89be1d8606b92fb27ee6fee97e1a6 100644 (file)
@@ -1,23 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
        <name>org.collectionspace.services.jaxb</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
+  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>\r
+  <projects/>\r
        <buildSpec>\r
                <buildCommand>\r
                        <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
                <buildCommand>\r
                        <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
                </buildCommand>\r
        </buildSpec>\r
        <natures>\r
                <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
                <nature>org.eclipse.jdt.core.javanature</nature>\r
        </natures>\r
-</projectDescription>\r
+</projectDescription>
\ No newline at end of file
index 179c3750aa029d9ffacdae501c2344be52a029b5..97c7be065ca409fd4fdc5a96e00056aa345a0788 100644 (file)
@@ -1,9 +1,9 @@
-#Tue Dec 21 10:13:02 PST 2010\r
+#Wed Jan 19 22:49:22 PST 2011\r
 activeProfiles=\r
 eclipse.preferences.version=1\r
-fullBuildGoals=process-classes\r
+fullBuildGoals=process-test-resources\r
 includeModules=false\r
 resolveWorkspaceProjects=true\r
-resourceFilterGoals=process-classes\r
-skipCompilerPlugin=false\r
+resourceFilterGoals=process-resources resources\:testResources\r
+skipCompilerPlugin=true\r
 version=1\r