[jbpm-commits] JBoss JBPM SVN: r3737 - in jbpm4/branches/hbraun/modules: distro/scripts and 6 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-01-30 15:29:00 -0500 (Fri, 30 Jan 2009) New Revision: 3737 Added: jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml Modified: jbpm4/branches/hbraun/modules/distro/pom.xml jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml jbpm4/branches/hbraun/modules/enterprise/pom.xml jbpm4/branches/hbraun/modules/jpdl/pom.xml jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml Log: Create integration config (*-ds.xml, jbpm-server.sar, etc) Modified: jbpm4/branches/hbraun/modules/distro/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/pom.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/pom.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -25,10 +25,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <!-- Properties --> - <properties> - </properties> - <!-- Dependencies --> <dependencies> <dependency> @@ -64,11 +60,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-task</artifactId> <version>${version}</version> </dependency> @@ -105,7 +96,7 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> <executions> - <execution> + <!--execution> <id>generate-jbpm-impl-jar</id> <phase>package</phase> <goals> @@ -134,7 +125,7 @@ <descriptor>assembly-distro-package.xml</descriptor> </descriptors> </configuration> - </execution> + </execution--> <!-- Installer --> Modified: jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -64,7 +64,7 @@ <!-- ================================================================== --> <target name="configure" depends="init"> - <!--property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/> + <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/> <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/> @@ -86,7 +86,7 @@ <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/--> + <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> <condition property="database.is.hsqldb" value="true" else="false"> <equals arg1="${database}" arg2="hsqldb"/> Modified: jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -32,16 +32,16 @@ <scope>test</scope> <unpack>false</unpack> </dependencySet> - <dependencySet> + <!--dependencySet> <includes> <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> </includes> <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> <outputDirectory>gpd</outputDirectory> - </dependencySet> - </dependencySets> + </dependencySet--> - <!-- resources + + <!-- resources --> <dependencySet> <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> @@ -49,9 +49,19 @@ <include>*:jbpm-jpdl:jar:config</include> </includes> <unpack>true</unpack> + </dependencySet> + <!--dependencySet> + <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-enterprise:jar:config</include> + </includes> + <unpack>true</unpack> </dependencySet--> - <fileSets> + </dependencySets> + + <fileSets> <fileSet> <directory>src/main/resources</directory> <includes> Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -6,8 +6,8 @@ <com.izforge.izpack.panels.TreePacksPanel> <pack name="jBPM4 Standalone" index="0" selected="true"/> <pack name="jBPM4 JBoss Integration" index="1" selected="true"/> - <pack name="JSF-Console" index="2" selected="true"/> - <pack name="GWT-Console" index="3" selected="true"/> + <!--pack name="JSF-Console" index="2" selected="true"/> + <pack name="GWT-Console" index="3" selected="true"/--> <pack name="Optional Components" index="4" selected="false"/> <pack name="Download JBoss-5.0.0" index="5" selected="false"/> <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -123,12 +123,6 @@ unpack="true" override="true" /> <!-- - jbpm4/database - --> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-db.jar&quot; targetdir="$INSTALL_PATH/database" - unpack="true" override="true" /> - - <!-- jbpm4/docs --> <!--file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" /> @@ -149,25 +143,22 @@ * * ******************************** --> + + <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> - <pack name="jbpm4 JBoss Integration" required="no" preselected="yes"> - - <description>The jbpm4 JBoss Integration</description> + <description>The jBPM4 JBoss Integration</description> <!-- jbpm/jbpm-service.sar --> - <!--fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include>hibernate.properties</include> - <include>jbpm-*-ds.xml</include> - <include>jbpm.cfg.xml</include> - <include>logging.properties</include> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="hibernate.properties"/> + <include name="jbpm.cfg.xml"/> + <include name="logging.properties"/> </fileset> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-integration-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <!--fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-integration-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> <include name="bpm-process-deployer.xml" /> </fileset--> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> - <include name="jbpm-db.jar" /> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-jpdl-config.jar" /> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> + <include name="jbpm-jpdl.jar" /> <include name="jbpm-log.jar" /> <include name="jbpm-pvm.jar" /> <include name="jbpm-task.jar" /> @@ -186,7 +177,7 @@ <!--file src=&quot;(a){resources.dir}/destination/jbpm-destinations-service.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /--> <!-- Database configs to docs/examples/jbpm --> - <!--fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true"> <include name="hibernate.cfg.hsqldb.xml"/> <include name="hibernate.cfg.mysql.xml"/> <include name="hibernate.cfg.postgresql.xml"/> @@ -195,23 +186,23 @@ <include name="jbpm-mysql-ds.xml"/> <include name="jbpm-postgresql-ds.xml"/> <include name="jbpm-sybase-ds.xml"/> - </fileset--> + </fileset> - <!-- Database Hypsersonic + <!-- Database Hypsersonic --> <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml&quot; condition="isHypersonic" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> + <!--fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> <include name="hypersonic/jbpmDB.*" /> - </fileset>--> + </fileset--> - <!-- Database MySQL + <!-- Database MySQL --> <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml&quot; condition="isMySQL" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> <include name="mysql-connector-java.jar" /> - </fileset> --> + </fileset> </pack> @@ -241,7 +232,7 @@ --> <pack name="Optional Components" required="no" preselected="no"> - <description>Optional jbpm4 Components</description> + <description>Optional jBPM4 Components</description> </pack> <!-- JBoss-5.0.0 --> Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -19,9 +19,9 @@ <description align="left" txt="Please choose your target database" /> <spec> <choice txt="Hypersonic" value="hsqldb"/> - <!--choice txt="MySQL" value="mysql" set="true"/--> + <choice txt="MySQL" value="mysql" set="true"/> <!-- choice txt="PostgreSQL" value="postgresql"/--> - <!--choice txt="Sybase" value="sybase"/--> + <choice txt="Sybase" value="sybase"/> </spec> </field> </panel> Modified: jbpm4/branches/hbraun/modules/enterprise/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -1,18 +1,18 @@ <?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. --> - <!-- --> - <!-- ====================================================================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> - <!-- $Id$ --> +<!-- $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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - Enterprise</name> @@ -34,7 +34,7 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-pvm</artifactId> @@ -43,9 +43,9 @@ <!-- Test Dependencies --> <dependency> - <groupId>cactus</groupId> - <artifactId>cactus</artifactId> - <scope>test</scope> + <groupId>cactus</groupId> + <artifactId>cactus</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.client</groupId> @@ -56,12 +56,12 @@ <!-- Plugins --> <build> - <testResources> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - </testResources> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> <plugins> <plugin> @@ -89,6 +89,20 @@ </descriptors> </configuration> </execution> + <execution> + <id>assembly-enterprise-config</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> Added: jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml =================================================================== --- jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml (rev 0) +++ jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-config.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,17 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>config</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.outputDirectory}</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>jbpm-*-ds.xml</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: jbpm4/branches/hbraun/modules/jpdl/pom.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/jpdl/pom.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -73,9 +73,33 @@ </resources> <plugins> <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>hibernate.*</exclude> + <exclude>jbpm.cfg.xml</exclude> + <exclude>jbpm-*-ds.xml</exclude> + <exclude>db.properties/**</exclude> + <exclude>logging.properties</exclude> + </excludes> + </configuration> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="database" value="${database}" /> + <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" /> + </tasks> + </configuration> + </execution> + <!--execution> <id>generate-db-scripts</id> <phase>package</phase> <goals> @@ -87,7 +111,7 @@ <ant antfile="scripts/build.schema.xml" target="create-schema" /> </tasks> </configuration> - </execution> + </execution--> </executions> </plugin> @@ -97,7 +121,7 @@ <excludes> <!-- https://jira.jboss.org/jira/browse/JBPM-1759 --> <exclude>org/jbpm/jpdl/controlflow/DecisionExpressionTest.java</exclude> - <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude> + <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude> <exclude>org/jbpm/jpdl/parsing/JpdlSchemaTest.java</exclude> <exclude>org/jbpm/jpdl/parsing/ProcessParsingTest.java</exclude> <exclude>org/jbpm/jpdl/parsing/TransitionParsingTest.java</exclude> @@ -123,7 +147,7 @@ </executions> </plugin> - <plugin> + <!--plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -141,7 +165,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin>--> </plugins> </build> Added: jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/scripts/antrun-jbpm-config.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,104 @@ +<?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: antrun-jbpm-config.xml 3602 2009-01-08 04:27:48Z alex.guizar(a)jboss.com $ --> + +<project default="concat"> + + <property name="project.build.directory" value="${basedir}/target"/> + <property name="build.resources.directory" value="${basedir}/target/classes"/> + + <macrodef name="macro-disable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-enable"> + <attribute name="file" /> + <attribute name="section" /> + <sequential> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue> + </replace> + <replace file="@{file}" summary="true"> + <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> + <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> + </replace> + </sequential> + </macrodef> + + <macrodef name="macro-database-cfg"> + <attribute name="database" /> + <sequential> + + <available property=&quot;(a){database}.properties.available&quot; file=&quot;${build.resources.directory}/hibernate.properties.(a){database}.xml&quot;/&gt; + <fail message=&quot;hibernate.properties.(a){database}.xml not available" unless=&quot;(a){database}.properties.available&quot;/&gt; + + <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, hibernate.mapping.(a){database}.xml&quot; /> + + <!-- Concat hibernate.cfg.xml --> + <concat destfile=&quot;${project.build.directory}/classes/hibernate.cfg.(a){database}.xml&quot;&gt; + <header><![CDATA[<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> +]]></header> + <fileset file=&quot;${build.resources.directory}/hibernate.properties.(a){database}.xml&quot; /> + <fileset file="${build.resources.directory}/hibernate.common.xml" /> + <fileset file=&quot;${build.resources.directory}/hibernate.mapping.(a){database}.xml&quot; /> + <fileset file="${build.resources.directory}/hibernate.mapping.default.xml" /> + <fileset file="${build.resources.directory}/hibernate.cache.xml" /> + <footer><![CDATA[ </session-factory> +</hibernate-configuration>]]></footer> + </concat> + </sequential> + </macrodef> + + <target name="concat" > + <macro-database-cfg database="db2" /> + <macro-database-cfg database="derby" /> + <macro-database-cfg database="firebird" /> + <macro-database-cfg database="hsqldb"/> + <macro-database-cfg database="ingres" /> + <macro-database-cfg database="interbase" /> + <macro-database-cfg database="mckoi" /> + <macro-database-cfg database="mssql" /> + <macro-database-cfg database="mysql"/> + <macro-database-cfg database="postgresql"/> + <macro-database-cfg database="sapdb" /> + <macro-database-cfg database="sybase"/> + <macro-database-cfg database="oracle" /> + <macro-database-cfg database="postgresql" /> + + <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" /> + <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/> + + <loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/> + <echo message="${hibernate.properties.xml}"/> + <echo/> + + </target> + +</project> \ No newline at end of file Modified: jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -13,7 +13,8 @@ <include>jbpm.cfg.xml</include> <include>logging.properties</include> <include>hibernate.cfg.xml</include> - <include>db.properties/*</include> + <include>hibernate.cfg.*.xml</include> + <include>jbpm-*-ds.xml</include> </includes> </fileSet> </fileSets> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.common.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,41 @@ + + <!-- DataSource properties (begin) === + <property name="hibernate.connection.datasource">java:JbpmDS</property> + ==== DataSource properties (end) --> + + <!-- JTA transaction properties (begin) === + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <property name="jta.UserTransaction">UserTransaction</property> + ==== JTA transaction properties (end) --> + + <!-- CMT transaction properties (begin) === + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property> + <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + ==== CMT transaction properties (end) --> + + <!-- ################################### --> + <!-- # common settings # --> + <!-- ################################### --> + + <!-- Automatic schema creation (begin) --> + <property name="hibernate.hbm2ddl.auto">create</property> + <!-- Automatic schema creation (end) --> + + <!-- Simple memory-only cache --> + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + + <!-- logging properties --> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> + + <!-- Common hibernate mapping used with jpdl --> + + <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" /> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.db2.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://www-128.ibm.com/developerworks/db2/downloads/jcc --> + <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property> + <property name="hibernate.connection.url">jdbc:db2://localhost:50000/testing</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.derby.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.DerbyDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://db.apache.org/derby --> + <property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property> + <property name="hibernate.connection.url">jdbc:derby:build/derby/jbpmtest;create=true</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.FirebirdDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://firebird.sourceforge.net/ --> + <property name="hibernate.connection.driver_class">org.firebirdsql.jdbc.FBDriver</property> + <property name="hibernate.connection.url">jdbc:firebirdsql:localhost:jbpmtest</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,11 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.IngresDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.InterbaseDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.MckoiDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://msdn.microsoft.com/data/jdbc --> + <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property> + <property name="hibernate.connection.url">jdbc:jtds:sqlserver://localhost:1433/jbpmtest</property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,11 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> + <property name="hibernate.connection.url">${jdbc.mysql.url}</property> + <property name="hibernate.connection.username">${jdbc.mysql.username}</property> + <property name="hibernate.connection.password">${jdbc.mysql.password}</property> + <property name="hibernate.query.substitutions">true 1, false 0</property> + <!-- JDBC connection properties (end) --> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://www.oracle.com --> + <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property> + <property name="hibernate.connection.url">${jdbc.oracle.url}</property> + <property name="hibernate.connection.username">${jdbc.oracle.username}</property> + <property name="hibernate.connection.password">${jdbc.oracle.password}</property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,11 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">org.postgresql.Driver</property> + <property name="hibernate.connection.url">${jdbc.postgresql.url}</property> + <property name="hibernate.connection.username">${jdbc.postgresql.username}</property> + <property name="hibernate.connection.password">${jdbc.postgresql.password}</property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,12 @@ + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.SAPDBDialect</property> + + <!-- JDBC connection properties (begin) --> + <!-- fetch driver from http://google.com --> + <property name="hibernate.connection.driver_class"></property> + <property name="hibernate.connection.url"></property> + <property name="hibernate.connection.username"></property> + <property name="hibernate.connection.password"></property> + <!-- JDBC connection properties (end) --> + Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,23 @@ + <!-- + Out-of-the-box compatibility with Sybase + https://jira.jboss.org/jira/browse/JBPM-700 + + System Service QA Database Sybase + https://wiki.corp.jboss.com/bin/composite/IT/SystemServiceQaDatabaseSybase + + Install Sybase ASE 15.0.2 on Fedora9 + https://www.jboss.org/community/docs/DOC-12932 + --> + + <!-- hibernate dialect --> + <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> + + <!-- JDBC connection properties (begin) --> + <property name="hibernate.connection.driver_class">${jdbc.sybase.driver}</property> + <property name="hibernate.connection.url">${jdbc.sybase.url}</property> + <property name="hibernate.connection.username">${jdbc.sybase.username}</property> + <property name="hibernate.connection.password">${jdbc.sybase.password}</property> + <!-- JDBC connection properties (end) --> + + <!-- jConnect does not support retrieving natively generated keys after insert --> + <property name="hibernate.jdbc.use_get_generated_keys">false</property> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>JbpmDS</jndi-name> + + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpmDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + + <!-- connection pool parameters --> + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + + <!-- disable idle connection removal, hsqldb does not reap threads on closed connections --> + <idle-timeout-minutes>0</idle-timeout-minutes> + <!-- check all statements are closed when the connection is returned to the pool --> + <track-statements /> + <!-- hsqldb benefits from prepared statement caching --> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + + <!-- ensure the datasource is not initialized before the database itself --> + <depends>jboss:service=Hypersonic,database=jbpmDB</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpmDB"> + <attribute name="Database">jbpmDB</attribute> + <attribute name="InProcessMode">true</attribute> + </mbean> + +</datasources> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property> + <user-name>${jdbc.mysql.username}</user-name> + <password>${jdbc.mysql.password}</password> + + <!-- reduce isolation from the default level (repeatable read) --> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <!-- separate connections used with and without JTA transaction --> + <no-tx-separate-pools /> + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + + <!-- leverage mysql integration features --> + <exception-sorter-class-name> + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + </exception-sorter-class-name> + <valid-connection-checker-class-name> + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + </valid-connection-checker-class-name> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + </xa-datasource> + +</datasources> \ No newline at end of file Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property> + <user-name>${jdbc.postgresql.username}</user-name> + <password>${jdbc.postgresql.password}</password> + + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml (rev 0) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property> + <user-name>${jdbc.sybase.username}</user-name> + <password>${jdbc.sybase.password}</password> + + <!-- disable transaction interleaving --> + <track-connection-by-tx /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Modified: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-01-30 14:20:23 UTC (rev 3736) +++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml 2009-01-30 20:29:00 UTC (rev 3737) @@ -25,8 +25,9 @@ <standard-transaction-interceptor /> </command-service> - <hibernate-configuration> - <properties resource="hibernate.properties" /> + <hibernate-configuration> + <mapping resource="hibernate.cfg.xml"/> + <!--properties resource="hibernate.properties" /> <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> <mapping resource="jbpm.pvm.wire.hbm.xml" /> <mapping resource="jbpm.pvm.definition.hbm.xml" /> @@ -36,7 +37,7 @@ <mapping resource="jbpm.jpdl.hbm.xml" /> <mapping resource="jbpm.task.hbm.xml" /> <cache-configuration resource="jbpm.pvm.cache.xml" - usage="nonstrict-read-write" /> + usage="nonstrict-read-write" /--> </hibernate-configuration> <hibernate-session-factory />