[Yanel-commits] rev 40067 - public/yanel/trunk/src/build/targets/continuous-integration

[michi at wyona.com]

Author: michi
Date: 2008-11-20 15:26:03 +0100 (Thu, 20 Nov 2008)
New Revision: 40067

Modified:
   public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.xml
Log:
check if at least one tomcat is set

Modified: public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.xml
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.xml	2008-11-20 14:15:59 UTC (rev 40066)
+++ public/yanel/trunk/src/build/targets/continuous-integration/continuous-integration.xml	2008-11-20 14:26:03 UTC (rev 40067)
@@ -56,13 +56,27 @@
   </target>
 
   <target name="startup-tomcat-unix" if="isUnix">
-     <condition property="isTomcat1HomeSet">
-       <isset property="tomcat1.home.dir"/>
+    <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>
+
+    <condition property="isTomcat2HomeSet">
+      <isset property="tomcat2.home.dir"/>
+    </condition>
     <antcall target="startup-tomcat-unix-node2"/>
   </target>