Author: tom.baeyens(a)jboss.com Date: 2010-01-20 11:07:55 -0500 (Wed, 20 Jan 2010) New Revision: 6107 Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java jbpm4/trunk/qa/build.xml Log: JBPM-2714 fixing upgrade for postgresql Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java =================================================================== --- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java 2010-01-20 15:55:02 UTC (rev 6106) +++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java 2010-01-20 16:07:55 UTC (rev 6107) @@ -38,6 +38,7 @@ import org.jbpm.pvm.internal.repository.DeploymentProperty; /** + * @author Tom Baeyens * @author Alejandro Guizar */ public class Upgrade { @@ -69,7 +70,14 @@ private static final long serialVersionUID = 1L; public Object execute(Environment environment) throws Exception { Session session = environment.get(Session.class); - propertiesTableExists = PropertyImpl.propertiesTableExists(session); + propertiesTableExists = PropertyImpl.propertiesTableExists(session); + return null; + } + }); + processEngine.execute(new Command<Object>(){ + private static final long serialVersionUID = 1L; + public Object execute(Environment environment) throws Exception { + Session session = environment.get(Session.class); if (!propertiesTableExists) { try { session.createSQLQuery("select CLASSNAME_ from JBPM4_VARIABLE").list(); Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2010-01-20 15:55:02 UTC (rev 6106) +++ jbpm4/trunk/qa/build.xml 2010-01-20 16:07:55 UTC (rev 6107) @@ -324,9 +324,6 @@ <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> @@ -343,9 +340,6 @@ <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>