From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Wed, 11 Nov 2009 20:11:36 +0000 (+0000)
Subject: NOJIRA: added hotdeploy task in ant. this task calls cargo:undeploy and cargo:deploy
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a4e27526017db34cb3229208a58683ad5fac6076;p=tmp%2Fjakarta-migration.git

NOJIRA: added hotdeploy task in ant. this task calls cargo:undeploy and cargo:deploy
in order. New maven plugin sets properties from build.properties before calling
cargo tasks. Added new properties into build.properties.


M    services/JaxRsServiceProvider/nbactions.xml
M    services/JaxRsServiceProvider/pom.xml
M    services/JaxRsServiceProvider/build.xml
M    services/build.xml
M    build.properties
M    pom.xml
M    build.xml
---

diff --git a/build.properties b/build.properties
index 770a857b1..7d84abde8 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,6 @@
+host=127.0.0.1
 #cspace
-cspace.release=0.2
+cspace.release=0.4
 cspace.services.release=cspace-services-${cspace.release}
 cspace.services.war=cspace-services.war
 domain.cspace=cspace
@@ -37,6 +38,7 @@ jboss.home=${jboss.dir}
 
 #jboss cspace domain
 jboss.domain.cspace=${domain.cspace}
+jboss.domain.cspace.port=8180
 jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}
 jboss.deploy.cspace=${jboss.server.cspace}/deploy
 jboss.lib.cspace=${jboss.server.cspace}/lib
@@ -44,6 +46,7 @@ jboss.deploy.cspace.services=${jboss.server.cspace}/deploy/${cspace.services.war
 
 #jboss nuxeo domain
 jboss.domain.nuxeo=${domain.nuxeo}
+jboss.domain.nuxeo.port=8080
 jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}
 jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy
 jboss.lib.nuxeo=${jboss.server.nuxeo}/lib
diff --git a/build.xml b/build.xml
index fcdb872e6..5c3c0d670 100644
--- a/build.xml
+++ b/build.xml
@@ -237,6 +237,11 @@
     </target>
 
 
+    <target name="hotdeploy" depends="install"
+    description="deploy services in running ${jboss.server.cspace}">
+        <ant antfile="services/build.xml" target="hotdeploy" inheritAll="false"/>
+    </target>
+
     <target name="eclipse" depends="eclipse-unix,eclipse-windows" description="Generate Eclipse files" />
     <target name="eclipse-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
diff --git a/pom.xml b/pom.xml
index 2a900bbdc..a4f601270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
             <name>libs-snapshots-local</name>
             <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>
         </snapshotRepository>
-    </distributionManagement> 
+    </distributionManagement>
     
     <modules>
         <module>3rdparty</module>
@@ -51,13 +51,13 @@
         <repository>
             <id>collectionspace-releases</id>
             <name>collectionspace-releases</name>
-            <url>http://source.collectionspace.org:8081/artifactory/public-nuxeo</url>            
+            <url>http://source.collectionspace.org:8081/artifactory/public-nuxeo</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
             <snapshots>
                 <enabled>false</enabled>
-            </snapshots>            
+            </snapshots>
         </repository>
         <repository>
             <id>collectionspace-snapshots</id>
@@ -77,7 +77,7 @@
             <url>http://repo1.maven.org/maven2</url>
             <snapshots>
                 <enabled>false</enabled>
-            </snapshots>            
+            </snapshots>
         </repository>
         <repository>
             <id>maven-restlet</id>
@@ -85,8 +85,8 @@
             <url>http://maven.restlet.org</url>
             <snapshots>
                 <enabled>false</enabled>
-            </snapshots>            
-        </repository>        
+            </snapshots>
+        </repository>
         <repository>
             <id>java.net</id>
             <name>java.net Maven Repository</name>
@@ -94,7 +94,7 @@
             <layout>legacy</layout>
             <snapshots>
                 <enabled>false</enabled>
-            </snapshots>            
+            </snapshots>
         </repository>
         
         <!--        
@@ -121,17 +121,17 @@
             <url>http://repository.jboss.org/maven2</url>
             <snapshots>
                 <enabled>false</enabled>
-            </snapshots>            
+            </snapshots>
         </repository>
         <repository>
             <id>mojo</id>
             <name>mojo repo</name>
-            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>
+            <url>http://repository.codehaus.org</url>
             <snapshots>
-                <enabled>false</enabled>
-            </snapshots>            
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
-        
+
     </repositories>
     
     <pluginRepositories>
@@ -147,7 +147,8 @@
             <url>http://download.java.net/maven/1</url>
             <layout>legacy</layout>
         </pluginRepository>
-        
+
+        <!-- use snapshort codehaus for cargo plugin -->
         <pluginRepository>
             <id>codehaus snapshot repository</id>
             <url>http://snapshots.repository.codehaus.org/</url>
@@ -155,7 +156,7 @@
                 <enabled>true</enabled>
             </releases>
         </pluginRepository>
-        
+
     </pluginRepositories>
     
     <build>
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index dff8d9814..e6ba44aa6 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -108,6 +108,35 @@
         </exec>
     </target>
 
+    <target name="hotdeploy" depends="install,hotdeploy-unix,hotdeploy-windows"
+  description="Hot deploy" />
+    <target name="hotdeploy-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="properties:read-project-properties" />
+            <arg value="cargo:undeploy" />
+            <arg value="cargo:deploy" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="hotdeploy-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="properties:read-project-properties" />
+            <arg value="cargo:undeploy" />
+            <arg value="cargo:deploy" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
     <target name="deploy" depends="install"
     description="deploy cspace services in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
diff --git a/services/JaxRsServiceProvider/nbactions.xml b/services/JaxRsServiceProvider/nbactions.xml
index 9d30c239a..3cc69b94b 100644
--- a/services/JaxRsServiceProvider/nbactions.xml
+++ b/services/JaxRsServiceProvider/nbactions.xml
@@ -1,74 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>test</actionName>
-            <packagings>
-                <packaging>*</packaging>
-            </packagings>
-            <goals>
-                <goal>test</goal>
-            </goals>
-        </action>
-        <action>
-            <actionName>build</actionName>
-            <packagings>
-                <packaging>*</packaging>
-            </packagings>
-            <goals>
-                <goal>install</goal>
-            </goals>
-        </action>
-        <action>
-            <actionName>clean</actionName>
-            <packagings>
-                <packaging>*</packaging>
-            </packagings>
-            <goals>
-                <goal>clean</goal>
-            </goals>
-        </action>
-        <action>
-            <actionName>rebuild</actionName>
-            <packagings>
-                <packaging>*</packaging>
-            </packagings>
-            <goals>
-                <goal>clean</goal>
-                <goal>install</goal>
-            </goals>
-            <properties>
-                <maven.test.skip>true</maven.test.skip>
-            </properties>
-        </action>
-        <action>
-            <actionName>run</actionName>
-            <packagings>
-                <packaging>war</packaging>
-                <packaging>ear</packaging>
-                <packaging>ejb</packaging>
-            </packagings>
-            <goals>
-                <goal>package</goal>
-            </goals>
-            <properties>
-                
-                <netbeans.deploy>true</netbeans.deploy>
-            </properties>
-        </action>
-        <action>
-            <actionName>debug</actionName>
-            <packagings>
-                <packaging>war</packaging>
-                <packaging>ear</packaging>
-                <packaging>ejb</packaging>
-            </packagings>
-            <goals>
-                <goal>package</goal>
-            </goals>
-            <properties>
-                
-                <netbeans.deploy>true</netbeans.deploy>
-                <netbeans.deploy.debugmode>true</netbeans.deploy.debugmode>
-            </properties>
-        </action>
-    </actions>
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>test</actionName>
+            <goals>
+                <goal>test</goal>
+            </goals>
+        </action>
+        <action>
+            <actionName>build</actionName>
+            <goals>
+                <goal>install</goal>
+            </goals>
+        </action>
+        <action>
+            <actionName>clean</actionName>
+            <goals>
+                <goal>clean</goal>
+            </goals>
+        </action>
+        <action>
+            <actionName>rebuild</actionName>
+            <goals>
+                <goal>clean</goal>
+                <goal>install</goal>
+            </goals>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+        </action>
+        <action>
+            <actionName>run</actionName>
+            <goals>
+                <goal>package</goal>
+            </goals>
+            <properties>
+                
+                <netbeans.deploy>true</netbeans.deploy>
+            </properties>
+        </action>
+        <action>
+            <actionName>debug</actionName>
+            <goals>
+                <goal>package</goal>
+            </goals>
+            <properties>
+                
+                <netbeans.deploy>true</netbeans.deploy>
+                <netbeans.deploy.debugmode>true</netbeans.deploy.debugmode>
+            </properties>
+        </action>
+        <action>
+            <actionName>CUSTOM-redeploy</actionName>
+            <displayName>redeploy</displayName>
+            <goals>
+                <goal>cargo:undeploy</goal>
+                <goal>cargo:deploy</goal>
+            </goals>
+        </action>
+    </actions>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 68dc953d5..db4a04768 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -174,41 +174,24 @@
         <finalName>cspace-services</finalName>
         <defaultGoal>package</defaultGoal>
         <plugins>
-            <!--plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jboss-maven-plugin</artifactId>
-                <configuration>
-                    <serverName>cspace</serverName>
-                    <jbossHome>${jboss.dir}</jbossHome>
-                    <port>8180</port>
-                </configuration>
-                <executions>               	
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.0-alpha-2</version>
+                <executions>
                     <execution>
-                        <id>jboss-undeploy</id>
-                        <phase>pre-integration-test</phase>
+                        <phase>initialize</phase>
                         <goals>
-                            <goal>undeploy</goal>
+                            <goal>read-project-properties</goal>
                         </goals>
-                        <configuration>
-                            <fileNames>
-                                <param>${project.build.directory}/${project.build.finalName}.war</param>
-                            </fileNames>
-                        </configuration>
                     </execution>
-                    <execution>
-                        <id>jboss-deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                        <configuration>
-                            <fileNames>
-                                <param>${project.build.directory}/${project.build.finalName}.war</param>
-                            </fileNames>
-                        </configuration>
-                    </execution>                
                 </executions>
-            </plugin-->
+                <configuration>
+                    <files>
+                        <file>../../build.properties</file>
+                    </files>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
@@ -222,7 +205,7 @@
                     <configuration>
                         <type>runtime</type>
                         <properties>
-                            <cargo.servlet.port>8180</cargo.servlet.port>
+                            <cargo.servlet.port>${jboss.domain.cspace.port}</cargo.servlet.port>
                             <cargo.jboss.configuration>cspace</cargo.jboss.configuration>
                         </properties>
                     </configuration>
@@ -233,7 +216,7 @@
                                 <groupId>org.collectionspace.services</groupId>
                                 <artifactId>org.collectionspace.services.jaxrs.provider</artifactId>
                                 <type>war</type>
-                                <pingURL>http://127.0.0.1:8180</pingURL>
+                                <pingURL>http://${host}:${jboss.domain.cspace.port}</pingURL>
                             </deployable>
                         </deployables>
                     </deployer>
diff --git a/services/build.xml b/services/build.xml
index 74f86b6b9..754802ca1 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -132,6 +132,11 @@
         <ant antfile="common/build.xml" target="undeploy" inheritAll="false"/>
     </target>
 
+    <target name="hotdeploy" depends="install"
+    description="deploy services in running ${jboss.server.cspace}">
+        <ant antfile="JaxRsServiceProvider/build.xml" target="hotdeploy" inheritAll="false"/>
+    </target>
+
     <!-- this target is called in order based on the dependencies between the services -->
     <target name="dist" depends="package"
     description="create distribution for services">