modules/enterprise/server/ear/pom.xml | 52 +++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 4 deletions(-)
New commits: commit 38e86745483535f1d79b753ab8c57513c4bf9b4a Author: Jay Shaughnessy jshaughn@jshaughn.csb Date: Fri Sep 14 17:54:05 2012 -0400
Don't create rhq.ear.dodeploy if rhq.ear.skipdeploy exists. Note, due to maven limitations this only works if dev-container has the default name and location.
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index b4a371d..6acb260 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -855,7 +855,7 @@ <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> <rhq.deploymentName>${project.build.finalName}.ear</rhq.deploymentName> <rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.deploymentName}</rhq.deploymentDir> - </properties> + </properties>
<build> <plugins> @@ -877,9 +877,6 @@ <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <property name="dodeploy.file" location="${deployment.dir}.dodeploy" /> - <echo>*** Touching ${dodeploy.file} to force redeployment of ${rhq.deploymentName}</echo> - <touch file="${dodeploy.file}" /> </target> </configuration> <goals> @@ -928,6 +925,53 @@ </build> </profile>
+ <profile> + <id>create-dodeploy-file</id> + + <properties> + <!-- can't currently use these in the File activation :( --> + <rhq.rootDir>../../../..</rhq.rootDir> + <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> + <rhq.deploymentName>${project.build.finalName}.ear</rhq.deploymentName> + <rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.deploymentName}</rhq.deploymentDir> + </properties> + + <activation> + <file> + <!-- TODO(jshaughn): if and when maven allows for non-local property substitution use it. --> + <missing>../../../../dev-container/jbossas/standalone/deployments/rhq.ear.skipdeploy</missing> + </file> + </activation> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + + <execution> + <id>deploy</id> + <phase>package</phase> + <configuration> + <target> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <property name="dodeploy.file" location="${deployment.dir}.dodeploy" /> + <echo>*** Touching ${dodeploy.file} to force redeployment of ${rhq.deploymentName}</echo> + <touch file="${dodeploy.file}" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles>
</project>
rhq-commits@lists.fedorahosted.org