[rhq] Branch 'rhq-on-as7' - modules/enterprise
mazz
mazz at fedoraproject.org
Fri Aug 3 18:20:10 UTC 2012
modules/enterprise/gui/installer/pom.xml | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
New commits:
commit 8947cc40b7db3ed50a7589b39f3639b328e54139
Author: John Mazzitelli <mazz at redhat.com>
Date: Fri Aug 3 14:20:06 2012 -0400
fix the pom so -Pdev works when doing both clean and install and when the appserver is already running with the app already deployed or not
diff --git a/modules/enterprise/gui/installer/pom.xml b/modules/enterprise/gui/installer/pom.xml
index 18fc658..98e7b07 100644
--- a/modules/enterprise/gui/installer/pom.xml
+++ b/modules/enterprise/gui/installer/pom.xml
@@ -283,25 +283,6 @@
<executions>
<execution>
- <id>deploy-classes</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <property name="deployment.dir" location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to ${deployment.dir}${file.separator}...</echo>
- <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
- <fileset dir="${basedir}/src/main/webapp" />
- </copy>
- <!-- TODO: do we want to deploy the installer even if dev mode? -->
- <touch file="${deployment.dir}/../${rhq.deploymentName}.dodeploy" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
<id>deploy</id>
<phase>package</phase>
<configuration>
@@ -311,6 +292,16 @@
<copy todir="${deployment.dir}" verbose="${rhq.verbose}">
<fileset dir="${basedir}/target/${project.build.finalName}" />
</copy>
+ <echo>*** Copying MANIFEST.MF from target${file.separator}${project.build.finalName}.war to ${deployment.dir}${file.separator}META-INF...</echo>
+ <unwar src="${basedir}/target/${project.build.finalName}.war"
+ dest="${deployment.dir}">
+ <patternset>
+ <include name="META-INF/MANIFEST.MF" />
+ </patternset>
+ </unwar>
+ <delete file="${deployment.dir}/../${rhq.deploymentName}.failed" /> <!-- in case we previously failed -->
+ <!-- TODO: do we want to deploy the installer even if dev mode? -->
+ <touch file="${deployment.dir}/../${rhq.deploymentName}.dodeploy" />
</target>
</configuration>
<goals>
@@ -326,6 +317,7 @@
<property name="deployment.dir" location="${rhq.deploymentDir}" />
<echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
<delete dir="${deployment.dir}" />
+ <delete file="${deployment.dir}/../${rhq.deploymentName}.failed" /> <!-- in case we previously failed -->
</target>
</configuration>
<goals>
More information about the rhq-commits
mailing list