Author: tom.baeyens(a)jboss.com Date: 2009-09-21 12:10:41 -0400 (Mon, 21 Sep 2009) New Revision: 5666 Added: jbpm4/trunk/modules/db/src/main/java/ jbpm4/trunk/modules/db/src/main/java/org/ jbpm4/trunk/modules/db/src/main/java/org/jbpm/ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/DbUpgrade.java jbpm4/trunk/modules/db/src/main/resources/db/ jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/ jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql Removed: jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml jbpm4/trunk/modules/db/src/main/config/ jbpm4/trunk/modules/db/src/test/ Modified: jbpm4/trunk/modules/db/.classpath jbpm4/trunk/modules/db/README.txt jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/scripts/antrun-schema.xml jbpm4/trunk/modules/distro/scripts/assembly-distro.xml jbpm4/trunk/qa/jdbc/postgresql.properties Log: JBPM-2526 JBPM-2509 refactored generation of db upgrade scripts Modified: jbpm4/trunk/modules/db/.classpath =================================================================== --- jbpm4/trunk/modules/db/.classpath 2009-09-21 15:59:45 UTC (rev 5665) +++ jbpm4/trunk/modules/db/.classpath 2009-09-21 16:10:41 UTC (rev 5666) @@ -1,7 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: jbpm4/trunk/modules/db/README.txt =================================================================== --- jbpm4/trunk/modules/db/README.txt 2009-09-21 15:59:45 UTC (rev 5665) +++ jbpm4/trunk/modules/db/README.txt 2009-09-21 16:10:41 UTC (rev 5666) @@ -1,32 +1,5 @@ -module/db ---------- -Utitlity module to create/drop the jBPM4 database schema. - Usage ----- -Database creation can be triggered through the maven command line -usally as part of the test preparation: - - mvn -P<drop|create>-tables -Ddatabase=<database> install - -Supported databases -------------------- - -- hsqldb -- mysql -- postgresql -- oracle -- sybase - - -FAQ ---- - -1.) How is the default hypersonic database created? - -The default hypersonic is created within the jpdl module, as part of the jpdl test execution. -See the connetion URL 'jdbc:hsqldb:file:@project.build.directory@/hypersonic/jbpm4DB' whereas -'project.build.directory' in that case is 'modules/jpdl/target' - - - + mvn -Pupgrade clean package +will use the QA databases to create an upgrade script for each db. +those upgrade scripts will be generated in the sources. these should be checked into svn. Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-09-21 15:59:45 UTC (rev 5665) +++ jbpm4/trunk/modules/db/pom.xml 2009-09-21 16:10:41 UTC (rev 5666) @@ -30,12 +30,23 @@ <profiles> <profile> <id>upgrade</id> - <activation> - <property> - <name>jbpm.previous.version</name> - </property> - </activation> - + <properties> + <old.version>4.1</old.version> + </properties> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>${oracle.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + <repositories> + <repository> + <id>qa.jboss.com</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> + </repository> + </repositories> <build> <plugins> <plugin> @@ -52,30 +63,30 @@ <artifactItem> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-db</artifactId> - <version>${jbpm.previous.version}</version> + <version>${old.version}</version> </artifactItem> </artifactItems> - <outputDirectory>${previous.version.directory}</outputDirectory> + <outputDirectory>target/old.schema.files</outputDirectory> </configuration> </execution> </executions> </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> <id>upgrade-script</id> - <phase>process-resources</phase> + <phase>compile</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> - <property name="project.output.dir" value="${project.build.outputDirectory}"/> - <property name="previous.version.dir" value="${previous.version.directory}"/> + <property name="upgrade.files.dest.dir" value="src/main/resources/db/upgrade-${old.version}-to-${version}"/> <property name="database" value="${database}"/> - <ant antfile="scripts/antrun-upgrade.xml" target="upgrade-schema" inheritRefs="yes"/> + <!-- for some reason that i don't get, the user.home must be passed explicitly --> + <property name="user.home" value="${user.home}"/> + <ant antfile="scripts/antrun-schema.xml" target="schema-upgrade" inheritRefs="yes"/> </tasks> </configuration> </execution> @@ -83,10 +94,6 @@ </plugin> </plugins> </build> - - <properties> - <previous.version.directory>${project.build.directory}/${jbpm.previous.version}</previous.version.directory> - </properties> </profile> </profiles> Modified: jbpm4/trunk/modules/db/scripts/antrun-schema.xml =================================================================== --- jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-09-21 15:59:45 UTC (rev 5665) +++ jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-09-21 16:10:41 UTC (rev 5666) @@ -10,59 +10,176 @@ <project> - <!-- ================================================================== --> - <!-- jBPM Database schema --> - <!-- ================================================================== --> + <!-- ##################### --> + <!-- ### CREATE SCHEMA ### --> + <!-- ##################### --> <target name="create-schema"> <taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" classpathref="maven.compile.classpath" /> - <mkdir dir="${project.output.dir}" /> + <mkdir dir="target/classes/db" /> - <!-- HsqlDB --> - <create-ddl db="hsqldb" /> - - <!-- MySQL --> - <create-ddl db="mysql" /> - <!--TODO: https://jira.jboss.org/jira/browse/JBPM-2071 --> - <replace file="${project.output.dir}/jbpm.mysql.create.sql" - token="BLOB_VALUE_ blob" - value="BLOB_VALUE_ longblob" /> - - <!-- Oracle --> + <create-ddl db="hsqldb" /> <create-ddl db="oracle" /> - - <!-- PostgreSQL --> - <create-ddl db="postgresql" /> - + <create-ddl db="postgresql" /> + <create-ddl db="mysql" /> + <replace file="target/classes/db/jbpm.mysql.create.sql" + token="BLOB_VALUE_ blob" + value="BLOB_VALUE_ longblob" /> </target> - <!-- ============================================ --> - <!-- Macro definitions --> - <!-- ============================================ --> - <macrodef name="create-ddl"> <attribute name="db" /> <sequential> + <echo></echo> <echo>=====================</echo> - <echo>Create DDL @{db}</echo> + <echo>Schema Create @{db}</echo> + <echo>=====================</echo> - <schemaexport output=&quot;${project.output.dir}/jbpm.(a){db}.create.sql&quot; + <schemaexport output=&quot;target/classes/db/jbpm.(a){db}.create.sql&quot; create="yes" drop="no" - config=&quot;src/main/config/(a){db}.hibernate.cfg.xml&quot; + config=&quot;../distro/src/main/files/install/src/cfg/hibernate/jdbc/(a){db}.hibernate.cfg.xml&quot; text="yes" delimiter=";" quiet="yes" /> - <schemaexport output=&quot;${project.output.dir}/jbpm.(a){db}.drop.sql&quot; + + <echo></echo> + <echo>=====================</echo> + <echo>Schema Drop @{db}</echo> + <echo>=====================</echo> + <schemaexport output=&quot;target/classes/db/jbpm.(a){db}.drop.sql&quot; create="no" drop="yes" - config=&quot;src/main/config/(a){db}.hibernate.cfg.xml&quot; + config=&quot;../distro/src/main/files/install/src/cfg/hibernate/jdbc/(a){db}.hibernate.cfg.xml&quot; text="yes" delimiter=";" quiet="yes" /> - <echo>=====================</echo> </sequential> </macrodef> + + <!-- ###################### --> + <!-- ### SCHEMA UPGRADE ### --> + <!-- ###################### --> + <target name="schema-upgrade"> + <taskdef name="schemaupdate" + classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" + classpathref="maven.compile.classpath" /> + + <!-- By default, the qa lab databases are used. the jdbc properties are taken from the qa/jdbc directory. + If you want to use your local database, specify property upgrade.jdbc.properties.dir in your local build properties --> + <echo>loading properties from ${user.home}/.jbpm4/build.properties</echo> + <property file="${user.home}/.jbpm4/build.properties" /> + <echo>upgrade.jdbc.properties.dir: ${upgrade.jdbc.properties.dir}</echo> + <property name="upgrade.jdbc.properties.dir" location="../../qa/jdbc" /> + <mkdir dir="${upgrade.files.dest.dir}" /> + + <antcall target="start.hsqldb" inheritrefs="true" /> + <upgrade-ddl db="hsqldb" /> + <antcall target="stop.hsqldb" /> + <upgrade-ddl db="mysql" /> + <upgrade-ddl db="oracle" /> + <upgrade-ddl db="postgresql" /> + </target> + + <target name="start.hsqldb"> + <java classname="org.hsqldb.Server" + classpathref="maven.compile.classpath" + fork="yes" + spawn="yes"> + <arg value="-port" /> + <arg value="1701" /> + <arg value="-database.0" /> + <arg value="target/hsqldb-upgrade-db/jbpmdb" /> + </java> + <waitfor> + <socket server="localhost" port="1701" /> + </waitfor> + </target> + + <target name="stop.hsqldb"> + <sql url="jdbc:hsqldb:hsql://localhost:1701" + driver="org.hsqldb.jdbcDriver" + userid="sa" + password="" + classpathref="maven.compile.classpath" + autocommit="yes"> + SHUTDOWN + </sql> + </target> + + <macrodef name="upgrade-ddl"> + <attribute name="db" /> + <sequential> + <!-- ant antfile="scripts/schema-upgrade.xml" target="create.old.schema" inheritall="false"> + <property name="database" value="@{db}" /> + <property name="upgrade.jdbc.properties.dir" value="${upgrade.jdbc.properties.dir}" /> + <property name="compile.classpath.text" value="${toString:maven.compile.classpath}" /> + </ant --> + + <property file=&quot;${upgrade.jdbc.properties.dir}/(a){db}.properties&quot; prefix=&quot;(a){db}.&quot; /> + <echo></echo> + <echo>driver... ${(a){db}.jdbc.driver}&lt;/echo&gt; + <echo>url...... ${(a){db}.jdbc.url}&lt;/echo&gt; + <echo>username. ${(a){db}.jdbc.username}&lt;/echo&gt; + <echo>password. ${(a){db}.jdbc.password}&lt;/echo&gt; + + <echo>=====================</echo> + <echo>Dropping current schema @{db}</echo> + <echo>=====================</echo> + <sql src=&quot;target/classes/db/jbpm.(a){db}.drop.sql&quot; + url=&quot;${(a){db}.jdbc.url}&quot; + driver=&quot;${(a){db}.jdbc.driver}&quot; + userid=&quot;${(a){db}.jdbc.username}&quot; + password=&quot;${(a){db}.jdbc.password}&quot; + classpathref="maven.compile.classpath" + autocommit="yes" + onerror="continue" /> + + <echo></echo> + <echo>=====================</echo> + <echo>Creating old schema @{db}</echo> + <echo>=====================</echo> + <sql src=&quot;target/old.schema.files/jbpm.(a){db}.create.sql&quot; + url=&quot;${(a){db}.jdbc.url}&quot; + driver=&quot;${(a){db}.jdbc.driver}&quot; + userid=&quot;${(a){db}.jdbc.username}&quot; + password=&quot;${(a){db}.jdbc.password}&quot; + classpathref="maven.compile.classpath" + autocommit="yes" + onerror="continue" /> + + <mkdir dir="target/cfg" /> + <copy tofile=&quot;target/cfg/(a){db}.hibernate.cfg.xml&quot; + file=&quot;../distro/src/main/files/install/src/cfg/hibernate/jdbc/(a){db}.hibernate.cfg.xml&quot; + overwrite="true"> + <filterset filtersfile=&quot;${upgrade.jdbc.properties.dir}/(a){db}.properties&quot; /> + </copy> + + <echo></echo> + <echo>=====================</echo> + <echo>Schema Upgrade @{db}</echo> + <echo>=====================</echo> + <schemaupdate outputFile=&quot;${upgrade.files.dest.dir}/jbpm.(a){db}.upgrade.sql&quot; + config=&quot;target/cfg/(a){db}.hibernate.cfg.xml&quot; + properties=&quot;${upgrade.jdbc.properties.dir}/(a){db}.properties&quot; + delimiter=";" /> + + <echo></echo> + <echo>=====================</echo> + <echo>Dropping old schema @{db}</echo> + <echo>=====================</echo> + <sql src=&quot;target/old.schema.files/jbpm.(a){db}.drop.sql&quot; + url=&quot;${(a){db}.jdbc.url}&quot; + driver=&quot;${(a){db}.jdbc.driver}&quot; + userid=&quot;${(a){db}.jdbc.username}&quot; + password=&quot;${(a){db}.jdbc.password}&quot; + classpathref="maven.compile.classpath" + autocommit="yes" + onerror="continue" /> + + </sequential> + </macrodef> + </project> Deleted: jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml =================================================================== --- jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml 2009-09-21 15:59:45 UTC (rev 5665) +++ jbpm4/trunk/modules/db/scripts/antrun-upgrade.xml 2009-09-21 16:10:41 UTC (rev 5666) @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project> - <!-- ============================================ --> - <!-- jBPM database schema --> - <!-- ============================================ --> - - <target name="upgrade-schema" - depends="define-tasks, upgrade-hsqldb, upgrade-mysql, upgrade-postgresql, upgrade-oracle" /> - - <target name="define-tasks"> - <taskdef name="schemaupdate" - classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" - classpathref="maven.compile.classpath" /> - <taskdef name="schemaexport" - classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" - classpathref="maven.compile.classpath" /> - - <condition property="database.is.hsqldb"> - <equals arg1="${database}" arg2="hsqldb" /> - </condition> - <condition property="database.is.mysql"> - <equals arg1="${database}" arg2="mysql" /> - </condition> - <condition property="database.is.postgresql"> - <equals arg1="${database}" arg2="postgresql" /> - </condition> - <condition property="database.is.oracle"> - <equals arg1="${database}" arg2="oracle" /> - </condition> - </target> - - <target name="upgrade-hsqldb" if="database.is.hsqldb"> - <java classname="org.hsqldb.Server" - classpathref="maven.compile.classpath" - fork="yes" - spawn="yes"> - <arg value="-port" /> - <arg value="1701" /> - <arg value="-database.0" /> - <arg value="${previous.version.dir}/jbpmdb" /> - </java> - <waitfor> - <socket server="localhost" port="1701" /> - </waitfor> - <upgrade-ddl db="hsqldb" /> - <sql url="${hsqldb.hibernate.connection.url}" - driver="${hsqldb.hibernate.connection.driver_class}" - classpathref="maven.compile.classpath" - userid="${hsqldb.hibernate.connection.username}" - password="${hsqldb.hibernate.connection.password}" - autocommit="yes"> - SHUTDOWN - </sql> - </target> - - <target name="upgrade-mysql" if="database.is.mysql"> - <upgrade-ddl db="mysql" /> - </target> - - <target name="upgrade-postgresql" if="database.is.postgresql"> - <upgrade-ddl db="postgresql" /> - </target> - - <target name="upgrade-oracle" if="database.is.oracle"> - <upgrade-ddl db="oracle" /> - </target> - - <!-- ============================================ --> - <!-- Macro definitions --> - <!-- ============================================ --> - - <macrodef name="upgrade-ddl"> - <attribute name="db" /> - - <sequential> - <echo>=====================</echo> - <echo>Upgrade DDL @{db}</echo> - - <!-- calculate the difference beetween the previous and the current create schemas --> - <exec executable="diff" - osfamily="unix" - output=&quot;${previous.version.dir}/jbpm.(a){db}.create.diff&quot;&gt; - <arg value="-u" /> - <arg file=&quot;${previous.version.dir}/jbpm.(a){db}.create.sql&quot; /> - <arg file=&quot;${project.output.dir}/jbpm.(a){db}.create.sql&quot; /> - </exec> - - <property name=&quot;(a){db}.hibernate.cfg&quot; value=&quot;src/main/config/(a){db}.hibernate.cfg.xml&quot; /> - <property name=&quot;(a){db}.hibernate.properties&quot; - value=&quot;${user.home}/.jbpm4/jdbc/(a){db}.properties&quot; /> - <property file=&quot;${(a){db}.hibernate.properties}&quot; prefix="@{db}" /> - <echo>driver... ${(a){db}.hibernate.connection.driver_class}&lt;/echo&gt; - <echo>url...... ${(a){db}.hibernate.connection.url}&lt;/echo&gt; - <echo>username. ${(a){db}.hibernate.connection.username}&lt;/echo&gt; - <echo>password. ${(a){db}.hibernate.connection.password}&lt;/echo&gt; - - <!-- drop current schema if exists --> - <sql src=&quot;${project.output.dir}/jbpm.(a){db}.drop.sql&quot; - url=&quot;${(a){db}.hibernate.connection.url}&quot; - driver=&quot;${(a){db}.hibernate.connection.driver_class}&quot; - classpathref="maven.compile.classpath" - userid=&quot;${(a){db}.hibernate.connection.username}&quot; - password=&quot;${(a){db}.hibernate.connection.password}&quot; - autocommit="yes" - onerror="continue" /> - <!-- create previous version schema --> - <sql src=&quot;${previous.version.dir}/jbpm.(a){db}.create.sql&quot; - url=&quot;${(a){db}.hibernate.connection.url}&quot; - driver=&quot;${(a){db}.hibernate.connection.driver_class}&quot; - classpathref="maven.compile.classpath" - userid=&quot;${(a){db}.hibernate.connection.username}&quot; - password=&quot;${(a){db}.hibernate.connection.password}&quot; - autocommit="yes" - onerror="continue" /> - <!-- generate schema upgrade script --> - <schemaupdate outputFile=&quot;${previous.version.dir}/jbpm.(a){db}.update.sql&quot; - config=&quot;${(a){db}.hibernate.cfg}&quot; - properties=&quot;${(a){db}.hibernate.properties}&quot; - delimiter=";" /> - - <echo>=====================</echo> - </sequential> - </macrodef> -</project> \ No newline at end of file Added: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/DbUpgrade.java =================================================================== --- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/DbUpgrade.java (rev 0) +++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/DbUpgrade.java 2009-09-21 16:10:41 UTC (rev 5666) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.db; + + +/** + * @author Tom Baeyens + */ +public class DbUpgrade { + + public static void main(String[] args) { + System.out.println("jBPM DB upgrade tool"); + +// String dbVersion = getDbVersion(); +// String distroVersion = "4.2"; +// +// if (upgrade41to40Necessary(dbVersion)) { +// upgrade41to40(); +// } + } +} Property changes on: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/DbUpgrade.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql (rev 0) +++ jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql 2009-09-21 16:10:41 UTC (rev 5666) @@ -0,0 +1,7 @@ + + create table JBPM4_PROPERTY ( + KEY_ varchar(255) not null, + VERSION_ integer not null, + VALUE_ varchar(255), + primary key (KEY_) + ); Added: jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql (rev 0) +++ jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql 2009-09-21 16:10:41 UTC (rev 5666) @@ -0,0 +1,7 @@ + + create table JBPM4_PROPERTY ( + KEY_ varchar(255) not null, + VERSION_ integer not null, + VALUE_ varchar(255), + primary key (KEY_) + ) type=InnoDB; Added: jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql (rev 0) +++ jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql 2009-09-21 16:10:41 UTC (rev 5666) @@ -0,0 +1,7 @@ + + create table JBPM4_PROPERTY ( + KEY_ varchar2(255 char) not null, + VERSION_ number(10,0) not null, + VALUE_ varchar2(255 char), + primary key (KEY_) + ); Added: jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql (rev 0) +++ jbpm4/trunk/modules/db/src/main/resources/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-09-21 16:10:41 UTC (rev 5666) @@ -0,0 +1,7 @@ + + create table JBPM4_PROPERTY ( + KEY_ varchar(255) not null, + VERSION_ int4 not null, + VALUE_ varchar(255), + primary key (KEY_) + ); Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-09-21 15:59:45 UTC (rev 5665) +++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-09-21 16:10:41 UTC (rev 5666) @@ -79,10 +79,10 @@ </fileSet> <fileSet> <directory>../db/target/classes</directory> - <outputDirectory>install/src/db</outputDirectory> - <includes> - <include>*.sql</include> - </includes> + <outputDirectory>install/src</outputDirectory> + <excludes> + <exclude>META-INF/**</exclude> + </excludes> </fileSet> <fileSet> <directory>../devguide/target/docbook/publish/en</directory> Modified: jbpm4/trunk/qa/jdbc/postgresql.properties =================================================================== --- jbpm4/trunk/qa/jdbc/postgresql.properties 2009-09-21 15:59:45 UTC (rev 5665) +++ jbpm4/trunk/qa/jdbc/postgresql.properties 2009-09-21 16:10:41 UTC (rev 5666) @@ -1,6 +1,6 @@ jdbc.driver=org.postgresql.Driver jdbc.port=5432 -jdbc.server=dev01.qa.atl.jboss.com +jdbc.server=vmg01.mw.lab.eng.bos.redhat.com jdbc.databasename=pvm1 jdbc.url=jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432/pvm1 jdbc.username=pvm1