[Yanel-commits] rev 47469 - in public/yanel/trunk/src/build: . targets targets/webapp

michi at wyona.com michi at wyona.com
Sun Feb 7 11:19:42 CET 2010


Author: michi
Date: 2010-02-07 11:19:42 +0100 (Sun, 07 Feb 2010)
New Revision: 47469

Modified:
   public/yanel/trunk/src/build/build.properties
   public/yanel/trunk/src/build/targets/clean.xml
   public/yanel/trunk/src/build/targets/webapp/cluster.xml
Log:
tomcat webapps dir property moved

Modified: public/yanel/trunk/src/build/build.properties
===================================================================
--- public/yanel/trunk/src/build/build.properties	2010-02-07 09:40:43 UTC (rev 47468)
+++ public/yanel/trunk/src/build/build.properties	2010-02-07 10:19:42 UTC (rev 47469)
@@ -10,6 +10,7 @@
 #
 # IMPORTANT: Because of the changes listed below, one might has to re-configure the local.build.properties file (and in particular synchronize the build.properties.version number
 #
+# Change 20100207: Property tomcat1.webapps.dir, etc. moved to targets/webapp/cluster.xml because property tomcat1.home.dir is commented by default
 # Change 20100202: Java version upgraded to 1.6
 # Change 20100125: log-access property removed because it can now be configured within src/webapp/WEB-INF/local.web.xml
 # Change 20091204: log4j directory enabled
@@ -19,7 +20,7 @@
 # --------------------------------------------------------------------------
 
 # Version of this file in order to compare with local.build.properties
-build.properties.version=2010020200
+build.properties.version=2010020700
 
 # Servlet context prefix
 servlet.context.prefix=yanel
@@ -42,18 +43,8 @@
 #tomcat2.ssl.port=9243
 #tomcat2.http.port=9290
 
-tomcat1.webapps.dir=${tomcat1.home.dir}/webapps
-tomcat1.endorsed-libs.dir=${tomcat1.home.dir}/common/endorsed
-# NOTE: In the case of Tomcat 4 this directory is work/Standalone/localhost ...
-tomcat1.work.dir=${tomcat1.home.dir}/work/Catalina/localhost
 
-tomcat2.webapps.dir=${tomcat2.home.dir}/webapps
-tomcat2.endorsed-libs.dir=${tomcat2.home.dir}/common/endorsed
-tomcat2.work.dir=${tomcat2.home.dir}/work/Catalina/localhost
 
-
-
-
 # ==================================================================
 # Properties below might be rather for the advanced user ;-)
 # ==================================================================

Modified: public/yanel/trunk/src/build/targets/clean.xml
===================================================================
--- public/yanel/trunk/src/build/targets/clean.xml	2010-02-07 09:40:43 UTC (rev 47468)
+++ public/yanel/trunk/src/build/targets/clean.xml	2010-02-07 10:19:42 UTC (rev 47469)
@@ -11,6 +11,9 @@
     <!-- Jetty target -->
     <delete dir="${yanel.source.home}/src/build/target"/>
 
+    <property name="tomcat1.webapps.dir" value="${tomcat1.home.dir}/webapps"/>
+    <property name="tomcat2.webapps.dir" value="${tomcat2.home.dir}/webapps"/>
+
     <condition property="yes-delete-tomcat-cluster-node1">
       <and>
         <isset property="tomcat1.home.dir"/>
@@ -31,8 +34,8 @@
 
     <condition property="yes-delete-tomcat-cluster-node2">
       <and>
-        <isset property="tomcat1.home.dir"/>
-        <available file="${tomcat1.webapps.dir}/${servlet.context.prefix}" type="dir"/>
+        <isset property="tomcat2.home.dir"/>
+        <available file="${tomcat2.webapps.dir}/${servlet.context.prefix}" type="dir"/>
         <istrue value="${force-clean}"/>
       </and>
     </condition>

Modified: public/yanel/trunk/src/build/targets/webapp/cluster.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/cluster.xml	2010-02-07 09:40:43 UTC (rev 47468)
+++ public/yanel/trunk/src/build/targets/webapp/cluster.xml	2010-02-07 10:19:42 UTC (rev 47469)
@@ -5,6 +5,12 @@
 >
 
   <target name="deploy-to-tomcat-cluster-node1" if="property-tomcat-cluster-node1-is-set" description="Deploy webapp to Tomcat cluster node 1">
+    <echo>Deploy webapp to cluster node 1: ${tomcat1.home.dir}</echo>
+
+    <property name="tomcat1.webapps.dir" value="${tomcat1.home.dir}/webapps"/>
+    <property name="tomcat1.endorsed-libs.dir" value="${tomcat1.home.dir}/common/endorsed"/>
+    <!-- NOTE: In the case of Tomcat 4 this directory is work/Standalone/localhost ... -->
+    <property name="tomcat1.work.dir" value="${tomcat1.home.dir}/work/Catalina/localhost"/>
     <echo>Copy webapp (${tomcat1.webapps.dir}):</echo>
 
     <fail message="No such directory: ${tomcat1.webapps.dir}">
@@ -130,6 +136,12 @@
   
   
   <target name="deploy-to-tomcat-cluster-node2" if="property-tomcat-cluster-node2-is-set" description="Deploy webapp to Tomcat cluster node 2">
+    <echo>Deploy webapp to cluster node 2: ${tomcat2.home.dir}</echo>
+
+    <property name="tomcat2.webapps.dir" value="${tomcat2.home.dir}/webapps"/>
+    <property name="tomcat2.endorsed-libs.dir" value="${tomcat2.home.dir}/common/endorsed"/>
+    <!-- NOTE: In the case of Tomcat 4 this directory is work/Standalone/localhost ... -->
+    <property name="tomcat2.work.dir" value="${tomcat2.home.dir}/work/Catalina/localhost"/>
     <echo>Copy webapp (${tomcat2.webapps.dir}):</echo>
 
     <fail message="No such directory: ${tomcat2.webapps.dir}">



More information about the Yanel-commits mailing list