jford       2004/06/24 12:56:52

  Modified:    .        maven.xml
  Log:
  Removed jar from war.  Stops tests from running twice.
  
  Revision  Changes    Path
  1.21      +8 -2      jakarta-jetspeed/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- maven.xml 3 Jun 2004 21:35:37 -0000       1.20
  +++ maven.xml 24 Jun 2004 19:56:52 -0000      1.21
  @@ -231,19 +231,25 @@
        =================================================================== 
        -->
        <preGoal name="war:war">
  -             <attainGoal name="jar"/>        
  +             <!--This causes tests to be ran twice-->
  +             <!--<attainGoal name="jar"/>    -->
  +             
                <echo>Deleting uneeded resources from ${maven.war.webapp.dir}...</echo>
                <delete failonerror="false">
                        <fileset dir="${maven.war.webapp.dir}" includes="**/*.log"/>
                        <fileset dir="${maven.war.webapp.dir}" includes="**/*.log.1"/>
  -                     <fileset dir="${maven.war.webapp.dir}" 
includes="**/WEB-INF/classes/**"/>                       
  +                     <!--<fileset dir="${maven.war.webapp.dir}" 
includes="**/WEB-INF/classes/**"/>                   -->
                </delete>
  +             
  +             
  +             <!--
                <echo>Copying ${maven.final.name}.jar to 
${maven.war.webapp.dir}...</echo>              
                <copy todir="${maven.war.webapp.dir}/WEB-INF/lib">
                        <fileset dir="${maven.build.dir}">
                                <include name="${maven.final.name}.jar"/>
                        </fileset>
                </copy>
  +             -->
        </preGoal>      
        
       <goal name="deploy" description="Deploys jetspeed.war on a local server">       
 
  
  
  

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

Reply via email to