CSPACE-3899 Added batch service. CSPACE-3932 Fixed hack in authority DocumentModelHa...

diff --cc services/JaxRsServiceProvider/pom.xml
Simple merge

diff --cc services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
index 0000000000000000000000000000000000000000,e1e7056e285a80a3dffbd58d21c00435b1545af2..f5fa19cc72df9e367f942b665f03e17198e9f20c
mode 000000,100644..100644
--- /dev/null
--- 2/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/pom.xml
@@@ -1,0 -1,38 +1,38 @@@
 -        <version>1.7-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 
+     <parent>
+         <groupId>org.collectionspace.services</groupId>
+         <artifactId>org.collectionspace.services.batch.3rdparty</artifactId>
++        <version>1.8-SNAPSHOT</version>
+     </parent>
+     
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>org.collectionspace.services</groupId>
+     <artifactId>org.collectionspace.services.batch.3rdparty.nuxeo</artifactId>
+     <name>services.batch.3rdparty.nuxeo</name>
+     <packaging>jar</packaging>
+     <description>
+         Batch Nuxeo Document Type
+     </description>
+ 
+     <build>
+         <plugins>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-jar-plugin</artifactId>
+                 <configuration>
+                     <archive>
+                         <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                         <manifestEntries>
+                             <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                             <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                         </manifestEntries>
+                     </archive>
+                 </configuration>
+             </plugin>
+         </plugins>
+     </build>
+ 
+ </project>

diff --cc services/batch/3rdparty/pom.xml
index 0000000000000000000000000000000000000000,70e55950050361a712fde56d41af67059581fd8d..9182d168580123b045b414c32358602dbf40e4c1
mode 000000,100644..100644
--- /dev/null
--- 2/services/batch/3rdparty/pom.xml
+++ b/services/batch/3rdparty/pom.xml
@@@ -1,0 -1,24 +1,24 @@@
 -        <version>1.7-SNAPSHOT</version>
+ 
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+     <parent>
+         <artifactId>org.collectionspace.services.batch</artifactId>
+         <groupId>org.collectionspace.services</groupId>
++        <version>1.8-SNAPSHOT</version>
+     </parent>
+     
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>org.collectionspace.services</groupId>
+     <artifactId>org.collectionspace.services.batch.3rdparty</artifactId>
+     <name>services.batch.3rdparty</name>
+     <packaging>pom</packaging>
+     
+     <description>
+         3rd party build for batch service
+     </description>
+ 
+     <modules>
+         <module>nuxeo-platform-cs-batch</module>
+     </modules>
+ </project>

diff --cc services/batch/client/pom.xml
index 0000000000000000000000000000000000000000,0ec465eff48730851de40732d82d830f7701a210..12857ce94130b080a7debdddca74d5b11e163aed
mode 000000,100644..100644
--- /dev/null
--- 2/services/batch/client/pom.xml
+++ b/services/batch/client/pom.xml
@@@ -1,0 -1,96 +1,96 @@@
 -        <version>1.7-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+     <parent>
+         <groupId>org.collectionspace.services</groupId>
+         <artifactId>org.collectionspace.services.batch</artifactId>
++        <version>1.8-SNAPSHOT</version>
+     </parent>
+ 
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>org.collectionspace.services</groupId>
+     <artifactId>org.collectionspace.services.batch.client</artifactId>
+     <name>services.batch.client</name>
+     
+     <dependencies>
+         <!-- keep slf4j dependencies on the top -->
+         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-api</artifactId>
+             <scope>test</scope>
+         </dependency>
+         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-log4j12</artifactId>
+             <scope>test</scope>
+         </dependency>
+ <!-- CollectionSpace dependencies -->
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.authority</artifactId>
+             <optional>true</optional>
+             <version>${project.version}</version>
+         </dependency>        
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.jaxb</artifactId>
+             <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.common</artifactId>
+             <optional>true</optional>
+             <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.client</artifactId>
+             <version>${project.version}</version>
+         </dependency>
+          <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.batch.jaxb</artifactId>
+             <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.person.client</artifactId>
+             <version>${project.version}</version>
+         </dependency>
+ <!-- External dependencies -->        
+         <dependency>
+             <groupId>org.testng</groupId>
+             <artifactId>testng</artifactId>
+             <version>5.6</version>
+         </dependency>
+         <dependency>
+             <groupId>org.jboss.resteasy</groupId>
+             <artifactId>resteasy-jaxrs</artifactId>
+             <!-- filter out unwanted jars -->
+             <exclusions>
+                 <exclusion>
+                     <groupId>tjws</groupId>
+                     <artifactId>webserver</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>org.jboss.resteasy</groupId>
+             <artifactId>resteasy-jaxb-provider</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.jboss.resteasy</groupId>
+             <artifactId>resteasy-multipart-provider</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>commons-httpclient</groupId>
+             <artifactId>commons-httpclient</artifactId>
+             <version>3.1</version>
+         </dependency>
+     </dependencies>
+     
+     <build>
+         <finalName>collectionspace-services-batch-client</finalName>
+     </build>
+ </project>

diff --cc services/batch/jaxb/pom.xml
index 0000000000000000000000000000000000000000,d3535d19c15564712a91ccc986e268b9110336f9..2ac2722e333b843950feca764ab64a0edd5215b4
mode 000000,100644..100644
--- /dev/null
--- 2/services/batch/jaxb/pom.xml
+++ b/services/batch/jaxb/pom.xml
@@@ -1,0 -1,47 +1,47 @@@
 -        <version>1.7-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+     <parent>
+         <artifactId>org.collectionspace.services.batch</artifactId>
+         <groupId>org.collectionspace.services</groupId>
++        <version>1.8-SNAPSHOT</version>
+     </parent>
+     
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>org.collectionspace.services</groupId>
+     <artifactId>org.collectionspace.services.batch.jaxb</artifactId>
+     <name>services.batch.jaxb</name>
+     
+     <dependencies>
+         <dependency>
+             <groupId>com.sun.xml.bind</groupId>
+             <artifactId>jaxb-impl</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.jvnet.jaxb2-commons</groupId>
+             <artifactId>property-listener-injector</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.jvnet.jaxb2_commons</groupId>
+             <artifactId>runtime</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.jaxb</artifactId>
+             <version>${project.version}</version>
+         </dependency>        
+     </dependencies>
+     
+     <build>
+         <finalName>collectionspace-services-batch-jaxb</finalName>
+         <defaultGoal>install</defaultGoal>
+         <plugins>
+             <plugin>
+                 <groupId>org.jvnet.jaxb2.maven2</groupId>
+                 <artifactId>maven-jaxb2-plugin</artifactId>
+             </plugin>
+         </plugins>
+     </build>
+ </project>
+ 

diff --cc services/batch/pom.xml
index 0000000000000000000000000000000000000000,af95e6ebfa8c57eef5b55204cd6d72a6f6825695..dee3289448e934f639a3e1d3afc1dc1ee2015d31
mode 000000,100644..100644
--- /dev/null
--- 2/services/batch/pom.xml
+++ b/services/batch/pom.xml
@@@ -1,0 -1,24 +1,24 @@@
 -        <version>1.7-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- A comment. -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+     <parent>
+         <groupId>org.collectionspace.services</groupId>
+         <artifactId>org.collectionspace.services.main</artifactId>
++        <version>1.8-SNAPSHOT</version>
+     </parent>
+     
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>org.collectionspace.services</groupId>
+     <artifactId>org.collectionspace.services.batch</artifactId>
+     <name>services.batch</name>
+     <packaging>pom</packaging>
+ 
+     <modules>
+         <module>jaxb</module>
+         <module>service</module>
+         <module>3rdparty</module>
+         <module>client</module>
+     </modules>
+ 
+ </project>
+ 

diff --cc services/batch/service/pom.xml
index 0000000000000000000000000000000000000000,3a7b4955824c99b8aa384714d22d205a93e396d0..546385db75a1600242e3abc454136c53d0cd6993
mode 000000,100644..100644
--- /dev/null
--- 2/services/batch/service/pom.xml
+++ b/services/batch/service/pom.xml
@@@ -1,0 -1,122 +1,122 @@@
 -        <version>1.7-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 
+     <parent>
+         <groupId>org.collectionspace.services</groupId>
+         <artifactId>org.collectionspace.services.batch</artifactId>        
++        <version>1.8-SNAPSHOT</version>
+     </parent>
+     
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>org.collectionspace.services</groupId>
+     <artifactId>org.collectionspace.services.batch.service</artifactId>
+     <name>services.batch.service</name>
+     <packaging>jar</packaging>       
+ 
+     <dependencies>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.common</artifactId>
+             <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.batch.client</artifactId>
+             <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.batch.jaxb</artifactId>
+             <version>${project.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId> <!-- FIXME: REM - Is this really a required dependency? -->
+             <version>${project.version}</version>
+         </dependency>
+         <!-- External dependencies -->        
+         <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+             <version>4.1</version>
+             <scope>test</scope>
+         </dependency>
+         <dependency>
+             <groupId>org.testng</groupId>
+             <artifactId>testng</artifactId>
+             <version>5.6</version>
+         </dependency>
+         
+       <!-- javax -->
+ 
+         <dependency>
+             <groupId>javax.security</groupId>
+             <artifactId>jaas</artifactId>
+             <version>1.0.01</version>
+             <scope>provided</scope>
+         </dependency>
+ 
+         <dependency>
+             <groupId>dom4j</groupId>
+             <artifactId>dom4j</artifactId>
+             <version>1.6.1</version>
+             <scope>provided</scope>
+         </dependency>
+         
+         <!-- jboss -->
+ 
+         <dependency>
+             <groupId>org.jboss.resteasy</groupId>
+             <artifactId>resteasy-jaxrs</artifactId>
+             <exclusions>
+                 <exclusion>
+                     <groupId>tjws</groupId>
+                     <artifactId>webserver</artifactId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+         <dependency>
+             <groupId>org.jboss.resteasy</groupId>
+             <artifactId>resteasy-jaxb-provider</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.jboss.resteasy</groupId>
+             <artifactId>resteasy-multipart-provider</artifactId>
+         </dependency>
+         
+         <!-- nuxeo -->
+ 
+         <dependency>
+             <groupId>org.nuxeo.ecm.core</groupId>
+             <artifactId>nuxeo-core-api</artifactId>
+             <version>${nuxeo.core.version}</version>
+             <exclusions>
+                 <exclusion>
+                     <artifactId>jboss-remoting</artifactId>
+                     <groupId>jboss</groupId>
+                 </exclusion>
+             </exclusions>
+         </dependency>
+ 
+         <dependency>
+             <groupId>org.restlet</groupId>
+             <artifactId>org.restlet</artifactId>
+             <version>1.0.7</version>
+         </dependency>
+         <dependency>
+             <groupId>com.noelios.restlet</groupId>
+             <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
+             <version>1.0.7</version>
+         </dependency>
+         <dependency>
+             <groupId>com.noelios.restlet</groupId>
+             <artifactId>com.noelios.restlet</artifactId>
+             <version>1.0.7</version>
+         </dependency>
+     </dependencies>
+     
+     <build>
+         <finalName>collectionspace-services-batch</finalName>
+     </build>
+ </project>
+ 

diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge

diff --cc services/organization/service/src/main/java/org/collectionspace/services/organization/OrgAuthorityResource.java
Simple merge

diff --cc services/pom.xml
Simple merge