CSPACE-3574: Merging Plain Old XML payload work into trunk.

diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/.classpath b/services/note/3rdparty/nuxeo-platform-cs-note/.classpath
index 199bbbbdbabba5e7cbae0d055b2ea2d981077cfc..6fd3b85515a211ec87f389f4ff71cbb33c4c6db3 100644 (file)
--- a/services/note/3rdparty/nuxeo-platform-cs-note/.classpath
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/.classpath
@@ -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

diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/.project b/services/note/3rdparty/nuxeo-platform-cs-note/.project
index 65504f9a52050243aebe3076b6be20a0af1be8ae..5dbb76fb8cbbf77ce0a074fe799746818641d729 100644 (file)
--- a/services/note/3rdparty/nuxeo-platform-cs-note/.project
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/.project
@@ -1,6 +1,6 @@
 <projectDescription>\r
   <name>org.collectionspace.services.note.3rdparty.nuxeo</name>\r
-  <comment>Note Nuxeo Document Type</comment>\r
+  <comment>note 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
@@ -14,4 +14,4 @@
     <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

diff --git a/services/note/client/.project b/services/note/client/.project
index 7dc76b048fd74773ebc70640b6d250ca1a7f0650..3660ba30eee8777d39e0a35e71b3d5a9dc4513af 100644 (file)
--- a/services/note/client/.project
+++ b/services/note/client/.project
@@ -1,9 +1,9 @@
 <projectDescription>\r
   <name>org.collectionspace.services.note.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.jaxb</project>\r
        <project>org.collectionspace.services.note.jaxb</project>\r
   </projects>\r
   <buildSpec>\r
@@ -18,4 +18,4 @@
     <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

diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml
index 4885629a86418aa6abbaa21552390d039038457a..c91e3d5c15d502a817ca59a6bfe3f6bc9de5182a 100644 (file)
--- a/services/note/client/pom.xml
+++ b/services/note/client/pom.xml
@@ -34,7 +34,20 @@
             <artifactId>org.collectionspace.services.client</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <optional>true</optional>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+\r
         <!-- External dependencies -->\r
+        <dependency>\r
+            <groupId>dom4j</groupId>\r
+            <artifactId>dom4j</artifactId>\r
+            <version>1.6.1</version>\r
+            <scope>provided</scope>\r
+        </dependency>        \r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/note/client/src/main/java/org/collectionspace/services/client/NoteClient.java b/services/note/client/src/main/java/org/collectionspace/services/client/NoteClient.java
index 39e69729cfb7701c9cbdf388f9d0ccf04ed64e36..6e026b4aeec0fc21695851240de687e2f39d089c 100644 (file)
--- a/services/note/client/src/main/java/org/collectionspace/services/client/NoteClient.java
+++ b/services/note/client/src/main/java/org/collectionspace/services/client/NoteClient.java
@@ -24,8 +24,6 @@ import org.jboss.resteasy.client.ProxyFactory;
 import org.jboss.resteasy.plugins.providers.RegisterBuiltin;\r
 import org.jboss.resteasy.client.ClientResponse;\r
 import org.jboss.resteasy.client.core.executors.ApacheHttpClientExecutor;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;\r
 import org.jboss.resteasy.spi.ResteasyProviderFactory;\r
 \r
 /**\r
@@ -37,22 +35,9 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
  \r
 public class NoteClient extends AbstractServiceClientImpl {\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent()\r
-        */\r
-       public String getServicePathComponent() {\r
-               return "notes";\r
-       }\r
-\r
-       /**\r
-     *\r
-     */\r
-//    private static final NoteClient instance = new NoteClient();\r
-    \r
-    /**\r
-     *\r
-     */\r
     private NoteProxy noteProxy;\r
+    public static final String SERVICE_NAME = "notes";\r
+    public static final String SERVICE_PATH_COMPONENT = "notes";\r
 \r
     /**\r
      *\r
@@ -65,6 +50,19 @@ public class NoteClient extends AbstractServiceClientImpl {
         setProxy();\r
     }\r
 \r
+    @Override\r
+    public String getServiceName() {\r
+            return SERVICE_NAME;\r
+    }\r
+\r
+    /* (non-Javadoc)\r
+     * @see org.collectionspace.services.client.BaseServiceClient#getServicePathComponent()\r
+     */\r
+    @Override\r
+    public String getServicePathComponent() {\r
+            return SERVICE_PATH_COMPONENT;\r
+    }\r
+\r
     @Override\r
     public CollectionSpaceProxy getProxy() {\r
        return this.noteProxy;\r
@@ -83,15 +81,6 @@ public class NoteClient extends AbstractServiceClientImpl {
         }\r
     }\r
 \r
-    /**\r
-     * FIXME Comment this\r
-     *\r
-     * @return\r
-     */\r
-//    public static NoteClient getInstance() {\r
-//        return instance;\r
-//    }\r
-\r
     /**\r
      * @return\r
      * @see org.collectionspace.services.client.Note#getNote()\r
@@ -106,27 +95,30 @@ public class NoteClient extends AbstractServiceClientImpl {
      * @see org.collectionspace.services.client.Note#getNote(java.lang.String)\r
      */\r
 \r
-    public ClientResponse<MultipartInput> read(String csid) {\r
+    public ClientResponse<String> read(String csid) {\r
         return noteProxy.read(csid);\r
     }\r
 \r
     /**\r
+     * @param multipart\r
      * @param note\r
      * @return\r
      * @see org.collectionspace.services.client.Note#createNote(org.collectionspace.services.Note)\r
      */\r
-    public ClientResponse<Response> create(MultipartOutput multipart) {\r
-        return noteProxy.create(multipart);\r
+    public ClientResponse<Response> create(PoxPayloadOut multipart) {\r
+        String payload = multipart.toXML();\r
+        return noteProxy.create(payload);\r
     }\r
 \r
     /**\r
      * @param csid\r
-     * @param note\r
+     * @param multipart\r
      * @return\r
      * @see org.collectionspace.services.client.Note#updateNote(java.lang.Long, org.collectionspace.services.Note)\r
      */\r
-    public ClientResponse<MultipartInput> update(String csid, MultipartOutput multipart) {\r
-        return noteProxy.update(csid, multipart);\r
+    public ClientResponse<String> update(String csid, PoxPayloadOut multipart) {\r
+        String payload = multipart.toXML();\r
+        return noteProxy.update(csid, payload);\r
 \r
     }\r
 \r
@@ -135,6 +127,7 @@ public class NoteClient extends AbstractServiceClientImpl {
      * @return\r
      * @see org.collectionspace.services.client.Note#deleteNote(java.lang.Long)\r
      */\r
+    @Override\r
     public ClientResponse<Response> delete(String csid) {\r
         return noteProxy.delete(csid);\r
     }\r

diff --git a/services/note/client/src/main/java/org/collectionspace/services/client/NoteClientUtils.java b/services/note/client/src/main/java/org/collectionspace/services/client/NoteClientUtils.java
index 6422f8b29afdda07807222f70d3611bfa51ff7d4..8d08dd4528ffd75a722e035d4a802d070d67aeb2 100644 (file)
--- a/services/note/client/src/main/java/org/collectionspace/services/client/NoteClientUtils.java
+++ b/services/note/client/src/main/java/org/collectionspace/services/client/NoteClientUtils.java
@@ -2,10 +2,7 @@ package org.collectionspace.services.client;
 \r
 import javax.ws.rs.core.MediaType;\r
 \r
-import org.collectionspace.services.client.NoteClient;\r
 import org.collectionspace.services.note.NotesCommon;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;\r
-import org.jboss.resteasy.plugins.providers.multipart.OutputPart;\r
 \r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
@@ -15,7 +12,9 @@ public class NoteClientUtils {
     private static final Logger logger =\r
         LoggerFactory.getLogger(NoteClientUtils.class);\r
 \r
-    public static MultipartOutput createNoteInstance(\r
+    private static final String SERVICE_PATH_COMPONENT = "notes";\r
+  \r
+    public static PoxPayloadOut createNoteInstance (\r
         String owner, String identifier, String headerLabel) {\r
         return createNoteInstance(\r
             owner,\r
@@ -26,21 +25,21 @@ public class NoteClientUtils {
             headerLabel);\r
     }\r
 \r
-    public static MultipartOutput createNoteInstance(\r
+    public static PoxPayloadOut createNoteInstance(\r
         String owner, boolean isPrimary, int order,\r
         String content, String author, String date, String headerLabel) {\r
-        NotesCommon note = new NotesCommon();\r
-        note.setOwner(owner);\r
-        note.setIsPrimary(isPrimary);\r
-        note.setOrder(order);\r
-        note.setContent(content);\r
-        note.setAuthor(author);\r
-        note.setDate(date);\r
-        MultipartOutput multipart = new MultipartOutput();\r
-        OutputPart commonPart =\r
-            multipart.addPart(note, MediaType.APPLICATION_XML_TYPE);\r
-        NoteClient client = new NoteClient();\r
-        commonPart.getHeaders().add("label", headerLabel);\r
+        NotesCommon noteCommon = new NotesCommon();\r
+        noteCommon.setOwner(owner);\r
+        noteCommon.setIsPrimary(isPrimary);\r
+        noteCommon.setOrder(order);\r
+        noteCommon.setContent(content);\r
+        noteCommon.setAuthor(author);\r
+        noteCommon.setDate(date);\r
+\r
+        PoxPayloadOut multipart = new PoxPayloadOut(getServicePathComponent());\r
+        PayloadOutputPart commonPart =\r
+                multipart.addPart(noteCommon, MediaType.APPLICATION_XML_TYPE);\r
+        commonPart.setLabel(new NoteClient().getCommonPartName());\r
 \r
         if(logger.isDebugEnabled()){\r
             logger.debug("to be created, note common");\r
@@ -50,5 +49,8 @@ public class NoteClientUtils {
         return multipart;\r
     }\r
 \r
+    public static String getServicePathComponent() {\r
+        return SERVICE_PATH_COMPONENT;\r
+    }\r
 \r
 }\r

diff --git a/services/note/client/src/main/java/org/collectionspace/services/client/NoteProxy.java b/services/note/client/src/main/java/org/collectionspace/services/client/NoteProxy.java
index 6d05d6800eb8b34f96392ba0cb2a6fb61c0188d4..b5788776af2996a247b0938cbc8cc2f7fada07de 100644 (file)
--- a/services/note/client/src/main/java/org/collectionspace/services/client/NoteProxy.java
+++ b/services/note/client/src/main/java/org/collectionspace/services/client/NoteProxy.java
@@ -12,15 +12,13 @@ import javax.ws.rs.core.Response;
 \r
 import org.collectionspace.services.note.NotesCommonList;\r
 import org.jboss.resteasy.client.ClientResponse;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;\r
 \r
 /**\r
  * @version $Revision:$\r
  */\r
 @Path("/notes/")\r
-@Produces({"multipart/mixed"})\r
-@Consumes({"multipart/mixed"})\r
+@Produces({"application/xml;charset=UTF-8"})\r
+@Consumes({"application/xml"})\r
 public interface NoteProxy extends CollectionSpaceProxy {\r
 \r
     @GET\r
@@ -29,17 +27,17 @@ public interface NoteProxy extends CollectionSpaceProxy {
 \r
     //(C)reate\r
     @POST\r
-    ClientResponse<Response> create(MultipartOutput multipart);\r
+    ClientResponse<Response> create(String payload);\r
 \r
     //(R)ead\r
     @GET\r
     @Path("/{csid}")\r
-    ClientResponse<MultipartInput> read(@PathParam("csid") String csid);\r
+    ClientResponse<String> read(@PathParam("csid") String csid);\r
 \r
     //(U)pdate\r
     @PUT\r
     @Path("/{csid}")\r
-    ClientResponse<MultipartInput> update(@PathParam("csid") String csid, MultipartOutput multipart);\r
+    ClientResponse<String> update(@PathParam("csid") String csid, String payload);\r
 \r
     //(D)elete\r
     @DELETE\r

diff --git a/services/note/client/src/test/java/org/collectionspace/services/client/test/NoteServiceTest.java b/services/note/client/src/test/java/org/collectionspace/services/client/test/NoteServiceTest.java
index 427bf6fab3a5f93b97b20cf62e06c3f347defee4..0c47c7f8f6f607f77d0b55275262599aee35f288 100644 (file)
--- a/services/note/client/src/test/java/org/collectionspace/services/client/test/NoteServiceTest.java
+++ b/services/note/client/src/test/java/org/collectionspace/services/client/test/NoteServiceTest.java
@@ -24,21 +24,23 @@ package org.collectionspace.services.client.test;
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
-import javax.ws.rs.core.MediaType;\r
-import javax.ws.rs.core.Response;\r
 \r
 import org.collectionspace.services.client.CollectionSpaceClient;\r
 import org.collectionspace.services.client.NoteClient;\r
 import org.collectionspace.services.client.NoteClientUtils;\r
+import org.collectionspace.services.client.PayloadInputPart;\r
+import org.collectionspace.services.client.PayloadOutputPart;\r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.note.NotesCommon;\r
 import org.collectionspace.services.note.NotesCommonList;\r
 import org.collectionspace.services.jaxb.AbstractCommonList;\r
 \r
+import javax.ws.rs.core.MediaType;\r
+import javax.ws.rs.core.Response;\r
 import org.jboss.resteasy.client.ClientResponse;\r
+import org.dom4j.DocumentException;\r
 \r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;\r
-import org.jboss.resteasy.plugins.providers.multipart.OutputPart;\r
 import org.testng.Assert;\r
 import org.testng.annotations.AfterClass;\r
 import org.testng.annotations.Test;\r
@@ -58,8 +60,10 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
     private final String CLASS_NAME = NoteServiceTest.class.getName();\r
     private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);\r
 \r
+    private final String SERVICE_PATH_COMPONENT = "notes";\r
+    private final String SERVICE_NAME = "notes";\r
+\r
     // Instance variables specific to this test.\r
-    final String SERVICE_PATH_COMPONENT = "notes";\r
     private String knownResourceId = null;\r
 \r
     /* (non-Javadoc)\r
@@ -98,7 +102,7 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
         // Submit the request to the service and store the response.\r
         NoteClient client = new NoteClient();\r
         String identifier = createIdentifier();\r
-        MultipartOutput multipart =\r
+        PoxPayloadOut multipart =\r
             NoteClientUtils.createNoteInstance("owner"+identifier, identifier, \r
                                                                client.getCommonPartName());\r
         ClientResponse<Response> res = client.create(multipart);\r
@@ -177,7 +181,7 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
 \r
         // Submit the request to the service and store the response.\r
         NoteClient client = new NoteClient();\r
-        ClientResponse<MultipartInput> res = client.read(knownResourceId);\r
+        ClientResponse<String> res = client.read(knownResourceId);\r
         int statusCode = res.getStatus();\r
 \r
         // Check the status code of the response: does it match\r
@@ -189,10 +193,14 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
                 invalidStatusCodeMessage(REQUEST_TYPE, statusCode));\r
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);\r
 \r
-        MultipartInput input = (MultipartInput) res.getEntity();\r
-        NotesCommon note = (NotesCommon) extractPart(input,\r
-                client.getCommonPartName(), NotesCommon.class);\r
-        Assert.assertNotNull(note);\r
+        // Get the common part of the response and verify that it is not null.\r
+        PoxPayloadIn input = new PoxPayloadIn(res.getEntity());\r
+        PayloadInputPart payloadInputPart = input.getPart(client.getCommonPartName());\r
+        NotesCommon noteCommon = null;\r
+        if (payloadInputPart != null) {\r
+               noteCommon = (NotesCommon) payloadInputPart.getBody();\r
+    }\r
+        Assert.assertNotNull(noteCommon);\r
     }\r
 \r
     // Failure outcomes\r
@@ -209,7 +217,7 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
 \r
         // Submit the request to the service and store the response.\r
         NoteClient client = new NoteClient();\r
-        ClientResponse<MultipartInput> res = client.read(NON_EXISTENT_ID);\r
+        ClientResponse<String> res = client.read(NON_EXISTENT_ID);\r
         int statusCode = res.getStatus();\r
 \r
         // Check the status code of the response: does it match\r
@@ -290,36 +298,41 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
 \r
         // Submit the request to the service and store the response.\r
         NoteClient client = new NoteClient();\r
-        ClientResponse<MultipartInput> res =\r
-                client.read(knownResourceId);\r
+        ClientResponse<String> res = client.read(knownResourceId);\r
         if(logger.isDebugEnabled()){\r
             logger.debug(testName + ": read status = " + res.getStatus());\r
         }\r
         Assert.assertEquals(res.getStatus(), EXPECTED_STATUS_CODE);\r
-\r
         if(logger.isDebugEnabled()){\r
             logger.debug("got object to update with ID: " + knownResourceId);\r
         }\r
-        MultipartInput input = (MultipartInput) res.getEntity();\r
-        NotesCommon note = (NotesCommon) extractPart(input,\r
-                client.getCommonPartName(), NotesCommon.class);\r
-        Assert.assertNotNull(note);\r
-\r
-        // Update the content of this resource, both the subitem, and the content\r
-        note.setContent("updated-" + note.getContent());\r
-        note.setOrder(note.getOrder()+10);\r
+\r
+        // Get the common part of the response and verify that it is not null.\r
+        PoxPayloadIn input = new PoxPayloadIn(res.getEntity());\r
+        PayloadInputPart payloadInputPart = input.getPart(client.getCommonPartName());\r
+        NotesCommon noteCommon = null;\r
+        if (payloadInputPart != null) {\r
+               noteCommon = (NotesCommon) payloadInputPart.getBody();\r
+        }\r
+        Assert.assertNotNull(noteCommon);\r
+\r
+        // Update the common part, both the subitem, and the content\r
+        noteCommon.setContent("updated-" + noteCommon.getContent());\r
+        noteCommon.setOrder(noteCommon.getOrder()+10);\r
         if(logger.isDebugEnabled()){\r
             logger.debug("to be updated object");\r
-            logger.debug(objectAsXmlString(note, NotesCommon.class));\r
+            logger.debug(objectAsXmlString(noteCommon, NotesCommon.class));\r
         }\r
-        // Submit the request to the service and store the response.\r
-        MultipartOutput output = new MultipartOutput();\r
-        OutputPart commonPart = output.addPart(note, MediaType.APPLICATION_XML_TYPE);\r
-        commonPart.getHeaders().add("label", client.getCommonPartName());\r
 \r
+        // Submit the common part in an update request to the service\r
+        // and store the response.\r
+        PoxPayloadOut output = new PoxPayloadOut(this.getServicePathComponent());\r
+        PayloadOutputPart commonPart = output.addPart(noteCommon, MediaType.APPLICATION_XML_TYPE);\r
+        commonPart.setLabel(client.getCommonPartName());\r
         res = client.update(knownResourceId, output);\r
-        int statusCode = res.getStatus();\r
+\r
         // Check the status code of the response: does it match the expected response(s)?\r
+        int statusCode = res.getStatus();\r
         if(logger.isDebugEnabled()){\r
             logger.debug(testName + ": status = " + statusCode);\r
         }\r
@@ -327,16 +340,18 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
                 invalidStatusCodeMessage(REQUEST_TYPE, statusCode));\r
         Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);\r
 \r
+        // Extract the updated common part from the response.\r
+        payloadInputPart = input.getPart(client.getCommonPartName());\r
+        NotesCommon updatedNoteCommon = null;\r
+        if (payloadInputPart != null) {\r
+               updatedNoteCommon = (NotesCommon) payloadInputPart.getBody();\r
+        }\r
+        Assert.assertNotNull(updatedNoteCommon);\r
 \r
-        input = (MultipartInput) res.getEntity();\r
-        NotesCommon updatedNote =\r
-                (NotesCommon) extractPart(input,\r
-                        client.getCommonPartName(), NotesCommon.class);\r
-        Assert.assertNotNull(updatedNote);\r
-\r
-        Assert.assertEquals(updatedNote.getContent(), note.getContent(),\r
+        // Check selected fields in the updated common part.\r
+        Assert.assertEquals(updatedNoteCommon.getContent(), noteCommon.getContent(),\r
                 "Data in updated object did not match submitted data.");\r
-        Assert.assertEquals(updatedNote.getOrder(), note.getOrder(),\r
+        Assert.assertEquals(updatedNoteCommon.getOrder(), noteCommon.getOrder(),\r
                 "Data in updated object (subitem) did not match submitted data.");\r
     }\r
 \r
@@ -377,10 +392,10 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
         // Note: The ID used in this 'create' call may be arbitrary.\r
         // The only relevant ID may be the one used in update(), below.\r
         NoteClient client = new NoteClient();\r
-        MultipartOutput multipart =\r
-                NoteClientUtils.createNoteInstance(NON_EXISTENT_ID, NON_EXISTENT_ID, client.getCommonPartName());\r
-        ClientResponse<MultipartInput> res =\r
-                client.update(NON_EXISTENT_ID, multipart);\r
+        PoxPayloadOut multipart =\r
+                NoteClientUtils.createNoteInstance(\r
+                        NON_EXISTENT_ID, NON_EXISTENT_ID, client.getCommonPartName());\r
+        ClientResponse<String> res = client.update(NON_EXISTENT_ID, multipart);\r
         int statusCode = res.getStatus();\r
 \r
         // Check the status code of the response: does it match\r
@@ -453,6 +468,12 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
     // ---------------------------------------------------------------\r
     // Utility tests : tests of code used in tests above\r
     // ---------------------------------------------------------------\r
+\r
+    @Override\r
+    public String getServiceName() {\r
+        return SERVICE_NAME;\r
+    }\r
+\r
     /**\r
      * Tests the code for manually submitting data that is used by several\r
      * of the methods above.\r
@@ -485,4 +506,5 @@ public class NoteServiceTest extends AbstractServiceTestImpl {
     public String getServicePathComponent() {\r
         return SERVICE_PATH_COMPONENT;\r
     }\r
+\r
 }\r

diff --git a/services/note/jaxb/.classpath b/services/note/jaxb/.classpath
index 1707f3e6fb88893614aa06d54f2339211c0fb104..0d593e17f64eac4731c629bee4d91259e0b2b4f7 100644 (file)
--- a/services/note/jaxb/.classpath
+++ b/services/note/jaxb/.classpath
@@ -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

diff --git a/services/note/jaxb/.project b/services/note/jaxb/.project
index 3148d118996530b9ed349875c9f1218f3ba23f26..cca579f76991795cf358e31c04b652aacae04e8d 100644 (file)
--- a/services/note/jaxb/.project
+++ b/services/note/jaxb/.project
@@ -1,7 +1,9 @@
 <projectDescription>\r
   <name>org.collectionspace.services.note.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
@@ -14,4 +16,4 @@
     <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

diff --git a/services/note/jaxb/.settings/org.maven.ide.eclipse.prefs b/services/note/jaxb/.settings/org.maven.ide.eclipse.prefs
index 841e128b17efe61e1d920e925c2708d9e5e04bea..51e142d700b9f14b61b8451ea25bd2e3f3b31b8f 100644 (file)
--- a/services/note/jaxb/.settings/org.maven.ide.eclipse.prefs
+++ b/services/note/jaxb/.settings/org.maven.ide.eclipse.prefs
@@ -1,9 +1,9 @@
-#Tue Dec 21 10:05:00 PST 2010\r
+#Wed Jan 19 22:49:31 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

diff --git a/services/note/service/.classpath b/services/note/service/.classpath
index 425cd1620f3d44a6c3d1d8c43488a67552f09765..a68042212efa71e65573b523e293b2ed9465d0d2 100644 (file)
--- a/services/note/service/.classpath
+++ b/services/note/service/.classpath
@@ -1,10 +1,303 @@
-<?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.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/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.hyperjaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.jaxb"/>\r
+  <classpathentry kind="src" path="/org.collectionspace.services.note.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-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

diff --git a/services/note/service/.project b/services/note/service/.project
index e58ed0c27dfb1cc122b993184d7eca323b6cedd8..3403c1ac83406c41567353583b17462304565fd0 100644 (file)
--- a/services/note/service/.project
+++ b/services/note/service/.project
@@ -1,10 +1,13 @@
 <projectDescription>\r
   <name>org.collectionspace.services.note.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.note.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.hyperjaxb</project>\r
     <project>org.collectionspace.services.jaxb</project>\r
+    <project>org.collectionspace.services.note.jaxb</project>\r
   </projects>\r
   <buildSpec>\r
     <buildCommand>\r
@@ -18,4 +21,4 @@
     <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

diff --git a/services/note/service/src/main/java/org/collectionspace/services/note/NoteResource.java b/services/note/service/src/main/java/org/collectionspace/services/note/NoteResource.java
index 08752b2189fa846c7739eeddafcf1a32ecd418b4..63894b0269ab8fad8be4ed1b1683ab55949f3837 100644 (file)
--- a/services/note/service/src/main/java/org/collectionspace/services/note/NoteResource.java
+++ b/services/note/service/src/main/java/org/collectionspace/services/note/NoteResource.java
@@ -38,6 +38,8 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;\r
 import javax.ws.rs.core.UriInfo;\r
 \r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.common.AbstractMultiPartCollectionSpaceResourceImpl;\r
 import org.collectionspace.services.common.ClientType;\r
 import org.collectionspace.services.common.ServiceMain;\r
@@ -45,9 +47,6 @@ import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.DocumentNotFoundException;\r
 import org.collectionspace.services.common.document.DocumentHandler;\r
 \r
-\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;\r
 import org.jboss.resteasy.util.HttpResponseCodes;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
@@ -56,8 +55,8 @@ import org.slf4j.LoggerFactory;
  * The Class NoteResource.\r
  */\r
 @Path("/notes")\r
-@Consumes("multipart/mixed")\r
-@Produces("multipart/mixed")\r
+@Consumes("application/xml")\r
+@Produces("application/xml;charset=UTF-8")\r
 public class NoteResource extends \r
                AbstractMultiPartCollectionSpaceResourceImpl {\r
 \r
@@ -112,9 +111,10 @@ public class NoteResource extends
                 * @return the response\r
                 */\r
                @POST\r
-    public Response createNote(MultipartInput input) {\r
+    public Response createNote(String xmlText) {\r
         try {\r
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(input);\r
+            PoxPayloadIn input = new PoxPayloadIn(xmlText);\r
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(input);\r
             DocumentHandler handler = createDocumentHandler(ctx);\r
             String csid = getRepositoryClient(ctx).create(ctx, handler);\r
             UriBuilder path = UriBuilder.fromResource(NoteResource.class);\r
@@ -140,7 +140,7 @@ public class NoteResource extends
      */\r
     @GET\r
     @Path("{csid}")\r
-    public MultipartOutput getNote(\r
+    public String getNote(\r
             @PathParam("csid") String csid) {\r
         if (logger.isDebugEnabled()) {\r
             logger.debug("getNote with csid=" + csid);\r
@@ -152,12 +152,12 @@ public class NoteResource extends
                     "text/plain").build();\r
             throw new WebApplicationException(response);\r
         }\r
-        MultipartOutput result = null;\r
+        PoxPayloadOut result = null;\r
         try {\r
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();\r
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();\r
             DocumentHandler handler = createDocumentHandler(ctx);\r
             getRepositoryClient(ctx).get(ctx, csid, handler);\r
-            result = (MultipartOutput) ctx.getOutput();\r
+            result = ctx.getOutput();\r
         } catch (DocumentNotFoundException dnfe) {\r
             if (logger.isDebugEnabled()) {\r
                 logger.debug("getNote", dnfe);\r
@@ -180,7 +180,7 @@ public class NoteResource extends
                     "text/plain").build();\r
             throw new WebApplicationException(response);\r
         }\r
-        return result;\r
+        return result.toXML();\r
     }\r
 \r
     /**\r
@@ -196,7 +196,7 @@ public class NoteResource extends
        MultivaluedMap<String, String> queryParams = ui.getQueryParameters();\r
         NotesCommonList noteObjectList = new NotesCommonList();\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
             noteObjectList = (NotesCommonList) handler.getCommonPartList();\r
@@ -221,9 +221,9 @@ public class NoteResource extends
      */\r
     @PUT\r
     @Path("{csid}")\r
-    public MultipartOutput updateNote(\r
+    public String updateNote(\r
             @PathParam("csid") String csid,\r
-            MultipartInput theUpdate) {\r
+            String xmlText) {\r
         if (logger.isDebugEnabled()) {\r
             logger.debug("updateNote with csid=" + csid);\r
         }\r
@@ -234,12 +234,13 @@ public class NoteResource extends
                     "text/plain").build();\r
             throw new WebApplicationException(response);\r
         }\r
-        MultipartOutput result = null;\r
+        PoxPayloadOut result = null;\r
         try {\r
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext(theUpdate);\r
+            PoxPayloadIn update = new PoxPayloadIn(xmlText);\r
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(update);\r
             DocumentHandler handler = createDocumentHandler(ctx);\r
             getRepositoryClient(ctx).update(ctx, csid, handler);\r
-            result = (MultipartOutput) ctx.getOutput();\r
+            result = ctx.getOutput();\r
         } catch (DocumentNotFoundException dnfe) {\r
             if (logger.isDebugEnabled()) {\r
                 logger.debug("Caught exception in updateNote", dnfe);\r
@@ -253,7 +254,7 @@ public class NoteResource extends
                     Response.Status.INTERNAL_SERVER_ERROR).entity("Update failed").type("text/plain").build();\r
             throw new WebApplicationException(response);\r
         }\r
-        return result;\r
+        return result.toXML();\r
     }\r
 \r
     /**\r
@@ -278,7 +279,7 @@ public class NoteResource extends
             throw new WebApplicationException(response);\r
         }\r
         try {\r
-            ServiceContext<MultipartInput, MultipartOutput> ctx = createServiceContext();\r
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();\r
             getRepositoryClient(ctx).delete(ctx, csid);\r
             return Response.status(HttpResponseCodes.SC_OK).build();\r
         } catch (DocumentNotFoundException dnfe) {\r