[704] branches/Orchestra_4_0/src/bin/build.xml: +confusion between CATALINA_BASE and CATALINA_HOME

[Stanislas Giraudet de Boudemange <giraudes@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Title: [704] branches/Orchestra_4_0/src/bin/build.xml: +confusion between CATALINA_BASE and CATALINA_HOME

Revision

704

Author

giraudes

Date

2007-07-20 11:43:22 +0200 (Fri, 20 Jul 2007)

Log Message

+confusion between CATALINA_BASE and CATALINA_HOME

Modified Paths

• branches/Orchestra_4_0/src/bin/build.xml

Diff

Modified: branches/Orchestra_4_0/src/bin/build.xml (703 => 704)

--- branches/Orchestra_4_0/src/bin/build.xml	2007-07-20 09:27:22 UTC (rev 703)
+++ branches/Orchestra_4_0/src/bin/build.xml	2007-07-20 09:43:22 UTC (rev 704)
@@ -11,7 +11,7 @@
   <property environment="env"/>
 
   <!--Axis properties-->
-  <property name="axis.base" value="${env.CATALINA_HOME}/webapps/axis/"/>
+  <property name="axis.base" value="${env.CATALINA_BASE}/webapps/axis/"/>
   <property name="axis.lib" value="${axis.base}/WEB-INF/lib/"/>
 
 
@@ -44,7 +44,6 @@
   <target name="checkEnv">
     <description>Check that environment variables have been set up.</description>
   <echo>Check environments variable:</echo>
-    <echo message="CATALINA_HOME  : '${env.CATALINA_HOME}'"/>
     <echo message="CATALINA_BASE  : '${env.CATALINA_BASE}'"/>
     <echo message="JAVA_HOME      : '${env.JAVA_HOME}'"/>
     <echo message="ORCHESTRA_HOME : '${env.ORCHESTRA_HOME}'"/>
@@ -54,11 +53,8 @@
                  <isset property="env.CATALINA_BASE"/>
                 </not>
                 <equals arg1="" arg2="${env.CATALINA_BASE}"/>
+
         <not>
-          <isset property="env.CATALINA_HOME"/>
-        </not>
-        <equals arg1="" arg2="${env.CATALINA_HOME}"/>
-        <not>
           <isset property="env.JAVA_HOME"/>
         </not>
         <equals arg1="" arg2="${env.JAVA_HOME}"/>