[Cobricks-cvscommit] cobricks2 build.xml

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6883

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- build.xml	14 Oct 2004 06:01:12 -0000	1.24
+++ build.xml	23 Oct 2004 15:51:10 -0000	1.25
@@ -17,7 +17,7 @@
 <property name="app.path"      value=""/>
 <property name="app.version"   value="0.9"/>
 <property name="build.home"    value="${basedir}/build"/>
-<property name="java.home"     value="/usr/proj/java/jdk1.4.2"/>
+<property name="java.home.dir"     value="/usr/proj/java/jdk1.4.2"/>
 <property name="catalina.home" value="/usr/proj/java/tomcat5.0.3"/>
 <property name="axis.home"     value="/usr/proj/java/axis-1.1"/>
 <property name="xindice.home"  value="/usr/proj/java/xindice-1.1"/>
@@ -494,7 +494,7 @@
   <echo message="Stopping for Windows-environment"/>
   <echo message="********************************"/>
   <exec dir="." executable="${catalina.home}/bin/shutdown.bat">
-    <env key="JAVA_HOME" path="${java.home}"/>
+    <env key="JAVA_HOME" path="${java.home.dir}"/>
     <env key="CATALINA_HOME" path="${catalina.home}"/>
     <env key="CATALINA_BASE" path="${build.home}"/>
     <arg line=""/>
@@ -506,7 +506,7 @@
   <echo message="Stopping for Unix-environment"/>
   <echo message="*****************************"/>
   <exec dir="." executable="${catalina.home}/bin/shutdown.sh">
-    <env key="JAVA_HOME" path="${java.home}"/>
+    <env key="JAVA_HOME" path="${java.home.dir}"/>
     <env key="CATALINA_HOME" path="${catalina.home}"/>
     <env key="CATALINA_BASE" path="${build.home}"/>
     <arg line=""/>
@@ -518,6 +518,7 @@
   <echo message="Starting for Windows-environment"/>
   <echo message="********************************"/>
   <exec dir="." executable="${catalina.home}/bin/startup-run.bat">
+    <env key="JAVA_HOME" path="${java.home.dir}"/>
     <env key="CATALINA_HOME" path="${catalina.home}"/>
     <env key="CATALINA_BASE" path="${build.home}"/>
     <arg line=""/>
@@ -529,6 +530,7 @@
   <echo message="Starting for Unix-environment"/>
   <echo message="*****************************"/>
   <exec dir="." executable="${catalina.home}/bin/startup-run.sh">
+    <env key="JAVA_HOME" path="${java.home.dir}"/>
     <env key="CATALINA_HOME" path="${catalina.home}"/>
     <env key="CATALINA_BASE" path="${build.home}"/>
     <arg line=""/>
@@ -540,7 +542,7 @@
   <echo message="Starting in background-mode for Windows-environment"/>
   <echo message="***************************************************"/>
   <exec dir="." executable="${catalina.home}/bin/startup.bat">
-    <env key="JAVA_HOME" path="${java.home}"/>
+    <env key="JAVA_HOME" path="${java.home.dir}"/>
     <env key="CATALINA_HOME" path="${catalina.home}"/>
     <env key="CATALINA_BASE" path="${build.home}"/>
     <arg line=""/>
@@ -552,7 +554,7 @@
   <echo message="Starting in background-mode for Unix-environment"/>
   <echo message="************************************************"/>
   <exec dir="." executable="${catalina.home}/bin/startup.sh">
-    <env key="JAVA_HOME" path="${java.home}"/>
+    <env key="JAVA_HOME" path="${java.home.dir}"/>
     <env key="CATALINA_HOME" path="${catalina.home}"/>
     <env key="CATALINA_BASE" path="${build.home}"/>
     <arg line=""/>