[Yanel-commits] rev 47483 - in public/yanel/trunk/src/build: . targets targets/continuous-integration

[michi at wyona.com]

Author: michi
Date: 2010-02-08 15:10:33 +0100 (Mon, 08 Feb 2010)
New Revision: 47483

Modified:
   public/yanel/trunk/src/build/build.xml
   public/yanel/trunk/src/build/targets/continuous-integration/CI
   public/yanel/trunk/src/build/targets/continuous-integration/reCI
   public/yanel/trunk/src/build/targets/install-tomcat.xml
Log:
question ports added and answer property names fixed

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2010-02-08 13:27:07 UTC (rev 47482)
+++ public/yanel/trunk/src/build/build.xml	2010-02-08 14:10:33 UTC (rev 47483)
@@ -269,6 +269,7 @@
     <antcall target="clean-all"/>
 
     <property name="answerContinueConfig" value="NO"/> <!-- No further configuration -->
+    <property name="question.ports" value="YES"/> <!-- Assume that all ports are available -->
     <property name="answerReconfigureTomcat1" value="no"/> <!-- No SSL -->
     <property name="answerAskForCustomTomcatPath" value="NO"/> <!-- No custom Tomcat -->
     <antcall target="config"/> <!-- IMPORTANT: The config target is reloading the file local.build.properties, but please be aware that only properties which have not been set yet can be set! -->

Modified: public/yanel/trunk/src/build/targets/continuous-integration/CI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/CI	2010-02-08 13:27:07 UTC (rev 47482)
+++ public/yanel/trunk/src/build/targets/continuous-integration/CI	2010-02-08 14:10:33 UTC (rev 47483)
@@ -22,7 +22,8 @@
 ./build.sh clean-all -DanswerDeleteLocalBuildProperties=yes -DanswerDeleteLocalConfigDir=NO -DanswerCleanTomcatClusterNode1=yes
 #TODO: use our own Maven local repo instead of the user's!
 
-./yanel.sh configure -Danswer=NO \
+./yanel.sh configure -DanswerContinueConfig=NO \
+ -Dquestion.ports=YES \
  -DanswerReconfigureTomcat1=no \
  -DanswerAskForCustomTomcatPath=NO
 #FIXME: we do not reconfigure Tomcat for SSL because Canoo tests fail with SSL activated! :/
@@ -34,7 +35,7 @@
 #TODO: delete then recreate a few resources from scratch:
 #./build.sh new-resource-type ...
 
-./build.sh $BUILD_OPTS -Danswer=YES #XXX HACK: endorsed lib management always uses the same variable to ask for user input
+./build.sh $BUILD_OPTS -DanswerCopyEndorsedJar=YES #XXX HACK: endorsed lib management always uses the same variable to ask for user input
 
 # Patch Tomcat ports:
 tools/apache-ant/bin/ant -f tools/apache-tomcat/build.xml configure-host -Dtomcat.home.dir=$TOMCAT_HOME -Dhost=localhost -Dhost.HTTP.port=$HTTP_PORT -Dhost.HTTPS.port=$HTTPS_PORT -Dhost.SHUTDOWN.port=$SHUTDOWN_PORT -Dhost.AJP.port=$AJP_PORT

Modified: public/yanel/trunk/src/build/targets/continuous-integration/reCI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/reCI	2010-02-08 13:27:07 UTC (rev 47482)
+++ public/yanel/trunk/src/build/targets/continuous-integration/reCI	2010-02-08 14:10:33 UTC (rev 47483)
@@ -31,7 +31,8 @@
 #./build.sh clean -Dforce-clean=true
 #TODO: use our own Maven local repo instead of the user's!
 
-./yanel.sh configure -Danswer=NO \
+./yanel.sh configure -DanswerContinueConfig=NO \
+ -Dquestion.ports=YES \
  -DanswerReconfigureTomcat1=no \
  -DanswerAskForCustomTomcatPath=NO
 #FIXME: we do not reconfigure Tomcat for SSL because Canoo tests fail with SSL activated! :/
@@ -43,7 +44,7 @@
 #TODO: delete then recreate a few resources from scratch:
 #./build.sh new-resource-type ...
 
-./build.sh $BUILD_OPTS -Danswer=YES #XXX HACK: endorsed lib management always uses the same variable to ask for user input
+./build.sh $BUILD_OPTS -DanswerCopyEndorsedJar=YES #XXX HACK: endorsed lib management always uses the same variable to ask for user input
 
 # Patch Tomcat ports:
 tools/apache-ant/bin/ant -f tools/apache-tomcat/build.xml configure-host -Dtomcat.home.dir=$TOMCAT_HOME -Dhost=localhost -Dhost.HTTP.port=$HTTP_PORT -Dhost.HTTPS.port=$HTTPS_PORT -Dhost.SHUTDOWN.port=$SHUTDOWN_PORT -Dhost.AJP.port=$AJP_PORT

Modified: public/yanel/trunk/src/build/targets/install-tomcat.xml
===================================================================
--- public/yanel/trunk/src/build/targets/install-tomcat.xml	2010-02-08 13:27:07 UTC (rev 47482)
+++ public/yanel/trunk/src/build/targets/install-tomcat.xml	2010-02-08 14:10:33 UTC (rev 47483)
@@ -29,6 +29,20 @@
     </chmod>
     <delete dir="${yanel.source.home}/local/META-INF"/>
 
+    <input message="Are the ports 8080, 8005 and 8009 available? (YES/no)" addproperty="question.ports" defaultvalue="YES"/>
+    <if>
+      <equals arg1="${question.ports}" arg2="no"/>
+      <then>
+        <input message="WARNING: Please make sure to reconfigure the file '${default.tomcat.home.dir}/conf/server.xml' after this script has finished. Please hit return to continue." addproperty="confirm.reconfigure.server.xml"/>
+      </then>
+    </if>
+<!-- TODO: Make the ports configurable ...
+    <input message="Do you want to use 8080 as HTTP port? If so, then please just hit enter. If not, then please type another port and hit enter." addproperty="default.http.port" defaultvalue="8080"/>
+    <input message="Do you want to use 8005 as shutdown port? If so, then please just hit enter. If not, then please type another port and hit enter." addproperty="default.shutdown.port" defaultvalue="8005"/>
+    <input message="Do you want to use 8009 as AJP port? If so, then please just hit enter. If not, then please type another port and hit enter." addproperty="default.ajp.port" defaultvalue="8009"/>
+-->
+    <!-- INFO: SSL will be handled at some later stage -->
+
     <condition property="isJava1.4">
       <equals arg1="${ant.java.version}" arg2="1.4"/>
     </condition>