You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/01/04 13:37:20 UTC

cvs commit: jakarta-turbine-maven/src/plugins-build/war plugin.jelly

dion        2003/01/04 04:37:20

  Modified:    src/plugins-build/war plugin.jelly
  Log:
  Bring war into line with ear etc
  
  Revision  Changes    Path
  1.18      +3 -3      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- plugin.jelly	30 Nov 2002 01:19:31 -0000	1.17
  +++ plugin.jelly	4 Jan 2003 12:37:19 -0000	1.18
  @@ -29,12 +29,12 @@
     <goal name="war:war" prereqs="war:init" description="Build a war file">
   
       <property name="maven.war.final.name" 
  -      value="${pom.id}-${pom.currentVersion}.war"/>
  +      value="${maven.final.name}.war"/>
     
       <echo>Building WAR ${pom.id}</echo>
   
       <mkdir dir="${maven.war.build.dir}" />
  -    <war warfile="${maven.war.build.dir}/${pom.id}.war"
  +    <war warfile="${maven.war.build.dir}/${maven.war.final.name}"
            webxml="${maven.war.webxml}">
   
         <j:if test="${webSourcesPresent == 'true'}">
  @@ -135,7 +135,7 @@
       <property name="maven.war.install.dir" 
       	value="${maven.repo.local}/${pom.groupId}/wars"/>
       <mkdir dir="${maven.war.install.dir}"/>
  -    <copy file="${maven.war.build.dir}/${pom.id}.war"
  +    <copy file="${maven.war.build.dir}/${maven.war.final.name}"
         tofile="${maven.war.install.dir}/${maven.war.final.name}"/>
   
     </goal>