NOJIRA moved JaxRsServiceProvider into services

diff --git a/pom.xml b/pom.xml
index d67c8610b083d2bc9bf8e4f8ce2ef6665dc0e077..70ea27b0d13111f11395b9c8977819c465fd17e5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,6 @@
 \r
     <modules>\r
         <module>services</module>\r
-        <module>JaxRsServiceProvider</module>\r
     </modules>\r
     <repositories>\r
         <repository>\r

diff --git a/JaxRsServiceProvider/README.txt b/services/JaxRsServiceProvider/README.txt
similarity index 100%
rename from JaxRsServiceProvider/README.txt
rename to services/JaxRsServiceProvider/README.txt

diff --git a/JaxRsServiceProvider/build.properties b/services/JaxRsServiceProvider/build.properties
similarity index 100%
rename from JaxRsServiceProvider/build.properties
rename to services/JaxRsServiceProvider/build.properties

diff --git a/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
similarity index 100%
rename from JaxRsServiceProvider/build.xml
rename to services/JaxRsServiceProvider/build.xml

diff --git a/JaxRsServiceProvider/nb-configuration.xml b/services/JaxRsServiceProvider/nb-configuration.xml
similarity index 100%
rename from JaxRsServiceProvider/nb-configuration.xml
rename to services/JaxRsServiceProvider/nb-configuration.xml

diff --git a/JaxRsServiceProvider/nbactions.xml b/services/JaxRsServiceProvider/nbactions.xml
similarity index 100%
rename from JaxRsServiceProvider/nbactions.xml
rename to services/JaxRsServiceProvider/nbactions.xml

diff --git a/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
similarity index 100%
rename from JaxRsServiceProvider/pom.xml
rename to services/JaxRsServiceProvider/pom.xml

diff --git a/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
similarity index 100%
rename from JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
rename to services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java

diff --git a/JaxRsServiceProvider/src/main/resources/jndi.properties b/services/JaxRsServiceProvider/src/main/resources/jndi.properties
similarity index 100%
rename from JaxRsServiceProvider/src/main/resources/jndi.properties
rename to services/JaxRsServiceProvider/src/main/resources/jndi.properties

diff --git a/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml
rename to services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml

diff --git a/services/pom.xml b/services/pom.xml
index 844aba0494460bc4ab378d0ce342cb0925a4adf3..96344dd9a744fb26ed3ebd92bff86429590d4ee2 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -1,188 +1,189 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<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">\r
-    <parent>\r
-        <artifactId>org.collectionspace.services</artifactId>\r
-        <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
-    </parent>\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
-    <artifactId>org.collectionspace.services.main</artifactId>\r
-    <packaging>pom</packaging>\r
-    <name>services.main</name>\r
-\r
-    <properties>\r
-        <jboss.version>4.2.3.GA</jboss.version>\r
-        <jboss.ejb.version>3.0</jboss.ejb.version>\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
-\r
-    <modules>\r
-        <module>common</module>\r
-        <module>client</module>\r
-        <module>collectionobject</module>\r
-    </modules>\r
-\r
-    <repositories>\r
-        <repository>\r
-            <id>maven-restlet</id>\r
-            <name>Public online Restlet repository</name>\r
-            <url>http://maven.restlet.org</url>\r
-        </repository>\r
-        <repository>\r
-            <id>cspace.local.nuxeo</id>\r
-            <url>${nuxeo.local.repo.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>cspace.local.nuxeo.client</id>\r
-            <url>${nuxeo.local.repo.client.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </repository>\r
-        <repository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </repository>\r
-    </repositories>\r
-    \r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <name>Nuxeo virtual release repository</name>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </pluginRepository>\r
-        <pluginRepository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <name>Nuxeo virtual snapshot repository</name>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-\r
-    <build>\r
-        <pluginManagement>\r
-            <plugins>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <configuration>\r
-                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
-                    </configuration>\r
-                </plugin>\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-war-plugin</artifactId>\r
-                    <version>2.0.1</version>\r
-                    <configuration>\r
-                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addClasspath>true</addClasspath>\r
-\r
-                            </manifest>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-        </pluginManagement>\r
-    </build>\r
-    <dependencyManagement>\r
-        <dependencies>\r
-            <dependency>\r
-                <groupId>net.java.dev.jaxb2-commons</groupId>\r
-                <artifactId>jaxb-fluent-api</artifactId>\r
-                <version>2.0.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.testng</groupId>\r
-                <artifactId>testng</artifactId>\r
-                <version>5.6</version>\r
-                <scope>test</scope>\r
-                <classifier>jdk15</classifier>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jboss.resteasy</groupId>\r
-                <artifactId>jaxrs-api</artifactId>\r
-                <version>1.0.2.GA</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>net.java.dev.jaxb2-commons</groupId>\r
-                <artifactId>jaxb-fluent-api</artifactId>\r
-                <version>2.0.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jvnet.jaxb2-commons</groupId>\r
-                <artifactId>property-listener-injector</artifactId>\r
-                <version>1.0</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jvnet.jaxb2_commons</groupId>\r
-                <artifactId>runtime</artifactId>\r
-                <version>0.4.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.jboss.resteasy</groupId>\r
-                <artifactId>resteasy-jaxrs</artifactId>\r
-                <version>1.0.2.GA</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>commons-httpclient</groupId>\r
-                <artifactId>commons-httpclient</artifactId>\r
-                <version>3.1</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>com.sun.xml.bind</groupId>\r
-                <artifactId>jaxb-impl</artifactId>\r
-                <version>2.1.7</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.slf4j</groupId>\r
-                <artifactId>slf4j-api</artifactId>\r
-                <version>1.5.2</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.slf4j</groupId>\r
-                <artifactId>slf4j-log4j12</artifactId>\r
-                <version>1.5.2</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>mysql</groupId>\r
-                <artifactId>mysql-connector-java</artifactId>\r
-                <version>5.1.5</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-        </dependencies>\r
-    </dependencyManagement>\r
-</project>\r
+<?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</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.main</artifactId>
+    <packaging>pom</packaging>
+    <name>services.main</name>
+
+    <properties>
+        <jboss.version>4.2.3.GA</jboss.version>
+        <jboss.ejb.version>3.0</jboss.ejb.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+    </properties>
+
+    <modules>
+        <module>common</module>
+        <module>client</module>
+        <module>collectionobject</module>
+        <module>JaxRsServiceProvider</module>
+  </modules>
+
+    <repositories>
+        <repository>
+            <id>maven-restlet</id>
+            <name>Public online Restlet repository</name>
+            <url>http://maven.restlet.org</url>
+        </repository>
+        <repository>
+            <id>cspace.local.nuxeo</id>
+            <url>${nuxeo.local.repo.dir}</url>
+        </repository>
+        <repository>
+            <id>cspace.local.nuxeo.client</id>
+            <url>${nuxeo.local.repo.client.dir}</url>
+        </repository>
+        <repository>
+            <id>public</id>
+            <url>http://maven.nuxeo.org/public</url>
+            <releases>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>public-snapshot</id>
+            <url>http://maven.nuxeo.org/public-snapshot</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+            </snapshots>
+        </repository>
+    </repositories>
+    
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <url>http://maven.nuxeo.org/public</url>
+            <name>Nuxeo virtual release repository</name>
+            <releases>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>public-snapshot</id>
+            <url>http://maven.nuxeo.org/public-snapshot</url>
+            <name>Nuxeo virtual snapshot repository</name>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <configuration>
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <configuration>
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>5.6</version>
+                <scope>test</scope>
+                <classifier>jdk15</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>jaxrs-api</artifactId>
+                <version>1.0.2.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jvnet.jaxb2-commons</groupId>
+                <artifactId>property-listener-injector</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jvnet.jaxb2_commons</groupId>
+                <artifactId>runtime</artifactId>
+                <version>0.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>resteasy-jaxrs</artifactId>
+                <version>1.0.2.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.5</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
\ No newline at end of file