perfsonar development work

Author: roman
Date: 2006-12-21 08:41:45 -0500 (Thu, 21 Dec 2006)
New Revision: 1862

Modified:
   branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
   branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
Log:
cleaning Tomcat variables CATALINA_HOME and CATALINA_BASE before starting 
Tomcat

Modified: branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml     2006-12-21 
13:33:16 UTC (rev 1861)
+++ branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml     2006-12-21 
13:41:45 UTC (rev 1862)
@@ -224,6 +224,8 @@
             error="${basedir}/log/tomcat.log">
             <arg line="startup.sh"/>
             <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+            <env key="CATALINA_HOME" path=""/>
+            <env key="CATALINA_BASE" path=""/>
         </exec>
 
     </target>

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml 
2006-12-21 13:33:16 UTC (rev 1861)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml 
2006-12-21 13:41:45 UTC (rev 1862)
@@ -118,6 +118,8 @@
             <arg line="startup.sh"/>
             <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
             <env key="LD_LIBRARY_PATH" 
path="${env.LD_LIBRARY_PATH}:${rrd_lib_path}:${rrdjdir}/build"/>
+            <env key="CATALINA_HOME" path=""/>
+            <env key="CATALINA_BASE" path=""/>
         </exec>
 
         <echo>Please, make sure that the Tomcat is running. Use the address 
http://${target.server}:${target.port} .</echo>