[Yanel-commits] rev 20437 - public/yanel/trunk/src/build

[michi at wyona.com]

Author: michi
Date: 2006-11-29 17:35:33 +0100 (Wed, 29 Nov 2006)
New Revision: 20437

Modified:
   public/yanel/trunk/src/build/build.properties
   public/yanel/trunk/src/build/build.xml
Log:
default settings fixed

Modified: public/yanel/trunk/src/build/build.properties
===================================================================
--- public/yanel/trunk/src/build/build.properties	2006-11-29 16:12:25 UTC (rev 20436)
+++ public/yanel/trunk/src/build/build.properties	2006-11-29 16:35:33 UTC (rev 20437)
@@ -10,14 +10,16 @@
 servlet.container=Tomcat
 
 # Tomcat cluster nodes 1 and 2
-###tomcat1.home.dir=../../local/apache-tomcat-5.5.20
+tomcat1.home.dir=../../local/apache-tomcat-5.5.20
+tomcat1.ssl.port=8443
+tomcat1.http.port=8080
+
 #tomcat1.home.dir=../tomcat-cluster/build/jakarta-tomcat-5.0.30-cnode1
-#tomcat2.home.dir=../tomcat-cluster/build/jakarta-tomcat-5.0.30-cnode2
-
-#tomcat1.ssl.port=8443
+#tomcat1.ssl.port=9143
 #tomcat1.http.port=9190
 
-#tomcat2.ssl.port=9443
+#tomcat2.home.dir=../tomcat-cluster/build/jakarta-tomcat-5.0.30-cnode2
+#tomcat2.ssl.port=9243
 #tomcat2.http.port=9290
 
 tomcat1.webapps.dir=${tomcat1.home.dir}/webapps

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2006-11-29 16:12:25 UTC (rev 20436)
+++ public/yanel/trunk/src/build/build.xml	2006-11-29 16:35:33 UTC (rev 20437)
@@ -108,13 +108,9 @@
       <isset property="tomcat2.home.dir"/>
     </condition>
     <antcall target="ask-to-reconfigure-tomcat-cluster-node2"/>
-  
-    <echo>########################################################################</echo>
-    <echo># As a first time user one does NOT have to configure anything, but    #</echo>
-    <echo># just run build.sh resp. build.bat and then yanel.sh resp. yanel.bat! #</echo>
-    <echo>########################################################################</echo>
 
-    <input message="Do you want to continue the configuration? (yes/NO)" addproperty="answer" defaultvalue="NO"/>
+    <antcall target="first-time-user-configuration-message"/>
+    <input message="Do you want to continue the configuration nevertheless? (yes/NO)" addproperty="answer" defaultvalue="NO"/>
 
     <condition property="yes.continue">
       <equals arg1="yes" arg2="${answer}"/>
@@ -122,13 +118,19 @@
     <antcall target="configure-local"/>
   </target>
 
+  <target name="first-time-user-configuration-message">
+    <echo>#################################################################################</echo>
+    <echo># As a first time user one does NOT have to configure anything any further, but #</echo>
+    <echo># rather exit here and just run build.sh on UNIX resp. build.bat on Windows!    #</echo>
+    <echo>#################################################################################</echo>
+  </target>
+
   <target name="create-local-build-properties" if="local.build.properties.does.not.exist.yet" depends="init">
     <echo>Build configuration ${yanel.home.dir}/local.build.properties does not exist yet!</echo>
 
+    <copy file="${yanel.home.dir}/src/build/build.properties" tofile="${yanel.home.dir}/src/build/local.build.properties" overwrite="false"/>
+
     <antcall target="install-default-tomcat"/>
-<!--
-    <copy file="${yanel.home.dir}/src/build/build.properties" tofile="${yanel.home.dir}/src/build/local.build.properties" overwrite="false"/>
--->
   </target>
 
   <target name="configure-local" if="yes.continue">