From 63a3a2820f2c8037aae19212dc1cf3584519473a Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 29 Mar 2011 05:15:42 +0000
Subject: [PATCH] CSPACE-3711, CSPACE-3706, CSPACE-3708, CSPACE-3496,
 CSPACE-3483: Working on problem with JAX-B compiler issues with
 AbstractCommonList type declaration.

---
 services/common/pom.xml                               | 11 ++---------
 .../jaxb/src/main/resources/AbstractCommonList.xsd    |  6 +++++-
 services/jaxb/src/main/resources/authorityrefdocs.xsd |  6 ++----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/services/common/pom.xml b/services/common/pom.xml
index e88c15485..15cf4daff 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -13,7 +13,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-
         <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
@@ -268,7 +267,7 @@
             <version>4.1.0</version>
         </dependency>
 
-        <!-- fixme remove restlet dependencies once REST client is no more used -->
+        <!-- fixme remove restlet dependencies once REST client is no longer  used -->
         <dependency>
             <groupId>org.restlet</groupId>
             <artifactId>org.restlet</artifactId>
@@ -284,13 +283,6 @@
             <artifactId>com.noelios.restlet</artifactId>
             <version>1.0.7</version>
         </dependency>
-
-        <!--fixme where is jaxen needed? -->
-<!--        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
-        </dependency> -->
 		<dependency>
 		    <groupId>commons-fileupload</groupId>
 		    <artifactId>commons-fileupload</artifactId>
@@ -301,6 +293,7 @@
 
     <build>
         <finalName>collectionspace-services-common</finalName>
+    	<defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
diff --git a/services/jaxb/src/main/resources/AbstractCommonList.xsd b/services/jaxb/src/main/resources/AbstractCommonList.xsd
index 59e16d773..942c5fb2c 100644
--- 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 5cd4aa6cd..76f5c4f17 100644
--- 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>
-- 
2.47.3