From f2661f2e5262818868a3df1487ff3e69e13fb202 Mon Sep 17 00:00:00 2001
From: Cedric Staub <cs.staub@gmail.com>
Date: Tue, 11 Sep 2012 11:40:03 +0200
Subject: [PATCH] Change handling of local.build.properties

---
 conf/log4j.properties                |  2 +-
 src/build/targets/config.xml         | 13 +++++++++----
 src/build/targets/install-tomcat.xml | 15 +++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/conf/log4j.properties b/conf/log4j.properties
index 2cb86054a..90825a709 100644
--- a/conf/log4j.properties
+++ b/conf/log4j.properties
@@ -13,7 +13,7 @@
 # Change 20091201: access log config added
 # --------------------------------------------------------------------------------------------------
 # Version of this file in order to compare with local.log4j.properties
-version.log4j.properties=2012081600
+version.log4j.properties=2012091000
 
 
 log4j.category.Access=INFO, A2
diff --git a/src/build/targets/config.xml b/src/build/targets/config.xml
index cda9e50d6..733a5d987 100644
--- a/src/build/targets/config.xml
+++ b/src/build/targets/config.xml
@@ -59,7 +59,12 @@
 
   <target name="create-local-build-properties" if="local.build.properties.does.not.exist.yet" depends="init">
     <echo>Local build configuration ${yanel.source.home}/src/build/local.build.properties does not exist yet!</echo>
-    <copy file="${yanel.source.home}/src/build/build.properties" tofile="${yanel.source.home}/src/build/local.build.properties" overwrite="false"/>
+    <touch file="${yanel.source.home}/src/build/local.build.properties"/>
+
+    <property file="${yanel.source.home}/src/build/build.properties"/>
+    <propertyfile file="${yanel.source.home}/src/build/local.build.properties">
+      <entry key="build.properties.version" value="${build.properties.version}"/>
+    </propertyfile>
 
     <input message="Do you have an existing Tomcat instance which you want to use as servlet engine for Yanel (if not, then this build process will install Tomcat '${tomcat.version}' at '${default.tomcat.home.dir}' automatically)? (yes/NO): " defaultvalue="NO" addproperty="answerAskForCustomTomcatPath"/>
 
@@ -87,9 +92,9 @@
 
     <echo>User specific Tomcat: ${pathOfUserSpecificTomcat}</echo>
 
-    <replace file="${yanel.source.home}/src/build/local.build.properties" value="tomcat1.home.dir=${pathOfUserSpecificTomcat}">
-      <replacetoken>#tomcat1.home.dir=../tomcat-cluster/build/jakarta-tomcat-5.0.30-cnode1</replacetoken>
-    </replace>
+    <propertyfile file="${yanel.source.home}/src/build/local.build.properties">
+      <entry key="tomcat1.home.dir" value="${pathOfUserSpecificTomcat}"/>
+    </propertyfile>
   </target>
 
   <target name="configure-local" if="yes.continue">
diff --git a/src/build/targets/install-tomcat.xml b/src/build/targets/install-tomcat.xml
index 6562c8a18..13516d266 100644
--- a/src/build/targets/install-tomcat.xml
+++ b/src/build/targets/install-tomcat.xml
@@ -54,17 +54,12 @@
     </condition>
     <antcall target="copy-catalina-script"/>
     
-    <replace file="${yanel.source.home}/src/build/local.build.properties" value="tomcat1.home.dir=${default.tomcat.home.dir.forward.slashes}">
-      <replacetoken>#tomcat1.home.dir=../tomcat-cluster/build/jakarta-tomcat-5.0.30-cnode1</replacetoken>
-    </replace>
-
     <!-- NOTE: Assume that SSL will be enabled (see targets/webapp/cluster.xml), and if not, then the target comment-local-tomcat1-ports will disable them again! -->
-    <replace file="${yanel.source.home}/src/build/local.build.properties" value="tomcat1.http.port=8080">
-      <replacetoken>#tomcat1.http.port=9190</replacetoken>
-    </replace>
-    <replace file="${yanel.source.home}/src/build/local.build.properties" value="tomcat1.ssl.port=8443">
-      <replacetoken>#tomcat1.ssl.port=9143</replacetoken>
-    </replace>
+    <propertyfile file="${yanel.source.home}/src/build/local.build.properties" comment="Default Tomcat">
+      <entry key="tomcat1.home.dir" value="${default.tomcat.home.dir.forward.slashes}"/>
+      <entry key="tomcat1.http.port" value="8080"/>
+      <entry key="tomcat1.ssl.port" value="8443"/>
+    </propertyfile>
   </target>
   
   <target name="copy-java1.4-libs" if="isJava1.4" description="Copy jars specific to java 1.4" depends="init">