[jbpm-commits] JBoss JBPM SVN: r4229 - in jbpm4/branches/tbaeyens: modules/distro and 9 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-03-11 12:45:02 -0400 (Wed, 11 Mar 2009) New Revision: 4229 Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/datasource/hsqldb.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/jdbc/hsqldb.url.xml Modified: jbpm4/branches/tbaeyens/build.xml jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties jbpm4/branches/tbaeyens/modules/distro/pom.xml jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jboss/datasource/jbpm-hsqldb-ds.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/branches/tbaeyens/modules/examples/pom.xml jbpm4/branches/tbaeyens/modules/test-db/pom.xml jbpm4/branches/tbaeyens/pom.xml Log: work Modified: jbpm4/branches/tbaeyens/build.xml =================================================================== --- jbpm4/branches/tbaeyens/build.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/build.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -57,19 +57,22 @@ </antcall> </target> - <target name="distro.package"> - <exec executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> - <arg line="-DskipTests package assembly:assembly" /> + <target name="distro.test" depends="distro.build, distro.install" /> + + <target name="distro.build"> + <exec dir="." executable="${mvn.executable}" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="${mvn.executable} -Pdistro -Ddatabase=hsqldb -Djbpm.target.container=jboss500 -Djboss.home=${distro.installation.dir}/jbpm-${distro.version}/jboss-${distro.jboss.version} clean install" /> </exec> - <antcall target="show.html"> - <param name="page" value="target/"/> - </antcall> </target> <target name="distro.install" > <delete dir="${distro.installation.dir}/jbpm-${distro.version}" /> <unzip src="${distro.jboss}" dest="${distro.installation.dir}/jbpm-${distro.version}" /> - <java jar="modules/distro/target/jbpm-installer-${distro.version}.jar" fork="true"/> + <java jar="modules/distro/target/jbpm-installer-${distro.version}.jar" fork="true"> + <arg value="modules/distro/target/resources/auto-install-template.xml" /> + </java> + + <!-- <unzip src="${distro.eclipse}" dest="${distro.installation.dir}/jbpm-${distro.version}" /> <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> <arg line="/C start &quot;${distro.installation.dir}/jbpm-${distro.version}/eclipse/eclipse.exe&quot; &quot;-data&quot; &quot;${distro.installation.dir}/jbpm-${distro.version}/workspace&quot;" /> @@ -77,6 +80,7 @@ <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> <arg line="/C start &quot;${windows.browser}&quot; &quot;file://${distro.installation.dir}/jbpm-${distro.version}&quot;" /> </exec> + --> </target> <target name="distro.eclipse.install"> Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-11 16:45:02 UTC (rev 4229) @@ -1,2 +1,2 @@ ## index of importer -> set(imports) -#Tue Mar 10 08:32:13 CET 2009 +#Wed Mar 11 08:21:14 CET 2009 Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -50,15 +50,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-db</artifactId> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-enterprise</artifactId> </dependency> <dependency> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -12,36 +12,6 @@ <!-- $Id: antrun-installer.xml 3319 2008-12-10 14:29:01Z thomas.diesler(a)jboss.com $ --> <project> - <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> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> @@ -56,44 +26,57 @@ <!-- Initialization --> <!-- ================================================================== --> <target name="init"> - </target> <!-- ================================================================== --> <!-- Configuration --> <!-- ================================================================== --> <target name="configure" depends="init"> + <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" /> - <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"/> - <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/> + <echo message="creating hsqldb db" /> + <ant antfile="src/main/resources/config-tool/build.xml" target="db.create" inheritall="false"> + <property name="database" value="hsqldb.url" /> + <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/deploy-artifacts/resources/hypersonic/Jbpm4DB" /> + <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" /> + <property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" /> + <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> + <property name="libs.dir" value="${deploy.artifacts.dir}/lib" /> + </ant> - <property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/> - <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/> + <echo message="creating db configurations" /> + <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false"> + <property name="database" value="hsqldb" /> + <property name="connection.type" value="datasource" /> + <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" /> + <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" /> + <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> + <property name="libs.dir" value="${deploy.artifacts.dir}/lib" /> + </ant> + <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false"> + <property name="database" value="mysql" /> + <property name="connection.type" value="datasource" /> + <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-mysql-config" /> + <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" /> + <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> + <property name="libs.dir" value="${deploy.artifacts.dir}/lib" /> + </ant> + <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false"> + <property name="database" value="oracle" /> + <property name="connection.type" value="datasource" /> + <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-oracle-config" /> + <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" /> + <property name="tmp.dir" value="${output.dir}/config.tool.tmp" /> + <property name="libs.dir" value="${deploy.artifacts.dir}/lib" /> + </ant> + - <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/> - <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> + <!-- the next copy depends on previous config-tool execution --> + <mkdir dir="${deploy.artifacts.dir}/resources/datasources" /> + <copy todir="${deploy.artifacts.dir}/resources/datasources"> + <fileset dir="${output.dir}/config.tool.tmp/resolved/jboss/datasource"/> + </copy> - <property name="oracle.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml"/> - <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties"/> - <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation"/> - <macro-enable file="${oracle.cfg.xml}" section="DataSource properties"/> - <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties"/> - - <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> - <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"/> - <condition property="database.is.hsqldb" value="true" else="false"> <equals arg1="${database}" arg2="hsqldb"/> </condition> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -41,14 +41,6 @@ </dependencySet> <!-- resources --> <dependencySet> - <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jpdl:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> @@ -64,14 +56,6 @@ </includes> <unpack>true</unpack> </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-db</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-db:jar:*</include> - </includes> - <unpack>true</unpack> - </dependencySet> </dependencySets> <fileSets> @@ -93,14 +77,6 @@ <outputDirectory>doc/schemadoc</outputDirectory> </fileSet> <fileSet> - <directory>../db/target/create</directory> - <outputDirectory>db/create</outputDirectory> - </fileSet> - <fileSet> - <directory>../db/target/drop</directory> - <outputDirectory>db/drop</outputDirectory> - </fileSet> - <fileSet> <directory>../devguide/target/docbook/publish/en</directory> <outputDirectory>doc/devguide</outputDirectory> <excludes> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -140,6 +140,9 @@ <target name="db.create" depends="create.db.scripts, internal.load.hibernate.properties" description="creates the db tables in the database"> + <echo message="driver: ${hibernate.connection.driver_class}" /> + <echo message="url: ${hibernate.connection.url}" /> + <echo message="username: ${hibernate.connection.username}" /> <sql driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" userid="${hibernate.connection.username}" @@ -197,24 +200,28 @@ </target> <target name="internal.identity.config.files" if="is.identity.included"> - <copy file="identity/jbpm.identity.cfg.xml" todir="${config.files.dir}" overwrite="true" /> - <mkdir dir="${config.files.dir}/META-INF" /> + <mkdir dir="${tmp.dir}/identity" /> + <mkdir dir="${config.files.dir}/META-INF" /> <copy file="hibernate/${connection.type}/${database}.xml" - tofile="${tmp.dir}/tmp.persistence.properties.xml" + tofile="${tmp.dir}/identity/identity.persistence.properties.xml" overwrite="true"/> - <replace file="${tmp.dir}/tmp.persistence.properties.xml" + <replace file="${tmp.dir}/identity/identity.persistence.properties.xml" token="&quot;&gt;" value="&quot; value=&quot;" /> - <replace file="${tmp.dir}/tmp.persistence.properties.xml" + <replace file="${tmp.dir}/identity/identity.persistence.properties.xml" token="&lt;/property&gt;" value="&quot; /&gt;" /> + <copy todir="${tmp.dir}/identity"> + <fileset dir="identity/META-INF" /> + </copy> <concat destfile="${config.files.dir}/META-INF/persistence.xml"> - <filelist dir="."> - <file name="identity/META-INF/part1.persistence.xml" /> - <file name="${tmp.dir}/tmp.persistence.properties.xml"/> - <file name="identity/META-INF/part2.persistence.xml"/> + <filelist dir="${tmp.dir}/identity"> + <file name="part1.persistence.xml" /> + <file name="identity.persistence.properties.xml"/> + <file name="part2.persistence.xml"/> </filelist> </concat> + <copy file="identity/jbpm.identity.cfg.xml" todir="${config.files.dir}" overwrite="true" /> </target> <target name="internal.jpdl.hibernate.mapping.files" if="is.jpdl.included"> @@ -240,6 +247,7 @@ <fileset dir="." /> <filterset filtersfile="jdbc.properties"> <filter token="jboss.bind.address" value="${jboss.bind.address}"/> + <filter token="jdbc.hsqldb.url" value="${jdbc.hsqldb.url}" /> </filterset> </copy> </target> Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/datasource/hsqldb.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/datasource/hsqldb.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/datasource/hsqldb.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.datasource">java:JbpmDS</property> + <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> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/datasource/hsqldb.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/jdbc/hsqldb.url.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/jdbc/hsqldb.url.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/jdbc/hsqldb.url.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -0,0 +1,5 @@ + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name=&quot;hibernate.connection.url&quot;&gt;@jdbc.hsqldb.url(a)&lt;/property&gt; + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/jdbc/hsqldb.url.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jboss/datasource/jbpm-hsqldb-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jboss/datasource/jbpm-hsqldb-ds.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jboss/datasource/jbpm-hsqldb-ds.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -4,7 +4,7 @@ <local-tx-datasource> <jndi-name>JbpmDS</jndi-name> - <connection-url>jdbc:hsqldb:@jboss.server.data.dir@@/@hypersonic@/@jbpm4DB</connection-url> + <connection-url>jdbc:hsqldb:@jboss.server.data.dir@@/@hypersonic@/@Jbpm4DB</connection-url> <driver-class>org.hsqldb.jdbcDriver</driver-class> <user-name>sa</user-name> <password></password> @@ -26,11 +26,11 @@ </metadata> <!-- ensure the datasource is not initialized before the database itself --> - <depends>jboss:service=Hypersonic,database=jbpm4DB</depends> + <depends>jboss:service=Hypersonic,database=Jbpm4DB</depends> </local-tx-datasource> - <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpm4DB"> - <attribute name="Database">jbpm4DB</attribute> + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=Jbpm4DB"> + <attribute name="Database">Jbpm4DB</attribute> <attribute name="InProcessMode">true</attribute> </mbean> Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -120,15 +120,12 @@ <file src=&quot;(a){deploy.artifacts.dir}/license.txt&quot; targetdir="$INSTALL_PATH" override="true" /> <file src=&quot;(a){deploy.artifacts.dir}/readme.html&quot; targetdir="$INSTALL_PATH" override="true" /> - <!-- jbpm4/config --> - <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar&quot; targetdir="$INSTALL_PATH/config" - unpack="true" override="true" /> - - <!-- jbpm4/doc --> + <!-- jbpm4/doc <fileset dir=&quot;(a){deploy.artifacts.dir}/doc&quot; targetdir="$INSTALL_PATH/doc" /> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-db&quot; targetdir="$INSTALL_PATH/doc/database-scripts" includes="create/,drop/"/> + --> <!-- jbpm4/examples --> <fileset dir=&quot;(a){deploy.artifacts.dir}/examples&quot; targetdir="$INSTALL_PATH/examples" /> @@ -263,25 +260,39 @@ --> <!-- 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){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> - <include name="hypersonic/jbpm4DB.*" /> + <file src=&quot;(a){deploy.artifacts.dir}/resources/datasources/jbpm-hsqldb-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + condition="isHypersonic"/> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-hsqldb-config&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + condition="isHypersonic" /> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" + condition="isHypersonic"> + <include name="hypersonic/Jbpm4DB.*" /> </fileset> <!-- 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"> + <file src=&quot;(a){deploy.artifacts.dir}/resources/datasources/jbpm-mysql-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + condition="isMySQL"/> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-mysql-config&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + condition="isMySQL" /> + <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> <!-- Database Oracle --> - <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isOracle"/> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml&quot; condition="isOracle" - target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <file src=&quot;(a){deploy.artifacts.dir}/resources/datasources/jbpm-oracle-ds.xml&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" + condition="isOracle"/> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-oracle-config&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" + condition="isOracle" /> <!-- NOTE: oracle driver needs to be provided manually --> <!-- Modified: jbpm4/branches/tbaeyens/modules/examples/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -61,16 +61,10 @@ </dependency> </dependencies> - <profiles> - <!-- -Ddatabase= --> <profile> - <id>database.config.overwrite</id> - <activation> - <property> - <name>database</name> - </property> - </activation> + <!-- mvn -Pusedb -Ddatabase=oracle clean install --> + <id>usedb</id> <build> <plugins> <plugin> @@ -98,14 +92,9 @@ </build> </profile> - <!-- -Djboss.bind.address= --> <profile> - <id>jboss.config.overwrite</id> - <activation> - <property> - <name>jboss.bind.address</name> - </property> - </activation> + <!-- mvn -Pusejboss -Djboss.bind.address= --> + <id>usejboss</id> <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> @@ -146,6 +135,7 @@ </plugins> </build> </profile> + </profiles> - + </project> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/test-db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -42,14 +42,9 @@ </dependencies> <profiles> - <!-- -Ddatabase= --> <profile> - <id>database.config.overwrite</id> - <activation> - <property> - <name>database</name> - </property> - </activation> + <!-- mvn -Pusedb -Ddatabase=oracle clean install --> + <id>usedb</id> <build> <plugins> <plugin> @@ -76,6 +71,51 @@ </plugins> </build> </profile> + + <profile> + <!-- mvn -Pusejboss -Djboss.bind.address= --> + <id>usejboss</id> + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-enterprise</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo>Overwriting db configuration for ${database}</echo> + <ant antfile="../distro/src/main/resources/config-tool/build.xml" + target="create.remote.configuration" + inheritall="false"> + <property name="jboss.bind.address" value="${jboss.bind.address}" /> + <property name="config.files.dir" value="${basedir}/target/test-classes" /> + <property name="tmp.dir" value="${basedir}/target/config-tmp" /> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/pom.xml 2009-03-11 14:15:09 UTC (rev 4228) +++ jbpm4/branches/tbaeyens/pom.xml 2009-03-11 16:45:02 UTC (rev 4229) @@ -119,12 +119,6 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-jpdl</artifactId> - <classifier>config</classifier> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-log</artifactId> <version>${version}</version> </dependency> @@ -415,6 +409,7 @@ <profile> <id>distro</id> <modules> + <module>modules/enterprise</module> <module>modules/integration</module> <module>modules/devguide</module> <module>modules/distro</module>