cspace-62 added relation service to service build. removed redundant build.properties

M    pom.xml
M    build.xml
D    collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.properties

diff --git a/services/build.xml b/services/build.xml
index 998c990877d2deaffeb14d809e055204255b6ef9..ae3f34bbfca2e6687479eae1e75b03b0dc5e21b5 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -110,6 +110,7 @@
     description="deploy services in ${jboss.server.cspace}">\r
         <ant antfile="authentication/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="common/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="relation/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="collectionobject/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
@@ -118,6 +119,7 @@
     description="undeploy authentication service from ${jboss.server.cspace}">\r
         <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="relation/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="collectionobject/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.properties b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.properties
deleted file mode 100644 (file)
index c26799a..0000000
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Example for Windows
-jboss.dir=c:/dev/jboss-4.2.3.GA
-# Example for Unix
-#jboss.dir=/opt/jboss
-
-# Which JBoss server config to use
-jboss.config=default
-
-# nuxeo deployment
-jboss.nuxeo.ear.dir=${jboss.dir}/server/${jboss.config}/deploy/nuxeo.ear
-
-
-# additional command line parameters for mvn commands
-# e.g. to work offline:
-#mvn.opts=-o

diff --git a/services/pom.xml b/services/pom.xml
index cf53bde2b31c56f55d60b144ffed67ff6403b367..9cc2dc3de27d13e158ea29b33275812ebc1253ee 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -23,12 +23,13 @@
     <modules>
         <module>common</module>
         <module>authentication</module>
-        <module>client</module>
-        <module>collectionobject</module>
         <module>id</module>
+        <module>relation</module>
+        <module>collectionobject</module>
         <module>intake</module>
         <module>JaxRsServiceProvider</module>
-  </modules>
+        <module>client</module>
+    </modules>
 
     <repositories>
         <repository>
@@ -112,20 +113,20 @@
                     </configuration>
                 </plugin>
                 
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                    <execution>
-                      <id>classpath</id>
-                      <goals>
-                        <goal>build-classpath</goal>
-                      </goals>
-                      <configuration>
-                      <outputFile>classpath</outputFile>
-                      </configuration>
-                    </execution>
-                  </executions>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>classpath</id>
+                            <goals>
+                                <goal>build-classpath</goal>
+                            </goals>
+                            <configuration>
+                                <outputFile>classpath</outputFile>
+                            </configuration>
+                        </execution>
+                    </executions>
                 </plugin>