CSPACE-3711, CSPACE-3706, CSPACE-3708, CSPACE-3496, CSPACE-3483: Working on problem...

diff --git a/services/common/pom.xml b/services/common/pom.xml
index e88c15485a3eb48cf66b7edbc4267601f9b8374c..15cf4daff01826b50fb6044f680d4698abf04106 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -13,7 +13,6 @@
     <packaging>jar</packaging>\r
 \r
     <dependencies>\r
-\r
         <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
@@ -268,7 +267,7 @@
             <version>4.1.0</version>\r
         </dependency>\r
 \r
-        <!-- fixme remove restlet dependencies once REST client is no more used -->\r
+        <!-- fixme remove restlet dependencies once REST client is no longer  used -->\r
         <dependency>\r
             <groupId>org.restlet</groupId>\r
             <artifactId>org.restlet</artifactId>\r
@@ -284,13 +283,6 @@
             <artifactId>com.noelios.restlet</artifactId>\r
             <version>1.0.7</version>\r
         </dependency>\r
-\r
-        <!--fixme where is jaxen needed? -->\r
-<!--        <dependency>\r
-            <groupId>jaxen</groupId>\r
-            <artifactId>jaxen</artifactId>\r
-            <version>1.1.1</version>\r
-        </dependency> -->\r
                <dependency>\r
                    <groupId>commons-fileupload</groupId>\r
                    <artifactId>commons-fileupload</artifactId>\r
@@ -301,6 +293,7 @@
 \r
     <build>\r
         <finalName>collectionspace-services-common</finalName>\r
+       <defaultGoal>install</defaultGoal>\r
         <plugins>\r
             <plugin>\r
                 <groupId>org.jvnet.jaxb2.maven2</groupId>\r

diff --git a/services/jaxb/src/main/resources/AbstractCommonList.xsd b/services/jaxb/src/main/resources/AbstractCommonList.xsd
index 59e16d7739d72dd0e6a23961d91edcc9edbf346b..942c5fb2cc990a51852a945a98a65618ee45db02 100644 (file)
--- a/services/jaxb/src/main/resources/AbstractCommonList.xsd
+++ b/services/jaxb/src/main/resources/AbstractCommonList.xsd
@@ -3,7 +3,11 @@
     $LastChangedRevision: 1341 $
     $LastChangedDate: 2010-02-15 22:01:55 -0800 (Mon, 15 Feb 2010) $
 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://collectionspace.org/services/jaxb" xmlns="http://collectionspace.org/services/jaxb" targetNamespace="http://collectionspace.org/services/jaxb" version="0.6">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+       xmlns:ns="http://collectionspace.org/services/jaxb" 
+       xmlns="http://collectionspace.org/services/jaxb" 
+       targetNamespace="http://collectionspace.org/services/jaxb" version="0.6">
+       
        <xs:element name="abstract-common-list">
                <xs:complexType>
                        <xs:sequence>

diff --git a/services/jaxb/src/main/resources/authorityrefdocs.xsd b/services/jaxb/src/main/resources/authorityrefdocs.xsd
index 5cd4aa6cdcfe4108f9327a8772fcca1a8625e6c2..76f5c4f1711a621e7ab1c965384bce9057aa6c95 100644 (file)
--- a/services/jaxb/src/main/resources/authorityrefdocs.xsd
+++ b/services/jaxb/src/main/resources/authorityrefdocs.xsd
@@ -25,20 +25,18 @@
        >
 
     <!-- This is the base class for paginated lists -->
-       <!--
-    <xs:complexType name="abstractCommonList">
+    <xs:complexType name="abstractCommonList2">
         <xs:annotation>
             <xs:appinfo>
                 <jaxb:class ref="org.collectionspace.services.jaxb.AbstractCommonList"/>
             </xs:appinfo>
         </xs:annotation>
     </xs:complexType>
-    -->
 
        <xs:element name="authority-ref-doc-list">
                <xs:complexType>
             <xs:complexContent>
-                <xs:extension base="abstractCommonList">
+                <xs:extension base="abstractCommonList2">
                                        <xs:sequence>
                                                 <xs:element name="authority-ref-doc-item" maxOccurs="unbounded">
                                                        <xs:complexType>