[Yanel-commits] rev 40896 - in
public/yanel/trunk/src/build/targets: . cruise-control
michi at wyona.com
michi at wyona.com
Mon Jan 12 10:31:50 CET 2009
Author: michi
Date: 2009-01-12 10:31:49 +0100 (Mon, 12 Jan 2009)
New Revision: 40896
Added:
public/yanel/trunk/src/build/targets/cruise-control/
public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.properties
public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.xml
Removed:
public/yanel/trunk/src/build/targets/continuous-integration/
public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.properties
public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.xml
Log:
renamed
Copied: public/yanel/trunk/src/build/targets/cruise-control (from rev 40894, public/yanel/trunk/src/build/targets/continuous-integration)
Deleted: public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.properties
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.properties 2009-01-11 11:50:52 UTC (rev 40894)
+++ public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.properties 2009-01-12 09:31:49 UTC (rev 40896)
@@ -1,9 +0,0 @@
-#tomcat ip
-tomcat.ip=127.0.0.1
-
-#tomcat port
-tomcat.port=8080
-#tomcat.port=8443
-
-#DOCUMENT ROOT of apache http to serve a page if tomcat is stoped while cruiscontrol is building
-document.root=/var/www
Copied: public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.properties (from rev 40895, public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.properties)
===================================================================
--- public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.properties (rev 0)
+++ public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.properties 2009-01-12 09:31:49 UTC (rev 40896)
@@ -0,0 +1,9 @@
+#tomcat ip
+tomcat.ip=127.0.0.1
+
+#tomcat port
+tomcat.port=8080
+#tomcat.port=8443
+
+#DOCUMENT ROOT of apache http to serve a page if tomcat is stoped while cruiscontrol is building
+document.root=/var/www
Deleted: public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.xml
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.xml 2009-01-11 11:50:52 UTC (rev 40894)
+++ public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.xml 2009-01-12 09:31:49 UTC (rev 40896)
@@ -1,174 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="yanel-continuous-integration" default="continuous-integration" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <description>Yanel Build for Continuous Integration</description>
-
- <!-- This is file is imported by ../../build.xml and hence resolved relative to ../../build.xml -->
- <property file="targets/continuous-integration/local.continuous-integration.properties"/>
- <property file="targets/continuous-integration/continuous-integration.properties"/>
-
- <target name="continuous-integration">
- <echo>Cleaning Yanel</echo>
- <antcall target="clean"/>
- <echo>Deploying Yanel</echo>
- <antcall target="deploy"/>
- </target>
-
- <target name="start-tomcat" description="starts tomcat">
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
- <condition property="isUnix">
- <os family="unix"/>
- </condition>
- <antcall target="startup-tomcat-windows"/>
- <antcall target="startup-tomcat-unix"/>
- <waitfor maxwait="60" maxwaitunit="second" checkevery="4000">
- <and>
- <socket server="${tomcat.ip}" port="${tomcat.port}"/>
- </and>
- </waitfor>
- <echo message="*****************************************************************"/>
- <echo message="*"/>
- <echo message="* You have successfully started Yanel ${yanel.version} (Revision ${yanel.revision})"/>
- <echo message="*"/>
- <echo message="*"/>
- <echo message="* Start your Browser and visit"/>
- <echo message="*"/>
- <echo message="* http://127.0.0.1:8080/${servlet.context.prefix}/"/>
- <echo message="*"/>
- <echo message="* Thanks for using Yanel"/>
- <echo message="*"/>
- <echo message="*****************************************************************"/>
- <available file="${document.root}/cruise_is_building.html" property="cruise_is_building_html_available"/>
- <antcall target="delete-building-hint"/>
- </target>
-
- <target name="startup-tomcat-windows" if="isWindows">
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-windows-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-windows-node2"/>
- </target>
-
- <target name="startup-tomcat-unix" if="isUnix">
- <fail message="No Tomcat is set within local.build.properties!">
- <condition>
- <and>
- <not>
- <isset property="tomcat1.home.dir"/>
- </not>
- <not>
- <isset property="tomcat2.home.dir"/>
- </not>
- </and>
- </condition>
- </fail>
-
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-unix-node1"/>
-
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="startup-tomcat-unix-node2"/>
- </target>
-
-
- <target name="startup-tomcat-windows-node1" if="isTomcat1HomeSet">
- <echo>Startup Tomcat Cluster Node 1: ${tomcat1.home.dir}/bin/startup.bat</echo>
- <!-- NOTE: Spawn is true because otherwise the batch script will not continue beyond this call (This is only necessary for Windows) -->
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="startup.bat" spawn="true"/>
- </target>
- <target name="startup-tomcat-unix-node1" if="isTomcat1HomeSet">
- <echo>Starting Tomcat (${tomcat1.home.dir}/bin/startup.sh) ...</echo>
- <chmod dir="${tomcat1.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="startup.sh" spawn="false"/>
- </target>
- <target name="startup-tomcat-windows-node2" if="isTomcat2HomeSet">
- <echo>Startup Tomcat Cluster Node 2: ${tomcat2.home.dir}/bin/startup.bat</echo>
- <!-- NOTE: Spawn is true because otherwise the batch script will not continue beyond this call (This is only necessary for Windows) -->
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="startup.bat" spawn="true"/>
- </target>
- <target name="startup-tomcat-unix-node2" if="isTomcat2HomeSet">
- <echo>Starting Tomcat (${tomcat2.home.dir}/bin/startup.sh) ...</echo>
- <chmod dir="${tomcat2.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="startup.sh" spawn="false"/>
- </target>
-
- <target name="stop-tomcat" description="stops tomcat">
- <available file="${document.root}/cruise_is_building.html.orig" property="cruise_is_building_html_orig_available"/>
- <antcall target="copy-building-hint"/>
- <condition property="isWindows">
- <os family="windows"/>
- </condition>
- <condition property="isUnix">
- <os family="unix"/>
- </condition>
- <antcall target="shutdown-tomcat-windows"/>
- <antcall target="shutdown-tomcat-unix"/>
- <echo message="*****************************************************************"/>
- <echo message="*"/>
- <echo message="* You have successfully stopped Yanel ${yanel.version} (Revision ${yanel.revision})"/>
- <echo message="*"/>
- <echo message="* Thanks for using Yanel"/>
- <echo message="*"/>
- <echo message="*****************************************************************"/>
- </target>
-
- <target name="shutdown-tomcat-windows" if="isWindows">
- <echo>Windows ...</echo>
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-windows-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-windows-node2"/>
- </target>
-
- <target name="shutdown-tomcat-unix" if="isUnix">
- <echo>Unix ...</echo>
- <condition property="isTomcat1HomeSet">
- <isset property="tomcat1.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-unix-node1"/>
- <condition property="isTomcat2HomeSet">
- <isset property="tomcat2.home.dir"/>
- </condition>
- <antcall target="shutdown-tomcat-unix-node2"/>
- </target>
-
-
- <target name="shutdown-tomcat-windows-node1" if="isTomcat1HomeSet">
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="shutdown.bat" spawn="false"/>
- </target>
- <target name="shutdown-tomcat-unix-node1" if="isTomcat1HomeSet">
- <echo>Shutdown Tomcat (${tomcat1.home.dir}/bin/shutdown.sh) ...</echo>
- <chmod dir="${tomcat1.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="shutdown.sh" spawn="false"/>
- </target>
- <target name="shutdown-tomcat-windows-node2" if="isTomcat2HomeSet">
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="shutdown.bat" spawn="false"/>
- </target>
- <target name="shutdown-tomcat-unix-node2" if="isTomcat2HomeSet">
- <echo>Shutdown Tomcat (${tomcat2.home.dir}/bin/shutdown.sh) ...</echo>
- <chmod dir="${tomcat2.home.dir}/bin" perm="755" includes="*"/>
- <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="shutdown.sh" spawn="false"/>
- </target>
-
- <target name="copy-building-hint" if="cruise_is_building_html_orig_available" description="copy a message to the httpd saying yanel is stoped and building">
- <copy file="${document.root}/cruise_is_building.html.orig" tofile="${document.root}/cruise_is_building.html"/>
- </target>
-
- <target name="delete-building-hint" if="cruise_is_building_html_available" description="removes the message from the httpd saying yanel is stoped and building">
- <delete file="${document.root}/cruise_is_building.html"/>
- </target>
-</project>
Copied: public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.xml (from rev 40895, public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.xml)
===================================================================
--- public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.xml (rev 0)
+++ public/yanel/trunk/src/build/targets/cruise-control/continuous-integration.xml 2009-01-12 09:31:49 UTC (rev 40896)
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+
+<project name="yanel-cruise-control" default="cruise-control" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+ <description>Yanel Build for Continuous Integration</description>
+
+ <!-- This is file is imported by ../../build.xml and hence resolved relative to ../../build.xml -->
+ <property file="targets/cruise-control/local.continuous-integration.properties"/>
+ <property file="targets/cruise-control/continuous-integration.properties"/>
+
+ <target name="cruise-control" description="Cruise control build process">
+ <echo>Cleaning Yanel</echo>
+ <antcall target="clean"/>
+ <echo>Deploying Yanel</echo>
+ <antcall target="deploy"/>
+ </target>
+
+ <target name="start-tomcat" description="starts tomcat">
+ <condition property="isWindows">
+ <os family="windows"/>
+ </condition>
+ <condition property="isUnix">
+ <os family="unix"/>
+ </condition>
+ <antcall target="startup-tomcat-windows"/>
+ <antcall target="startup-tomcat-unix"/>
+ <waitfor maxwait="60" maxwaitunit="second" checkevery="4000">
+ <and>
+ <socket server="${tomcat.ip}" port="${tomcat.port}"/>
+ </and>
+ </waitfor>
+ <echo message="*****************************************************************"/>
+ <echo message="*"/>
+ <echo message="* You have successfully started Yanel ${yanel.version} (Revision ${yanel.revision})"/>
+ <echo message="*"/>
+ <echo message="*"/>
+ <echo message="* Start your Browser and visit"/>
+ <echo message="*"/>
+ <echo message="* http://127.0.0.1:8080/${servlet.context.prefix}/"/>
+ <echo message="*"/>
+ <echo message="* Thanks for using Yanel"/>
+ <echo message="*"/>
+ <echo message="*****************************************************************"/>
+ <available file="${document.root}/cruise_is_building.html" property="cruise_is_building_html_available"/>
+ <antcall target="delete-building-hint"/>
+ </target>
+
+ <target name="startup-tomcat-windows" if="isWindows">
+ <condition property="isTomcat1HomeSet">
+ <isset property="tomcat1.home.dir"/>
+ </condition>
+ <antcall target="startup-tomcat-windows-node1"/>
+ <condition property="isTomcat2HomeSet">
+ <isset property="tomcat2.home.dir"/>
+ </condition>
+ <antcall target="startup-tomcat-windows-node2"/>
+ </target>
+
+ <target name="startup-tomcat-unix" if="isUnix">
+ <fail message="No Tomcat is set within local.build.properties!">
+ <condition>
+ <and>
+ <not>
+ <isset property="tomcat1.home.dir"/>
+ </not>
+ <not>
+ <isset property="tomcat2.home.dir"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
+ <condition property="isTomcat1HomeSet">
+ <isset property="tomcat1.home.dir"/>
+ </condition>
+ <antcall target="startup-tomcat-unix-node1"/>
+
+ <condition property="isTomcat2HomeSet">
+ <isset property="tomcat2.home.dir"/>
+ </condition>
+ <antcall target="startup-tomcat-unix-node2"/>
+ </target>
+
+
+ <target name="startup-tomcat-windows-node1" if="isTomcat1HomeSet">
+ <echo>Startup Tomcat Cluster Node 1: ${tomcat1.home.dir}/bin/startup.bat</echo>
+ <!-- NOTE: Spawn is true because otherwise the batch script will not continue beyond this call (This is only necessary for Windows) -->
+ <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="startup.bat" spawn="true"/>
+ </target>
+ <target name="startup-tomcat-unix-node1" if="isTomcat1HomeSet">
+ <echo>Starting Tomcat (${tomcat1.home.dir}/bin/startup.sh) ...</echo>
+ <chmod dir="${tomcat1.home.dir}/bin" perm="755" includes="*"/>
+ <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="startup.sh" spawn="false"/>
+ </target>
+ <target name="startup-tomcat-windows-node2" if="isTomcat2HomeSet">
+ <echo>Startup Tomcat Cluster Node 2: ${tomcat2.home.dir}/bin/startup.bat</echo>
+ <!-- NOTE: Spawn is true because otherwise the batch script will not continue beyond this call (This is only necessary for Windows) -->
+ <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="startup.bat" spawn="true"/>
+ </target>
+ <target name="startup-tomcat-unix-node2" if="isTomcat2HomeSet">
+ <echo>Starting Tomcat (${tomcat2.home.dir}/bin/startup.sh) ...</echo>
+ <chmod dir="${tomcat2.home.dir}/bin" perm="755" includes="*"/>
+ <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="startup.sh" spawn="false"/>
+ </target>
+
+ <target name="stop-tomcat" description="stops tomcat">
+ <available file="${document.root}/cruise_is_building.html.orig" property="cruise_is_building_html_orig_available"/>
+ <antcall target="copy-building-hint"/>
+ <condition property="isWindows">
+ <os family="windows"/>
+ </condition>
+ <condition property="isUnix">
+ <os family="unix"/>
+ </condition>
+ <antcall target="shutdown-tomcat-windows"/>
+ <antcall target="shutdown-tomcat-unix"/>
+ <echo message="*****************************************************************"/>
+ <echo message="*"/>
+ <echo message="* You have successfully stopped Yanel ${yanel.version} (Revision ${yanel.revision})"/>
+ <echo message="*"/>
+ <echo message="* Thanks for using Yanel"/>
+ <echo message="*"/>
+ <echo message="*****************************************************************"/>
+ </target>
+
+ <target name="shutdown-tomcat-windows" if="isWindows">
+ <echo>Windows ...</echo>
+ <condition property="isTomcat1HomeSet">
+ <isset property="tomcat1.home.dir"/>
+ </condition>
+ <antcall target="shutdown-tomcat-windows-node1"/>
+ <condition property="isTomcat2HomeSet">
+ <isset property="tomcat2.home.dir"/>
+ </condition>
+ <antcall target="shutdown-tomcat-windows-node2"/>
+ </target>
+
+ <target name="shutdown-tomcat-unix" if="isUnix">
+ <echo>Unix ...</echo>
+ <condition property="isTomcat1HomeSet">
+ <isset property="tomcat1.home.dir"/>
+ </condition>
+ <antcall target="shutdown-tomcat-unix-node1"/>
+ <condition property="isTomcat2HomeSet">
+ <isset property="tomcat2.home.dir"/>
+ </condition>
+ <antcall target="shutdown-tomcat-unix-node2"/>
+ </target>
+
+
+ <target name="shutdown-tomcat-windows-node1" if="isTomcat1HomeSet">
+ <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="shutdown.bat" spawn="false"/>
+ </target>
+ <target name="shutdown-tomcat-unix-node1" if="isTomcat1HomeSet">
+ <echo>Shutdown Tomcat (${tomcat1.home.dir}/bin/shutdown.sh) ...</echo>
+ <chmod dir="${tomcat1.home.dir}/bin" perm="755" includes="*"/>
+ <exec dir="${tomcat1.home.dir}/bin" resolveexecutable="true" executable="shutdown.sh" spawn="false"/>
+ </target>
+ <target name="shutdown-tomcat-windows-node2" if="isTomcat2HomeSet">
+ <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="shutdown.bat" spawn="false"/>
+ </target>
+ <target name="shutdown-tomcat-unix-node2" if="isTomcat2HomeSet">
+ <echo>Shutdown Tomcat (${tomcat2.home.dir}/bin/shutdown.sh) ...</echo>
+ <chmod dir="${tomcat2.home.dir}/bin" perm="755" includes="*"/>
+ <exec dir="${tomcat2.home.dir}/bin" resolveexecutable="true" executable="shutdown.sh" spawn="false"/>
+ </target>
+
+ <target name="copy-building-hint" if="cruise_is_building_html_orig_available" description="copy a message to the httpd saying yanel is stoped and building">
+ <copy file="${document.root}/cruise_is_building.html.orig" tofile="${document.root}/cruise_is_building.html"/>
+ </target>
+
+ <target name="delete-building-hint" if="cruise_is_building_html_available" description="removes the message from the httpd saying yanel is stoped and building">
+ <delete file="${document.root}/cruise_is_building.html"/>
+ </target>
+</project>
More information about the Yanel-commits
mailing list