Return-Path: 
 <scm-return-11259-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 24504 invoked from network); 13 Apr 2006 22:55:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 13 Apr 2006 22:55:54 -0000
Received: (qmail 45173 invoked by uid 500); 13 Apr 2006 22:55:53 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 45146 invoked by uid 500); 13 Apr 2006 22:55:52 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 45135 invoked by uid 99); 13 Apr 2006 22:55:52 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Apr 2006 15:55:52 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 13 Apr 2006 15:55:52 -0700
Received: (qmail 24316 invoked by uid 65534); 13 Apr 2006 22:55:31 -0000
Message-ID: <20060413225531.24315.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r393964 - in /geronimo/branches/1.1:
 applications/jmxdebug/maven.xml etc/maven.xml etc/project.properties
Date: Thu, 13 Apr 2006 22:55:30 -0000
To: scm@geronimo.apache.org
From: dain@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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)
 #####################################################