Author: thomas.diesler(a)jboss.com Date: 2008-09-02 08:30:53 -0400 (Tue, 02 Sep 2008) New Revision: 2069 Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/trunk/modules/distribution/scripts/install-definition.xml jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml Log: Enable JTA transaction properties Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-02 11:33:42 UTC (rev 2068) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-02 12:30:53 UTC (rev 2069) @@ -77,10 +77,21 @@ <!-- ================================================================== --> <target name="configure" depends="init"> - <property name="hibernate.cfg.xml" value="${deploy.artifacts.resources}/jbpm-config/hibernate.cfg.xml"/> - <macro-disable file="${hibernate.cfg.xml}" section="JDBC connection properties"/> - <macro-enable file="${hibernate.cfg.xml}" section="DataSource properties"/> + <property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.hsqldb.xml"/> + <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/> + <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/> + <property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.mysql.xml"/> + <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> + <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> + + <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.postgresql.xml"/> + <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> + <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> + </target> <!-- ================================================================== --> Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-02 11:33:42 UTC (rev 2068) +++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-02 12:30:53 UTC (rev 2069) @@ -16,14 +16,21 @@ <unpack>false</unpack> </dependencySet> <dependencySet> - <outputDirectory>resources/jbpm-config</outputDirectory> + <outputDirectory>resources/jbpm-core-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jbpm-enterprise:jar:config</include> <include>*:jbpm-jpdl-core: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> </dependencySets> <fileSets> Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 11:33:42 UTC (rev 2068) +++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-09-02 12:30:53 UTC (rev 2069) @@ -66,6 +66,7 @@ <panel classname="HelloPanel" /> <panel classname="UserInputPanel" /> <panel classname="UserInputPanel" /> + <!-- http://jira.codehaus.org/browse/IZPACK-154 --> <panel classname="TreePacksPanel" /> <panel classname="SummaryPanel" /> <panel classname="InstallPanel" /> @@ -90,7 +91,7 @@ unpack="true" override="true" /> <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-console-service.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" unpack="true" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-config/jbpm.cfg.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"/> </pack> <!-- jBPM Hypersonic Database --> @@ -100,7 +101,7 @@ <include name="hypersonic/jbpmDB.*" /> </fileset> <file src=&quot;(a){resources.dir}/database/jbpm-hsqldb-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-config/hibernate.cfg.hsqldb.xml&quot; + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> </pack> @@ -112,7 +113,7 @@ <include name="mysql-connector-java.jar" /> </fileset> <file src=&quot;(a){resources.dir}/database/jbpm-mysql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-config/hibernate.cfg.mysql.xml&quot; + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> </pack> @@ -124,7 +125,7 @@ <include name="postgresql-jdbc3.jar" /> </fileset> <file src=&quot;(a){resources.dir}/database/jbpm-postgresql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-config/hibernate.cfg.postgresql.xml&quot; + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml"/> </pack> </packs> Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 11:33:42 UTC (rev 2068) +++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-02 12:30:53 UTC (rev 2069) @@ -49,6 +49,7 @@ </macrodef> <target name="concat"> + <macro-database-cfg database="hsqldb"/> <macro-database-cfg database="mysql"/> <macro-database-cfg database="postgresql"/>