carlos      2004/07/14 01:52:21

  Modified:    war/xdocs goals.xml changes.xml
               war      plugin.jelly
  Log:
  Splitted war:webapp in war:war-resources and war:webapp
  
  Revision  Changes    Path
  1.7       +8 -1      maven-plugins/war/xdocs/goals.xml
  
  Index: goals.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/war/xdocs/goals.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- goals.xml 4 Mar 2004 18:39:37 -0000       1.6
  +++ goals.xml 14 Jul 2004 08:52:20 -0000      1.7
  @@ -49,8 +49,15 @@
           </description>
         </goal>
         <goal>
  +        <name>war:war-resources</name>
  +        <description>Copy files from maven.war.src to 
maven.war.webapp.dir</description>
  +      </goal>
  +      <goal>
           <name>war:webapp</name>
  -        <description>Build a webapp directory</description>
  +        <description>
  +            Build a webapp directory in that created by war:war-resources, copying 
libraries,
  +            classes and tlds
  +        </description>
         </goal>
         <goal>
           <name>war:install</name>
  
  
  
  1.30      +1 -0      maven-plugins/war/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/war/xdocs/changes.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- changes.xml       6 Jul 2004 12:37:18 -0000       1.29
  +++ changes.xml       14 Jul 2004 08:52:20 -0000      1.30
  @@ -25,6 +25,7 @@
     </properties>
     <body>
       <release version="1.7-SNAPSHOT" date="in CVS">
  +      <action dev="carlos" type="update">Splitted war:webapp in war:war-resources 
and war:webapp.</action>
         <action dev="brett" type="update">Deprecated war:load hook goal</action>
         <action dev="dion" type="fix" issue="MPWAR-22">
           Allow use of maven.war.manifest to specify the manifest file location.
  
  
  
  1.44      +22 -14    maven-plugins/war/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/war/plugin.jelly,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- plugin.jelly      6 Jul 2004 12:37:18 -0000       1.43
  +++ plugin.jelly      14 Jul 2004 08:52:20 -0000      1.44
  @@ -103,27 +103,16 @@
     </goal>
   
     <!--==================================================================-->
  -  <!-- Builds an expanded webapp                                        -->
  +  <!-- Copies webapp files to target dir                                   -->
     <!--==================================================================-->    
  -  <goal name="war:webapp" prereqs="war:init,test:test" 
  -    description="Build a webapp directory">
  -
  -    <ant:echo>Assembling webapp ${pom.artifactId}</ant:echo>
  +  <goal name="war:war-resources" prereqs="war:init" 
  +    description="Copy webapp resources to target directory">
   
       <ant:mkdir dir="${maven.war.webapp.dir}"/>
   
       <j:set var="webapp.build.webinf" value="${maven.war.webapp.dir}/WEB-INF"/>
       <ant:mkdir dir="${webapp.build.webinf}"/>
   
  -    <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:if test="${webSourcesPresent == 'true'}">
         <ant:copy todir="${maven.war.webapp.dir}" preservelastmodified="true">
           <ant:fileset dir="${maven.war.src}"
  @@ -138,6 +127,25 @@
           tofile="${webapp.build.webinf}/web.xml"
           overwrite="true" />
       </util:available>
  +
  +  </goal>
  +
  +  <!--==================================================================-->
  +  <!-- Builds an expanded webapp                                        -->
  +  <!--==================================================================-->    
  +  <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:forEach var="lib" items="${pom.artifacts}">
         <j:set var="dep" value="${lib.dependency}"/>     
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to