You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/04/14 00:55:30 UTC
svn commit: r393964 - in /geronimo/branches/1.1:
applications/jmxdebug/maven.xml etc/maven.xml etc/project.properties
Author: dain
Date: Thu Apr 13 15:55:27 2006
New Revision: 393964
URL: http://svn.apache.org/viewcvs?rev=393964&view=rev
Log:
Committed patches for GERONIMO-1831 Need to package console WEB-INF/classes into a JAR. Thanks Prasad Kashyap.
Modified:
geronimo/branches/1.1/applications/jmxdebug/maven.xml
geronimo/branches/1.1/etc/maven.xml
geronimo/branches/1.1/etc/project.properties
Modified: geronimo/branches/1.1/applications/jmxdebug/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/jmxdebug/maven.xml?rev=393964&r1=393963&r2=393964&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/jmxdebug/maven.xml (original)
+++ geronimo/branches/1.1/applications/jmxdebug/maven.xml Thu Apr 13 15:55:27 2006
@@ -14,19 +14,4 @@
<goal name="jar:deploy">
<attainGoal name="war:deploy"/>
</goal>
-
- <postGoal name="war:webapp">
- <attainGoal name="jarWebInfClasses"/>
- </postGoal>
-
- <goal name="jarWebInfClasses">
- <j:set var="webroot" value="${basedir}/target/${pom.artifactId}/WEB-INF"/>
-
- <ant:mkdir dir="${webroot}/lib"/>
- <ant:jar destfile="${webroot}/lib/classes.jar" basedir="${webroot}/classes"/>
-
- <ant:delete includeemptydirs="true">
- <ant:fileset dir="${webroot}/classes" includes="**/*"/>
- </ant:delete>
- </goal>
</project>
Modified: geronimo/branches/1.1/etc/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/maven.xml?rev=393964&r1=393963&r2=393964&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/maven.xml (original)
+++ geronimo/branches/1.1/etc/maven.xml Thu Apr 13 15:55:27 2006
@@ -232,4 +232,24 @@
<ant:touch file="${basedir}/target/test-reports/tstamp"/>
</j:if>
</postGoal>
+
+ <postGoal name="war:webapp">
+ <j:set var="usesJar" value="${maven.war.usesJar}"/>
+ <ant:echo>Use classes.jar ? ${usesJar}</ant:echo>
+ <j:if test="${usesJar}">
+ <j:set var="webroot" value="${basedir}/target/${pom.artifactId}/WEB-INF"/>
+ <ant:copy todir="${basedir}/target/work" includeEmptyDirs="false">
+ <ant:fileset dir="${webroot}/classes"/>
+ </ant:copy>
+ <ant:available file="${basedir}/target/work" property="classes.present"/>
+ <j:if test="${classes.present}">
+ <ant:jar destfile="${webroot}/lib/classes.jar" basedir="${webroot}/classes"/>
+ <ant:delete includeemptydirs="true">
+ <ant:fileset dir="${webroot}/classes" includes="**/*"/>
+ <ant:fileset dir="${basedir}/target/work" includes="**/*"/>
+ </ant:delete>
+ </j:if>
+ </j:if>
+ </postGoal>
+
</project>
Modified: geronimo/branches/1.1/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/etc/project.properties?rev=393964&r1=393963&r2=393964&view=diff
==============================================================================
--- geronimo/branches/1.1/etc/project.properties (original)
+++ geronimo/branches/1.1/etc/project.properties Thu Apr 13 15:55:27 2006
@@ -47,6 +47,15 @@
maven.war.final.name=${pom.artifactId}-${pom.currentVersion}.war
+#############################################################################################################################
+# By default, the class files of an application in the WEB-INF/classes dir are jar'ed up into WEB-INF/lib/classes.jar.
+# To leave them as classes, set the following property to false in the individual application's project.properties file.
+# DO NOT change the following property here unless you want to change it globally for all applications !!
+#############################################################################################################################
+maven.war.usesJar=true
+
+
+
#####################################################
# Web Container (jetty or tomcat)
#####################################################