[jbpm-commits] JBoss JBPM SVN: r4155 - in jbpm4/branches/tbaeyens: modules and 8 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-03-05 10:42:16 -0500 (Thu, 05 Mar 2009) New Revision: 4155 Added: jbpm4/branches/tbaeyens/modules/db-tool/ jbpm4/branches/tbaeyens/modules/db-tool/.project jbpm4/branches/tbaeyens/modules/db-tool/pom.xml jbpm4/branches/tbaeyens/modules/db-tool/src/ jbpm4/branches/tbaeyens/modules/db-tool/src/main/ jbpm4/branches/tbaeyens/modules/db-tool/src/main/resources/ jbpm4/branches/tbaeyens/modules/db-tool/src/main/resources/build.xml Removed: jbpm4/branches/tbaeyens/modules/config-tool/.classpath jbpm4/branches/tbaeyens/modules/config-tool/scripts/ Modified: jbpm4/branches/tbaeyens/modules/config-tool/.project jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.properties jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.xml jbpm4/branches/tbaeyens/modules/db/pom.xml jbpm4/branches/tbaeyens/modules/db/scripts/antrun-generate-db-scripts.xml jbpm4/branches/tbaeyens/pom.xml Log: updates :-) Deleted: jbpm4/branches/tbaeyens/modules/config-tool/.classpath =================================================================== --- jbpm4/branches/tbaeyens/modules/config-tool/.classpath 2009-03-05 11:48:25 UTC (rev 4154) +++ jbpm4/branches/tbaeyens/modules/config-tool/.classpath 2009-03-05 15:42:16 UTC (rev 4155) @@ -1,7 +0,0 @@ -<?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> Modified: jbpm4/branches/tbaeyens/modules/config-tool/.project =================================================================== --- jbpm4/branches/tbaeyens/modules/config-tool/.project 2009-03-05 11:48:25 UTC (rev 4154) +++ jbpm4/branches/tbaeyens/modules/config-tool/.project 2009-03-05 15:42:16 UTC (rev 4155) @@ -1,23 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jpdl</name> + <name>config-tool</name> <comment></comment> <projects> </projects> <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.properties 2009-03-05 11:48:25 UTC (rev 4154) +++ jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.properties 2009-03-05 15:42:16 UTC (rev 4155) @@ -1,8 +1,7 @@ -jbpm.config.dest.dir=.target/configfiles -jbpm.config.tmp.dir=target/filtered -jbpm.config.hibernate.cache=hashtable -jbpm.config.hibernate.connection.type=jdbc -jbpm.config.hibernate.database=hsqldb -jbpm.config.hibernate.format.sql=include -jbpm.config.hibernate.jpdl=include -jbpm.config.identity=include +dest.dir=configfiles +cache=hashtable +connection.type=jdbc +database=hsqldb +format.sql=include +jpdl=include +identity=include Modified: jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.xml 2009-03-05 11:48:25 UTC (rev 4154) +++ jbpm4/branches/tbaeyens/modules/config-tool/src/main/resources/build.xml 2009-03-05 15:42:16 UTC (rev 4155) @@ -5,11 +5,12 @@ <property file="build.properties" /> <target name="generate" description="generates a full jbpm configuration"> - <delete dir="${jbpm.config.dest.dir}" /> + <delete dir="${dest.dir}" /> + <mkdir dir="${dest.dir}" /> <antcall target="jbpm.hibernate.cfg.xml" /> <antcall target="base.hibernate.mapping.files" /> <condition property="is.jpdl.included"> - <equals arg1="${jbpm.config.hibernate.jpdl}" arg2="include" /> + <equals arg1="${jpdl}" arg2="include" /> </condition> <antcall target="jpdl.hibernate.mapping.files" /> <condition property="is.identity.included"> @@ -24,45 +25,44 @@ </target> <target name="jbpm.hibernate.cfg.xml"> - <mkdir dir="${jbpm.config.dest.dir}" /> - <mkdir dir="${jbpm.config.tmp.dir}" /> - <concat destfile="${jbpm.config.dest.dir}/jbpm.hibernate.cfg.xml"> + <concat destfile="${dest.dir}/jbpm.hibernate.cfg.xml"> <filelist dir="."> - <file name="${jbpm.config.tmp.dir}/hibernate/cfg/part1.jbpm.hibernate.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/hibernate/${jbpm.config.hibernate.connection.type}/${jbpm.config.hibernate.database}.xml"/> - <file name="${jbpm.config.tmp.dir}/hibernate/other/format.sql.${jbpm.config.hibernate.format.sql}.xml"/> - <file name="${jbpm.config.tmp.dir}/hibernate/cache/${jbpm.config.hibernate.cache}.xml"/> - <file name="${jbpm.config.tmp.dir}/hibernate/mapping.references/pvm.xml"/> - <file name="${jbpm.config.tmp.dir}/hibernate/mapping.references/jpdl.${jbpm.config.hibernate.jpdl}.xml"/> - <file name="${jbpm.config.tmp.dir}/hibernate/cfg/part2.jbpm.hibernate.cfg.xml" /> + <file name="hibernate/cfg/part1.jbpm.hibernate.cfg.xml" /> + <file name="hibernate/${connection.type}/${database}.xml"/> + <file name="hibernate/other/format.sql.${format.sql}.xml"/> + <file name="hibernate/cache/${cache}.xml"/> + <file name="hibernate/mapping.references/pvm.xml"/> + <file name="hibernate/mapping.references/jpdl.${jpdl}.xml"/> + <file name="hibernate/cfg/part2.jbpm.hibernate.cfg.xml" /> </filelist> </concat> </target> <target name="identity.config.files" if="is.identity.included"> - <copy file="identity/jbpm.identity.cfg.xml" todir="${jbpm.config.dest.dir}" overwrite="true" /> - <mkdir dir="${jbpm.config.dest.dir}/META-INF" /> - <copy file="${jbpm.config.tmp.dir}/hibernate/${jbpm.config.hibernate.connection.type}/${jbpm.config.hibernate.database}.xml" - tofile="${jbpm.config.tmp.dir}/persistence.properties.xml"/> - <replace file="${jbpm.config.tmp.dir}/persistence.properties.xml" + <copy file="identity/jbpm.identity.cfg.xml" todir="${dest.dir}" overwrite="true" /> + <mkdir dir="${dest.dir}/META-INF" /> + <copy file="hibernate/${connection.type}/${database}.xml" + tofile="tmp.persistence.properties.xml"/> + <replace file="tmp.persistence.properties.xml" token="&quot;&gt;" value="&quot; value=&quot;" /> - <replace file="${jbpm.config.tmp.dir}/persistence.properties.xml" + <replace file="tmp.persistence.properties.xml" token="&lt;/property&gt;" value="&quot; /&gt;" /> - <concat destfile="${jbpm.config.dest.dir}/META-INF/persistence.xml"> + <concat destfile="${dest.dir}/META-INF/persistence.xml"> <filelist dir="."> - <file name="${jbpm.config.tmp.dir}/identity/META-INF/part1.persistence.xml" /> - <file name="${jbpm.config.tmp.dir}/persistence.properties.xml"/> - <file name="${jbpm.config.tmp.dir}/identity/META-INF/part2.persistence.xml"/> + <file name="identity/META-INF/part1.persistence.xml" /> + <file name="tmp.persistence.properties.xml"/> + <file name="identity/META-INF/part2.persistence.xml"/> </filelist> </concat> + <delete file="tmp.persistence.properties.xml" /> </target> <target name="base.hibernate.mapping.files"> - <copy todir="${jbpm.config.dest.dir}"> - <fileset dir="${jbpm.config.tmp.dir}/hibernate/mapping.files"> + <copy todir="${dest.dir}"> + <fileset dir="hibernate/mapping.files"> <exclude name="jbpm.jpdl.hbm.xml" /> <exclude name="jbpm.jpdl.activities.xml" /> </fileset> @@ -70,8 +70,8 @@ </target> <target name="jpdl.hibernate.mapping.files" if="is.jpdl.included"> - <copy todir="${jbpm.config.dest.dir}"> - <fileset dir="${jbpm.config.tmp.dir}/hibernate/mapping.files"> + <copy todir="${dest.dir}"> + <fileset dir="hibernate/mapping.files"> <include name="jbpm.jpdl.hbm.xml" /> <include name="jbpm.jpdl.activities.xml" /> </fileset> @@ -79,41 +79,41 @@ </target> <target name="jbpm.configuration.files"> - <copy todir="${jbpm.config.dest.dir}"> + <copy todir="${dest.dir}"> <fileset dir="jbpm"> <include name="*.xml" /> </fileset> </copy> - <concat destfile="${jbpm.config.dest.dir}/jbpm.wire.bindings.xml"> + <concat destfile="${dest.dir}/jbpm.wire.bindings.xml"> <filelist dir="."> - <file name="${jbpm.config.tmp.dir}/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/wire.bindings/jpdl.${jbpm.config.hibernate.jpdl}.xml"/> - <file name="${jbpm.config.tmp.dir}/jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" /> + <file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" /> + <file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/> + <file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" /> </filelist> </concat> - <concat destfile="${jbpm.config.dest.dir}/jbpm.cfg.xml"> + <concat destfile="${dest.dir}/jbpm.cfg.xml"> <filelist dir="."> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part1.jbpm.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/identity.service.${jbpm.config.identity}.jbpm.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part2.jbpm.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/identity.session.factory.${jbpm.config.identity}.jbpm.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/jpdl.deployers.${jbpm.config.hibernate.jpdl}.jbpm.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part3.jbpm.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/identity.session.${jbpm.config.identity}.jbpm.cfg.xml" /> - <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part4.jbpm.cfg.xml" /> + <file name="jbpm/cfg/part1.jbpm.cfg.xml" /> + <file name="jbpm/cfg/identity.service.${jbpm.config.identity}.jbpm.cfg.xml" /> + <file name="jbpm/cfg/part2.jbpm.cfg.xml" /> + <file name="jbpm/cfg/identity.session.factory.${jbpm.config.identity}.jbpm.cfg.xml" /> + <file name="jbpm/cfg/jpdl.deployers.${jpdl}.jbpm.cfg.xml" /> + <file name="jbpm/cfg/part3.jbpm.cfg.xml" /> + <file name="jbpm/cfg/identity.session.${jbpm.config.identity}.jbpm.cfg.xml" /> + <file name="jbpm/cfg/part4.jbpm.cfg.xml" /> </filelist> </concat> </target> <target name="jdk.logging" if="is.jdk.logging.included"> - <copy todir="${jbpm.config.dest.dir}"> - <fileset dir="${jbpm.config.tmp.dir}/jdk" /> + <copy todir="${dest.dir}"> + <fileset dir="jdk" /> </copy> </target> <target name="clean"> <delete dir="${jbpm.config.tmp.dir}" /> - <delete dir="${jbpm.config.dest.dir}" /> + <delete dir="${dest.dir}" /> </target> </project> Modified: jbpm4/branches/tbaeyens/modules/db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/pom.xml 2009-03-05 11:48:25 UTC (rev 4154) +++ jbpm4/branches/tbaeyens/modules/db/pom.xml 2009-03-05 15:42:16 UTC (rev 4155) @@ -32,8 +32,6 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-config-tool</artifactId> - <type>zip</type> - <version>${version}</version> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -73,11 +71,10 @@ <artifactItems> <artifactItem> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-config</artifactId> - <type>zip</type> + <artifactId>jbpm-config-tool</artifactId> </artifactItem> </artifactItems> - <outputDirectory>target/jbpm-config</outputDirectory> + <outputDirectory>target/jbpm-config-tool</outputDirectory> </configuration> </execution> </executions> Modified: jbpm4/branches/tbaeyens/modules/db/scripts/antrun-generate-db-scripts.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/scripts/antrun-generate-db-scripts.xml 2009-03-05 11:48:25 UTC (rev 4154) +++ jbpm4/branches/tbaeyens/modules/db/scripts/antrun-generate-db-scripts.xml 2009-03-05 15:42:16 UTC (rev 4155) @@ -17,17 +17,17 @@ <!-- echo message="${maven.runtime.classpath}"/ --> <!-- Verify that the config tool is present --> - <available file="target/jbpm-config" property="jbpm.config.is.available" /> - <fail unless="jbpm.config.is.available" message="config tool is not available in target/jbpm-config" /> + <available file="target/jbpm-config-tool" property="jbpm.config.tool.is.available" /> + <fail unless="jbpm.config.tool.is.available" message="config tool is not available in target/jbpm-config-tool" /> - <mkdir dir="target/jbpm-config/target/configfiles"/> + <mkdir dir="target/jbpm-config-tool/configfiles"/> <mkdir dir="target/classes/scripts"/> - <copy file="target/jbpm-config/build.properties" tofile="target/jbpm-config/original.config.properties" /> + <copy file="target/jbpm-config-tool/build.properties" tofile="target/jbpm-config-tool/original.config.properties" /> <taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> <classpath> - <pathelement location="target/jbpm-config/target/configfiles" /> + <pathelement location="target/jbpm-config-tool/configfiles" /> <pathelement path="${maven.runtime.classpath}" /> </classpath> </taskdef> @@ -38,7 +38,7 @@ <!-- MySQL --> <create-ddl db="mysql"/> <!--TODO: https://jira.jboss.org/jira/browse/JBPM-2071 --> - <replace file="target/classes/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" /> + <replace file="target/classes/scripts/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" /> <!-- Oracle --> <create-ddl db="oracle"/> @@ -59,19 +59,19 @@ <echo>=====================</echo> <echo>Create DDL @{db}</echo> - <copy file="target/jbpm-config/original.config.properties" tofile="target/jbpm-config/build.properties" overwrite="true" /> - <replace file="target/jbpm-config/build.properties" token="jbpm.config.hibernate.database=hsqldb" value="jbpm.config.hibernate.database=@{db}" /> - <ant antfile="target/jbpm-config/build.xml" inheritall="false" /> + <copy file="target/jbpm-config-tool/original.config.properties" tofile="target/jbpm-config-tool/build.properties" overwrite="true" /> + <replace file="target/jbpm-config-tool/build.properties" token="jbpm.config.hibernate.database=hsqldb" value="jbpm.config.hibernate.database=@{db}" /> + <ant antfile="target/jbpm-config-tool/build.xml" inheritall="false" /> <schemaexport output=&quot;target/classes/scripts/jbpm.(a){db}.create.sql&quot; create="yes" drop="no" - config="target/jbpm-config/target/configfiles/jbpm.hibernate.cfg.xml" + config="target/jbpm-config-tool/configfiles/jbpm.hibernate.cfg.xml" text="yes" delimiter=";" quiet="yes"/> <schemaexport output=&quot;target/classes/scripts/jbpm.(a){db}.drop.sql&quot; create="no" drop="yes" - config="target/jbpm-config/target/configfiles/jbpm.hibernate.cfg.xml" + config="target/jbpm-config-tool/configfiles/jbpm.hibernate.cfg.xml" text="yes" delimiter=";" quiet="yes"/> Added: jbpm4/branches/tbaeyens/modules/db-tool/.project =================================================================== --- jbpm4/branches/tbaeyens/modules/db-tool/.project (rev 0) +++ jbpm4/branches/tbaeyens/modules/db-tool/.project 2009-03-05 15:42:16 UTC (rev 4155) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>db-tool</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Added: jbpm4/branches/tbaeyens/modules/db-tool/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db-tool/pom.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db-tool/pom.xml 2009-03-05 15:42:16 UTC (rev 4155) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <!-- Module Info --> + <modelVersion>4.0.0</modelVersion> + <name>jBPM 4 - DB Tool</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-db-tool</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +</project> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/db-tool/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/db-tool/src/main/resources/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db-tool/src/main/resources/build.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db-tool/src/main/resources/build.xml 2009-03-05 15:42:16 UTC (rev 4155) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project> + + <target name="generate.db.scripts"> + <!-- echo message="${maven.runtime.classpath}"/ --> + + <!-- Verify that the config tool is present --> + <available file="target/jbpm-config-tool" property="jbpm.config.tool.is.available" /> + <fail unless="jbpm.config.tool.is.available" message="config tool is not available in target/jbpm-config-tool" /> + + <mkdir dir="target/jbpm-config-tool/configfiles"/> + <mkdir dir="target/classes/scripts"/> + <copy file="target/jbpm-config-tool/build.properties" tofile="target/jbpm-config-tool/original.config.properties" /> + + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"> + <classpath> + <pathelement location="target/jbpm-config-tool/configfiles" /> + <pathelement path="${maven.runtime.classpath}" /> + </classpath> + </taskdef> + + <!-- HsqlDB --> + <create-ddl db="hsqldb"/> + + <!-- MySQL --> + <create-ddl db="mysql"/> + <!--TODO: https://jira.jboss.org/jira/browse/JBPM-2071 --> + <replace file="target/classes/scripts/jbpm.mysql.create.sql" token="BLOB_VALUE_ blob" value="BLOB_VALUE_ longblob" /> + + <!-- Oracle --> + <create-ddl db="oracle"/> + + <!-- PostgreSQL --> + <create-ddl db="postgresql"/> + + <!-- Sybase --> + <create-ddl db="sybase"/> + + </target> + + <macrodef name="create-ddl"> + <attribute name="db"/> + + <sequential> + <echo></echo> + <echo>=====================</echo> + <echo>Create DDL @{db}</echo> + + <copy file="target/jbpm-config-tool/original.config.properties" tofile="target/jbpm-config-tool/build.properties" overwrite="true" /> + <replace file="target/jbpm-config-tool/build.properties" token="jbpm.config.hibernate.database=hsqldb" value="jbpm.config.hibernate.database=@{db}" /> + <ant antfile="target/jbpm-config-tool/build.xml" inheritall="false" /> + + <schemaexport output=&quot;target/classes/scripts/jbpm.(a){db}.create.sql&quot; + create="yes" drop="no" + config="target/jbpm-config-tool/configfiles/jbpm.hibernate.cfg.xml" + text="yes" delimiter=";" + quiet="yes"/> + + <schemaexport output=&quot;target/classes/scripts/jbpm.(a){db}.drop.sql&quot; + create="no" drop="yes" + config="target/jbpm-config-tool/configfiles/jbpm.hibernate.cfg.xml" + text="yes" delimiter=";" + quiet="yes"/> + + <echo>Done.</echo> + <echo>=====================</echo> + </sequential> + </macrodef> + +</project> Property changes on: jbpm4/branches/tbaeyens/modules/db-tool/src/main/resources/build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/branches/tbaeyens/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/pom.xml 2009-03-05 11:48:25 UTC (rev 4154) +++ jbpm4/branches/tbaeyens/pom.xml 2009-03-05 15:42:16 UTC (rev 4155) @@ -89,7 +89,7 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-config</artifactId> + <artifactId>jbpm-config-tool</artifactId> <version>${version}</version> </dependency> <dependency>