[jbpm-commits] JBoss JBPM SVN: r4618 - in jbpm4/branches/tbaeyens: qa and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-04-25 06:19:40 -0400 (Sat, 25 Apr 2009)
New Revision: 4618

Modified:
   jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml
   jbpm4/branches/tbaeyens/qa/build.xml
Log:
qa scripts

Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml	2009-04-25 10:06:46 UTC (rev 4617)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml	2009-04-25 10:19:40 UTC (rev 4618)
@@ -2,24 +2,54 @@
 
 <project name="jbpm.jboss.install">
 	
-  <!-- this allows for developer-specific configurations -->
+  <!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
   <property file="${user.home}/.jbpm4/build.properties" />
+	
+  <!-- DISPLAY INPUT PARAMETERS -->
+  <echo message="database: ${database}" />
+  <fail message="property database not specified.  specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" />
 
-  <!-- the default values here should reflect the qa environment -->
-  <property name="tmp.dir" value="c:/temp/jbpmqa" />
-  <property name="jboss.version" value="5.0.0.GA" />
+  <echo message="jboss.version: ${jboss.version}" />
+  <fail message="property jboss.version not specified.  specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" />
+
+  <echo message="worspace: ${workspace}" />
+  <fail message="property worspace not specified.  specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" />
+
+  <echo message="maven.home: ${maven.home}" />
+  <fail message="property maven.home not specified.  specify -Dmaven.home=... on the command line or add maven.home=... in your ${user.home}/.jbpm4/build.properties" unless="maven.home" />
+
+  <!-- DERIVED PROPERTIES -->
+  <property name="jbpm.version" value="4.0.0-SNAPSHOT" />
+  <echo message="jbpm.version: ${jbpm.version}" />
+
+  <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" />
+  <echo message="jbpm.filename: ${jbpm.filename}" />
+
+  <property name="jbpm.distro.url" value="file:///${maven.home}/repository/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" />
+  <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
+
+  <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
+  <echo message="jbpm.home: ${jbpm.home}" />
+  
   <property name="jboss.filename" value="jboss-${jboss.version}.zip" />
+  <echo message="jboss.filename: ${jboss.filename}" />
+
   <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" />
-  <property name="jboss.distro.local.path" value="${tmp.dir}/${jboss.filename}" />
-  <property name="jboss.home" value="c:/software/jboss-${jboss.version}" />
+  <echo message="jboss.distro.url: ${jboss.distro.url}" />
+
+  <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" />
+  <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
+
   <property name="jboss.server.configuration" value="default" />
+  <echo message="jboss.server.configuration: ${jboss.server.configuration}" />
+
   <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
-	
-  <property name="jbpm.version" value="4.0.0-SNAPSHOT" />
-  <property name="jbpm.home" value="c:/software/jbpm-${jbpm.version}" />
+  <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
 
-  <property name="database" value="hsqldb" />
+  <property name="downloads.dir" value="${workspace}/downloads" />
+  <echo message="downloads.dir: ${downloads.dir}" />
 	
+	<!-- CONDITIONS -->
 	<condition property="jboss.version.500">
 		<equals arg1="${jboss.version}" arg2="5.0.0.GA" />
 	</condition>
@@ -27,7 +57,7 @@
     <equals arg1="${database}" arg2="hsqldb" />
   </condition>
 
-
+  <!-- TARGETS -->
   <!-- ### MAIN TARGET TO INSTALL JBPM INTO JBOSS ######################### -->
 	<target name="install.jbpm.into.jboss" description="installs jBPM into JBoss">
     <antcall target="install.jbpm.into.jboss.generics" />
@@ -148,12 +178,12 @@
   </target>
 
 	<target name="get.jboss" unless="jboss.available.locally">
-    <mkdir dir="${tmp.dir}" />
+    <mkdir dir="${downloads.dir}" />
     <get src="${jboss.distro.url}" dest="${jboss.distro.local.path}" />
   </target>
 
-  <!-- ### JBOSS START ################################################### -->
-  <target name="jboss.start" description="starts jboss and waits till jboss is booted, then lets jboss run in the background">
+  <!-- ### START JBOSS ################################################### -->
+  <target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background">
     <taskdef name="start-jboss"
              classname="org.jbpm.pvm.internal.ant.StartJBossTask">
       <classpath>
@@ -165,8 +195,8 @@
 	  <start-jboss jbosshome="${jboss.home}" />
 	</target>
 
-  <!-- ### JBOSS STOP ################################################### -->
-  <target name="jboss.stop" description="signals jboss to stop, but doesn't wait till its finished">
+  <!-- ### STOP JBOSS ################################################### -->
+  <target name="stop.jboss" description="signals jboss to stop, but doesn't wait till its finished">
   	<exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
   		<arg line="-S"/>
   	</exec>

Modified: jbpm4/branches/tbaeyens/qa/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/qa/build.xml	2009-04-25 10:06:46 UTC (rev 4617)
+++ jbpm4/branches/tbaeyens/qa/build.xml	2009-04-25 10:19:40 UTC (rev 4618)
@@ -31,12 +31,24 @@
 	<property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
   <echo message="jbpm.home: ${jbpm.home}" />
 	
-	<property name="jboss.home" value="${workspace}/jboss-${jboss.version}" />
-  <echo message="jboss.home: ${jboss.home}" />
+	<property name="jboss.filename" value="jboss-${jboss.version}.zip" />
+  <echo message="jboss.filename: ${jboss.filename}" />
 
+  <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" />
+  <echo message="jboss.distro.url: ${jboss.distro.url}" />
+
+  <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" />
+  <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
+
+  <property name="jboss.server.configuration" value="default" />
+  <echo message="jboss.server.configuration: ${jboss.server.configuration}" />
+
+  <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
+  <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
+
   <property name="downloads.dir" value="${workspace}/downloads" />
 	<echo message="downloads.dir: ${downloads.dir}" />
-	    
+	
 	<!-- TARGETS -->
 	<target name="delete.jbpm.installation">
 		<delete dir="${jbpm.home}" />