Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/war/plugin.jelly,v
retrieving revision 1.45
diff -u -r1.45 plugin.jelly
--- plugin.jelly	15 Jul 2004 09:28:56 -0000	1.45
+++ plugin.jelly	16 Aug 2004 21:59:30 -0000
@@ -21,6 +21,7 @@
 <project xmlns:j="jelly:core"
          xmlns:license="license"
          xmlns:util="jelly:util"
+         xmlns:maven="jelly:maven"
          xmlns:ant="jelly:ant"
          xmlns:artifact="artifact"
          xmlns:caller="caller">
@@ -35,6 +36,7 @@
   <!--==================================================================-->    
   <goal name="war:init">
 
+    <maven:property name="maven.war.usesJar" defaultValue="false"/>
     <ant:available property="webSourcesPresent" type="dir"
       file="${maven.war.src}"/>
  
@@ -131,17 +133,19 @@
   <!--==================================================================-->    
   <goal name="war:webapp" prereqs="war:war-resources,test:test" 
     description="Build a webapp directory">
-
     <ant:echo>Assembling webapp ${pom.artifactId}</ant:echo>
-
     <j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
     <ant:mkdir dir="${webapp.build.lib}"/>
     
     <j:set var="webapp.build.tlds" value="${maven.war.webapp.dir}/${maven.war.tld.dir}"/>
     <ant:mkdir dir="${webapp.build.tlds}"/>
     
-    <j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/>
-    <ant:mkdir dir="${webapp.build.classes}"/>
+    <j:set var="usesJar" value="${maven.war.usesJar}"/>
+ 
+   <j:if test="${!usesJar}">
+    	<j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/>
+	<ant:mkdir dir="${webapp.build.classes}"/>
+    </j:if>
 
     <j:forEach var="lib" items="${pom.artifacts}">
       <j:set var="dep" value="${lib.dependency}"/>     
@@ -171,16 +175,20 @@
         <ant:copy todir="${maven.war.webapp.dir}/${targetPath}" file="${lib.path}"/>
       </j:if>
     </j:forEach>            
-
-    <util:available file="${maven.build.dest}">
-      <ant:copy todir="${webapp.build.classes}">
-        <ant:fileset dir="${maven.build.dest}"
-          includes="${maven.war.classes.includes}"
-          excludes="${maven.war.classes.excludes}">
-        </ant:fileset>
-      </ant:copy>
-    </util:available>
-
+    <j:if test="${!usesJar}">
+    	<util:available file="${maven.build.dest}">
+    		<ant:copy todir="${webapp.build.classes}">
+        	<ant:fileset dir="${maven.build.dest}"
+          		includes="${maven.war.classes.includes}"
+          		excludes="${maven.war.classes.excludes}">
+        	</ant:fileset>
+      		</ant:copy>
+    	</util:available>
+    </j:if>
+    <j:if test="${usesJar}">
+        <attainGoal name="jar:jar"/>
+    	<ant:copy todir="${webapp.build.lib}" file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar"/>
+    </j:if>
   </goal>
 
   <!--==================================================================-->
Index: plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/war/plugin.properties,v
retrieving revision 1.12
diff -u -r1.12 plugin.properties
--- plugin.properties	15 Jul 2004 09:28:56 -0000	1.12
+++ plugin.properties	16 Aug 2004 21:59:30 -0000
@@ -54,3 +54,6 @@
 
 # Location of the manifest file to be used
 maven.war.manifest=${maven.war.src}/META-INF/MANIFEST.MF
+
+# Wether the project classes should be packed in a jar or not
+maven.war.usesJar=false
Index: xdocs/changes.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/war/xdocs/changes.xml,v
retrieving revision 1.31
diff -u -r1.31 changes.xml
--- xdocs/changes.xml	15 Jul 2004 09:28:56 -0000	1.31
+++ xdocs/changes.xml	16 Aug 2004 21:59:30 -0000
@@ -25,6 +25,9 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in CVS">
+      <action type="add" due-to="Felipe Leme" issue="MPWAR-30">
+        Add the <code>maven.war.usesJar</code> property that, when set to true, includes the project's jar into <code>WEB-INF/lib</code> (instead of copying the project classes into <code>WEB-INF/classes</code>
+      </action>
       <action dev="vmassol" type="update">
         Made the <code>maven.war.final.name</code> property public as it is 
         required by several other plugins and before this change the only 
Index: xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/war/xdocs/properties.xml,v
retrieving revision 1.14
diff -u -r1.14 properties.xml
--- xdocs/properties.xml	15 Jul 2004 09:28:56 -0000	1.14
+++ xdocs/properties.xml	16 Aug 2004 21:59:31 -0000
@@ -147,6 +147,13 @@
              >SUN Code Conventions for the JavaServer Pages</a>
           </td>
         </tr>
+        <tr>
+          <td>maven.war.usesJar</td>
+          <td>Yes</td>
+          <td>
+            Whether to pack the project classes in a jar located at WEB-INF/lib or copy the projects classes into WEB-INF/classes (default behavior)
+          </td>
+        </tr>
       </table>
     </section>
     <section name="Including artifacts in the Webapp">

