[jbpm-commits] JBoss JBPM SVN: r3741 - in jbpm4/trunk/modules/db: src/main/ant and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-02-02 11:14:21 -0500 (Mon, 02 Feb 2009) New Revision: 3741 Removed: jbpm4/trunk/modules/db/src/main/resources/db.properties/ jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml Modified: jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/src/main/ant/build.schema.xml Log: Restore DB schema generation scripts and module Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-02-02 14:27:18 UTC (rev 3740) +++ jbpm4/trunk/modules/db/pom.xml 2009-02-02 16:14:21 UTC (rev 3741) @@ -24,12 +24,12 @@ <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - + <!-- Dependencies --> <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-api</artifactId> + <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> <dependency> @@ -37,28 +37,42 @@ <artifactId>jbpm-test-base</artifactId> <version>${version}</version> </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-pvm</artifactId> - <version>${version}</version> - </dependency> </dependencies> - + <!-- Plugins --> <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/resources</directory> <filtering>true</filtering> </resource> </resources> <plugins> <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack.jbpm.db</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <overWrite>true</overWrite> + </artifactItem> + </artifactItems> + <excludeTransitive>true</excludeTransitive> + <outputDirectory>target/jpdl-config</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -78,5 +92,5 @@ </plugin> </plugins> </build> - + </project> \ No newline at end of file Modified: jbpm4/trunk/modules/db/src/main/ant/build.schema.xml =================================================================== --- jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2009-02-02 14:27:18 UTC (rev 3740) +++ jbpm4/trunk/modules/db/src/main/ant/build.schema.xml 2009-02-02 16:14:21 UTC (rev 3741) @@ -16,56 +16,56 @@ <target name="create-schema"> <echo message="${maven.runtime.classpath}"/> - + <taskdef name="schemaexport" - classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> <classpath path="${maven.runtime.classpath}"/> </taskdef> - - <property name="cfg" value="src/main/resources/hibernate.cfg.xml" /> <mkdir dir="target/classes/create"/> <mkdir dir="target/classes/drop"/> - <schemaexport properties="src/main/resources/db.properties/hsqldb.properties" - output="target/classes/create/jbpm.hsqldb.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/hsqldb.properties" - output="target/classes/drop/jbpm.hsqldb.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" /> + <!-- HsqlDB --> + <schemaexport output="target/classes/create/jbpm.hsqldb.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.hsqldb.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.hsqldb.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.hsqldb.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/mysql.properties" - output="target/classes/create/jbpm.mysql.create.sql" - delimiter=";" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/mysql.properties" - output="target/classes/drop/jbpm.mysql.drop.sql" - delimiter=";" - create="no" drop="yes" config="${cfg}" text="yes" /> + <!-- MySQL --> + <schemaexport output="target/classes/create/jbpm.mysql.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.mysql.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.mysql.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.mysql.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/oracle.properties" - output="target/classes/create/jbpm.oracle.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" - delimiter=";" /> - <schemaexport properties="src/main/resources/db.properties/oracle.properties" - output="target/classes/drop/jbpm.oracle.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" - delimiter=";" /> + <!-- Oracle --> + <schemaexport output="target/classes/create/jbpm.oracle.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.oracle.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.oracle.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.oracle.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/postgresql.properties" - output="target/classes/create/jbpm.postgresql.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/postgresql.properties" - output="target/classes/drop/jbpm.postgresql.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" /> + <!-- PostgreSQL --> + <schemaexport output="target/classes/create/jbpm.postgresql.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.postgresql.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.postgresql.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.postgresql.xml" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/sybase.properties" - output="target/classes/create/jbpm.sybase.create.sql" - create="yes" drop="no" config="${cfg}" text="yes" /> - <schemaexport properties="src/main/resources/db.properties/sybase.properties" - output="target/classes/drop/jbpm.sybase.drop.sql" - create="no" drop="yes" config="${cfg}" text="yes" /> + <!-- Sybase --> + <schemaexport output="target/classes/create/jbpm.sybase.create.sql" + create="yes" drop="no" + config="target/jpdl-config/hibernate.cfg.sybase.xml" text="yes" /> + <schemaexport output="target/classes/drop/jbpm.sybase.drop.sql" + create="no" drop="yes" + config="target/jpdl-config/hibernate.cfg.sybase.xml" text="yes" /> + </target> - + </project> Deleted: jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml 2009-02-02 14:27:18 UTC (rev 3740) +++ jbpm4/trunk/modules/db/src/main/resources/hibernate.cfg.xml 2009-02-02 16:14:21 UTC (rev 3741) @@ -1,20 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 2.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd"> - -<hibernate-configuration> - - <session-factory> - <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> - <mapping resource="jbpm.pvm.wire.hbm.xml" /> - <mapping resource="jbpm.pvm.definition.hbm.xml" /> - <mapping resource="jbpm.pvm.execution.hbm.xml" /> - <mapping resource="jbpm.pvm.variable.hbm.xml" /> - <mapping resource="jbpm.pvm.job.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - </session-factory> - -</hibernate-configuration>