vmassol     2003/01/31 03:17:40

  Modified:    petals/ant/src/scripts/share build-tests-weblogic6x.xml
                        build-tests-tomcat4x.xml build-tests-orion1x.xml
                        build-tests-weblogic7x.xml build-tests-resin2x.xml
               petals/ant/src/scripts/j2ee13 build-tests-jboss3x.xml
  Log:
  Added missing "if" condition for the deploy targets
  
  Revision  Changes    Path
  1.4       +1 -1      
jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic6x.xml
  
  Index: build-tests-weblogic6x.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic6x.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build-tests-weblogic6x.xml        30 Jan 2003 10:40:32 -0000      1.3
  +++ build-tests-weblogic6x.xml        31 Jan 2003 11:17:40 -0000      1.4
  @@ -112,7 +112,7 @@
            Deploy the cactified webapp
          ========================================================================
       -->
  -    <target name="cactus.deploy.weblogic6x" 
  +    <target name="cactus.deploy.weblogic6x" if="cactus.home.weblogic6x" 
           description="Deploy the webapp on WebLogic 6.x">
   
           <!-- Copy the webapp -->
  
  
  
  1.6       +3 -2      
jakarta-cactus/petals/ant/src/scripts/share/build-tests-tomcat4x.xml
  
  Index: build-tests-tomcat4x.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-tomcat4x.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build-tests-tomcat4x.xml  30 Jan 2003 10:40:32 -0000      1.5
  +++ build-tests-tomcat4x.xml  31 Jan 2003 11:17:40 -0000      1.6
  @@ -97,7 +97,7 @@
            Deploy the cactified webapp
          ========================================================================
       -->
  -    <target name="cactus.deploy.tomcat4x" 
  +    <target name="cactus.deploy.tomcat4x" if="cactus.home.tomcat4x"
           description="Deploy the webapp on Tomcat 4.x">
   
           <!-- Copy the webapp -->
  @@ -146,7 +146,8 @@
            Clean generated files (including distributables)
          ========================================================================
       -->
  -    <target name="cactus.clean.tomcat4x" depends="cactus.init, cactus.clean" 
description="Clean target directory">
  +    <target name="cactus.clean.tomcat4x" depends="cactus.init,cactus.clean" 
  +     description="Clean target directory">
           <delete includeEmptyDirs="true">
               <fileset dir="${cactus.target.tomcat4x}"/>
           </delete>
  
  
  
  1.4       +1 -1      
jakarta-cactus/petals/ant/src/scripts/share/build-tests-orion1x.xml
  
  Index: build-tests-orion1x.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-orion1x.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build-tests-orion1x.xml   30 Jan 2003 10:40:32 -0000      1.3
  +++ build-tests-orion1x.xml   31 Jan 2003 11:17:40 -0000      1.4
  @@ -92,7 +92,7 @@
            Deploy the cactified webapp
          ========================================================================
       -->
  -    <target name="cactus.deploy.orion1x" 
  +    <target name="cactus.deploy.orion1x" if="cactus.home.orion1x"
           description="Deploy the webapp on Orion 1.x">
   
           <jar destfile="${cactus.target.orion1x}/${cactus.context}.war">
  
  
  
  1.6       +1 -1      
jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic7x.xml
  
  Index: build-tests-weblogic7x.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic7x.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build-tests-weblogic7x.xml        30 Jan 2003 10:40:32 -0000      1.5
  +++ build-tests-weblogic7x.xml        31 Jan 2003 11:17:40 -0000      1.6
  @@ -111,7 +111,7 @@
            Deploy the cactified webapp
          ========================================================================
       -->
  -    <target name="cactus.deploy.weblogic7x" 
  +    <target name="cactus.deploy.weblogic7x" if="cactus.home.weblogic7x" 
           description="Deploy the webapp on WebLogic 7.x">
   
           <!-- Copy the webapp -->
  
  
  
  1.4       +1 -1      
jakarta-cactus/petals/ant/src/scripts/share/build-tests-resin2x.xml
  
  Index: build-tests-resin2x.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-resin2x.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build-tests-resin2x.xml   30 Jan 2003 10:40:32 -0000      1.3
  +++ build-tests-resin2x.xml   31 Jan 2003 11:17:40 -0000      1.4
  @@ -101,7 +101,7 @@
            Deploy the cactified webapp
          ========================================================================
       -->
  -    <target name="cactus.deploy.resin2x" 
  +    <target name="cactus.deploy.resin2x" if="cactus.home.resin2x"
           description="Deploy the webapp on Resin 2.x">
   
           <jar destfile="${cactus.target.resin2x}/${cactus.context}.war">
  
  
  
  1.6       +1 -1      
jakarta-cactus/petals/ant/src/scripts/j2ee13/build-tests-jboss3x.xml
  
  Index: build-tests-jboss3x.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/petals/ant/src/scripts/j2ee13/build-tests-jboss3x.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build-tests-jboss3x.xml   30 Jan 2003 10:46:18 -0000      1.5
  +++ build-tests-jboss3x.xml   31 Jan 2003 11:17:40 -0000      1.6
  @@ -94,7 +94,7 @@
            Deploy the cactified webapp
          ========================================================================
       -->
  -    <target name="cactus.deploy.jboss3x" 
  +    <target name="cactus.deploy.jboss3x" if="cactus.home.jboss3x"
           description="Deploy the webapp on JBoss 3.x">
   
           <!-- Note: It seems JBoss requires a war file in its deploy directory. 
  
  
  

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

Reply via email to