Hi, You missed a part as per my original post :) (http://marc.theaimsgroup.com/?l=turbine-maven-dev&m=103312806111913&w=2). The attached patch will take care of the check within the war:webapp goal so that you can build an expanded WAR without any web resources.
Regards, Tom > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] > Sent: 07 October 2002 12:07 > To: [EMAIL PROTECTED] > Subject: cvs commit: jakarta-turbine-maven/src/plugins-build/war/xdocs > changes.xml > > > vmassol 2002/10/07 04:06:36 > > Modified: src/plugins-build/war project.xml plugin.jelly > Added: src/plugins-build/war/xdocs changes.xml > Log: > Added support for WARs that contain only java classes and > no web resoures. > > Revision Changes Path > 1.10 +1 -1 > jakarta-turbine-maven/src/plugins-build/war/project.xml > > Index: project.xml > =================================================================== > RCS file: > /home/cvs/jakarta-turbine-maven/src/plugins-build/war/project.xml,v > retrieving revision 1.9 > retrieving revision 1.10 > diff -u -r1.9 -r1.10 > --- project.xml 1 Oct 2002 02:08:09 -0000 1.9 > +++ project.xml 7 Oct 2002 11:06:35 -0000 1.10 > @@ -3,7 +3,7 @@ > <pomVersion>3</pomVersion> > <id>maven-war-plugin</id> > <name>Maven WAR Plugin</name> > - <currentVersion>1.1</currentVersion> > + <currentVersion>1.2-SNAPSHOT</currentVersion> > <organization> > <name>Apache Software Foundation</name> > <url>http://jakarta.apache.org/</url> > > > > 1.12 +9 -4 > jakarta-turbine-maven/src/plugins-build/war/plugin.jelly > > Index: plugin.jelly > =================================================================== > RCS file: > /home/cvs/jakarta-turbine-maven/src/plugins-build/war/plugin.jelly,v > retrieving revision 1.11 > retrieving revision 1.12 > diff -u -r1.11 -r1.12 > --- plugin.jelly 12 Sep 2002 01:50:27 -0000 1.11 > +++ plugin.jelly 7 Oct 2002 11:06:35 -0000 1.12 > @@ -20,16 +20,21 @@ > <attainGoal name="test:test"/> > </j:if> > > + <available property="webSourcesPresent" > + file="${maven.war.src}"/> > + > <echo>Building WAR ${pom.id}</echo> > > <mkdir dir="${maven.war.build.dir}" /> > <war warfile="${maven.war.build.dir}/${pom.id}.war" > webxml="${maven.war.webxml}"> > > - <fileset dir="${maven.war.src}"> > - <exclude name="WEB-INF/web.xml"/> > - </fileset> > - > + <j:if test="${webSourcesPresent == 'true'}"> > + <fileset dir="${maven.war.src}"> > + <exclude name="WEB-INF/web.xml"/> > + </fileset> > + </j:if> > + > <j:forEach var="dep" items="${pom.dependencies}"> > <j:if test="${dep.getProperty('war.bundle.jar')=='true'}"> > <lib > dir="${maven.repo.local}/${dep.getProjectId()}/jars/"> > > > > 1.1 > jakarta-turbine-maven/src/plugins-build/war/xdocs/changes.xml > > Index: changes.xml > =================================================================== > <?xml version="1.0"?> > <document> > <properties> > <title>Changes</title> > <author email="[EMAIL PROTECTED]">Vincent Massol</author> > </properties> > > <body> > <release version="1.2" date="in CVS"> > <action dev="vmassol" type="add"> > Added support for WARs that contain only java > classes and no web > resoures. > </action> > </release> > </body> > </document> > > > > > > -- > To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
war2.plugin.jelly.patch
Description: Binary data
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
