[jbpm-commits] JBoss JBPM SVN: r6099 - jbpm4/trunk/qa.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2010-01-20 03:16:39 -0500 (Wed, 20 Jan 2010)
New Revision: 6099

Modified:
   jbpm4/trunk/qa/build.xml
Log:
JBPM-2714 added schema drop in the setup for hudson upgrade job

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2010-01-20 02:29:42 UTC (rev 6098)
+++ jbpm4/trunk/qa/build.xml	2010-01-20 08:16:39 UTC (rev 6099)
@@ -28,6 +28,9 @@
   <property name="jbpm.distro.dir" value="../modules/distro/target" />
   <property name="jbpm.distro.path" value="${jbpm.distro.dir}/jbpm-${jbpm.version}.zip" />
 
+  <condition property="is.hsqldb">
+    <equals arg1="${database}" arg2="hsqldb" />
+  </condition>
   <condition property="is.oracle">
     <equals arg1="${database}" arg2="oracle" />
   </condition>
@@ -260,8 +263,9 @@
     <delete file="upgrade/target/jbpm-test-upgrade/hibernate.properties" />
   	
     <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" />
-    <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" />
-    
+  	<antcall target="start.hsqldb" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
+
     <!-- create jbpm schema using the old jbpm distro -->
     <condition property="is.old.jbpm.40">
       <equals arg1="${old.jbpm.version}" arg2="4.0" />
@@ -302,39 +306,13 @@
   </target>
 
   
-  <!--
-  <condition property="is.hsqldb">
-    <equals arg1="${database}" arg2="hsqldb" />
-  </condition>
   <target name="start.hsqldb" if="is.hsqldb">
-    <delete dir="upgrade/target/hsqldb" />
-    <mkdir dir="upgrade/target/hsqldb" />
-    <java classname="org.hsqldb.Server" dir="upgrade/target/hsqldb" fork="true">
-        <arg line="-address localhost -port 1701 -dbname.0 jbpmDatabase" />
-        <classpath>
-      <fileset dir="upgrade/target">
-        <include name="hsqldb.jar"/>
-      </fileset>
-        </classpath>
-    </java>
+    <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" />
   </target>
   
   <target name="stop.hsqldb" if="is.hsqldb">
-    <property file="upgrade/target/jdbc/${database}.properties" />
-    <path id="hsqldb.classpath">
-      <fileset dir="upgrade/target">
-        <include name="hsqldb.jar"/>
-      </fileset>
-    </path>
-    <sql driver="${jdbc.driver}" 
-       password="${jdbc.password}" 
-       url="${jdbc.url}" 
-       userid="${jdbc.username}" 
-         onerror="continue"
-         autocommit="true"
-         classpathref="hsqldb.classpath">SHUTDOWN</sql>
+    <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" />
   </target>
-  -->
 
   <target name="create.jbpm.schema.in.jbpm.40" if="is.old.jbpm.40">
     <echo message="creating schema in jbpm 4.0" />
@@ -346,6 +324,9 @@
       <replacetoken><![CDATA[<import resource="jbpm.businesscalendar.cfg.xml" />]]></replacetoken>
       <replacevalue></replacevalue>
     </replace>
+    <ant antfile="${old.jbpm.home}/db/build.xml" target="drop.jbpm.schema" inheritall="false">
+      <property name="database" value="${database}" />
+    </ant>
     <ant antfile="${old.jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false">
       <property name="database" value="${database}" />
     </ant>
@@ -362,6 +343,9 @@
     <copy todir="${old.jbpm.home}/install/jdbc">
       <fileset dir="upgrade/target/jdbc" />
     </copy>
+    <ant antfile="${old.jbpm.home}/install/build.xml" target="drop.jbpm.schema" inheritall="false">
+      <property name="database" value="${database}" />
+    </ant>
     <ant antfile="${old.jbpm.home}/install/build.xml" target="create.jbpm.schema" inheritall="false">
       <property name="database" value="${database}" />
     </ant>
@@ -374,7 +358,7 @@
   
   <target name="testsuite.upgrade.teardown">
     <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" inheritall="false" />
-    <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" />
+    <antcall target="stop.hsqldb" />
   </target>