CSPACE-558 the build now uses the cargo plugin to deploy war on remote jboss server...

diff --git a/pom.xml b/pom.xml
index 56cc8d016f9d0d9be288d0b4dd7b7dd8628149af..77b6d9185d3ecf5ee7015f5ce668d3d7fed6dd4f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,13 @@
             <name>Java.net Maven 2 Repository</name>\r
             <url>http://download.java.net/maven/2</url>\r
         </pluginRepository>\r
+        <pluginRepository>\r
+            <id>codehaus snapshot repository</id>\r
+            <url>http://snapshots.repository.codehaus.org/</url>\r
+            <releases>\r
+              <enabled>true</enabled>\r
+            </releases>\r
+        </pluginRepository>\r
     </pluginRepositories>\r
 \r
     <build>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 90d074f221eaa3530e2e27326d9419a8e315ffb9..68dc953d59a2bcbecdc7347e8e158602c7daa026 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -174,7 +174,7 @@
         <finalName>cspace-services</finalName>\r
         <defaultGoal>package</defaultGoal>\r
         <plugins>\r
-            <plugin>\r
+            <!--plugin>\r
                 <groupId>org.codehaus.mojo</groupId>\r
                 <artifactId>jboss-maven-plugin</artifactId>\r
                 <configuration>\r
@@ -182,8 +182,7 @@
                     <jbossHome>${jboss.dir}</jbossHome>\r
                     <port>8180</port>\r
                 </configuration>\r
-                <executions>\r
-<!--                   \r
+                <executions>                   \r
                     <execution>\r
                         <id>jboss-undeploy</id>\r
                         <phase>pre-integration-test</phase>\r
@@ -207,9 +206,39 @@
                                 <param>${project.build.directory}/${project.build.finalName}.war</param>\r
                             </fileNames>\r
                         </configuration>\r
-                    </execution>\r
--->                    \r
+                    </execution>                \r
                 </executions>\r
+            </plugin-->\r
+            <plugin>\r
+                <groupId>org.codehaus.cargo</groupId>\r
+                <artifactId>cargo-maven2-plugin</artifactId>\r
+                <!-- Container configuration -->\r
+                <configuration>\r
+                    <container>\r
+                        <containerId>jboss42x</containerId>\r
+                        <home>${jboss.dir}</home>\r
+                        <type>remote</type>\r
+                    </container>\r
+                    <configuration>\r
+                        <type>runtime</type>\r
+                        <properties>\r
+                            <cargo.servlet.port>8180</cargo.servlet.port>\r
+                            <cargo.jboss.configuration>cspace</cargo.jboss.configuration>\r
+                        </properties>\r
+                    </configuration>\r
+                    <deployer>\r
+                        <type>remote</type>\r
+                        <deployables>\r
+                            <deployable>\r
+                                <groupId>org.collectionspace.services</groupId>\r
+                                <artifactId>org.collectionspace.services.jaxrs.provider</artifactId>\r
+                                <type>war</type>\r
+                                <pingURL>http://127.0.0.1:8180</pingURL>\r
+                            </deployable>\r
+                        </deployables>\r
+                    </deployer>\r
+                </configuration>\r
+\r
             </plugin>\r
 \r
             <plugin>\r