Author: thomas.diesler(a)jboss.com Date: 2008-11-06 05:17:39 -0500 (Thu, 06 Nov 2008) New Revision: 2767 Added: jbpm3/trunk/eclipse/ jbpm3/trunk/modules/core/src/main/resources/jbpm-hsqldb-ds.xml jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml Removed: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml Modified: jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/scripts/assembly-config.xml jbpm3/trunk/modules/distribution/.classpath jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml jbpm3/trunk/pom.xml Log: Fix install of data sources Copied: jbpm3/trunk/eclipse (from rev 2565, jbpm4/trunk/eclipse) Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/core/pom.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -162,6 +162,7 @@ <excludes> <exclude>hibernate.*</exclude> <exclude>jbpm.cfg.xml</exclude> + <exclude>jbpm-*-ds.xml</exclude> <exclude>jbpm.mail.templates.xml</exclude> </excludes> </configuration> Modified: jbpm3/trunk/modules/core/scripts/assembly-config.xml =================================================================== --- jbpm3/trunk/modules/core/scripts/assembly-config.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/core/scripts/assembly-config.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -12,6 +12,7 @@ <includes> <include>hibernate.cfg.xml</include> <include>hibernate.cfg.*.xml</include> + <include>jbpm-*-ds.xml</include> <include>jbpm.cfg.xml</include> <include>jbpm.mail.templates.xml</include> </includes> Copied: jbpm3/trunk/modules/core/src/main/resources/jbpm-hsqldb-ds.xml (from rev 2765, jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml) =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-hsqldb-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -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> Copied: jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml (from rev 2765, jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml) =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml (rev 0) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -0,0 +1,33 @@ +<?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="URL">${jdbc.mysql.url}</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 Copied: jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml (from rev 2765, jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml) =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml (rev 0) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -0,0 +1,21 @@ +<?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="URL">${jdbc.postgresql.url}</xa-datasource-property> + <xa-datasource-property name="User">${jdbc.postgresql.username}</xa-datasource-property> + <xa-datasource-property name="Password">${jdbc.postgresql.password}</xa-datasource-property> + + <!-- 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> Copied: jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml (from rev 2765, jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml) =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml (rev 0) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class> + <xa-datasource-property name="URL">${jdbc.sybase.url}</xa-datasource-property> + <xa-datasource-property name="User">${jdbc.sybase.username}</xa-datasource-property> + <xa-datasource-property name="Password">${jdbc.sybase.password}</xa-datasource-property> + + <!-- 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: jbpm3/trunk/modules/distribution/.classpath =================================================================== --- jbpm3/trunk/modules/distribution/.classpath 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/.classpath 2008-11-06 10:17:39 UTC (rev 2767) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="src" path="src/main/java"/> <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"/> Deleted: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-hsqldb-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -1,37 +0,0 @@ -<?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> Deleted: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-mysql-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -1,33 +0,0 @@ -<?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="URL">jdbc:mysql://localhost:3306/jbpmtest</xa-datasource-property> - <user-name>jbpmtest</user-name> - <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 Deleted: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-postgresql-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -1,23 +0,0 @@ -<?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">localhost</xa-datasource-property> - <xa-datasource-property name="PortNumber">5432</xa-datasource-property> - <xa-datasource-property name="DatabaseName">jbpmtest</xa-datasource-property> - <xa-datasource-property name="User">jbpmtest</xa-datasource-property> - <xa-datasource-property name="Password"></xa-datasource-property> - - <!-- 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> Deleted: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<datasources> - - <xa-datasource> - <jndi-name>JbpmDS</jndi-name> - - <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class> - <xa-datasource-property name="ServerName">dev01.qa.atl.jboss.com</xa-datasource-property> - <xa-datasource-property name="PortNumber">4100</xa-datasource-property> - <xa-datasource-property name="DatabaseName">jbpmteam</xa-datasource-property> - <xa-datasource-property name="User">jbpmteam</xa-datasource-property> - <xa-datasource-property name="Password">jbpmteam</xa-datasource-property> - - <!-- 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: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -4,16 +4,12 @@ <installpath&gt;@user.home@/jBPM-@product.version(a)&lt;/installpath&gt; </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM3 Standalone" index="0" selected="true" /> - <pack name="Optional Downloads" index="1" selected="false" /> - <pack name="Download JBoss-4.2.2" index="2" selected="false" /> - <pack name="Download Eclipse-3.4.0" index="3" selected="false" /> - <pack name="jBPM3 Server Components" index="4" selected="true" /> - <pack name="jBPM3 Databases" index="5" selected="true" /> - <pack name="jBPM3 Hypersonic Database" index="6" selected=&quot;@database.is.hsqldb(a)&quot; /> - <pack name="jBPM3 MySQL Database" index="7" selected=&quot;@database.is.mysql(a)&quot; /> - <pack name="jBPM3 PostgreSQL Database" index="8" selected=&quot;@database.is.postgresql(a)&quot; /> - <pack name="jBPM3 Sybase Database" index="8" selected=&quot;@database.is.sybase(a)&quot; /> + <pack name="jBPM3 Standalone" index="0" selected="true"/> + <pack name="jBPM3 Server Components" index="1" selected="true"/> + <pack name="Optional Components" index="2" selected="false"/> + <pack name="Download JBoss-4.2.2" index="3" selected="false"/> + <pack name="Download Eclipse-3.4.0" index="4" selected="false"/> + <pack name="GWT-Console" index="5" selected="false"/> </com.izforge.izpack.panels.TreePacksPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput> @@ -23,6 +19,11 @@ </com.izforge.izpack.panels.UserInputPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput> + <entry key="dbSelection" value=&quot;@jbpm.target.database(a)&quot;/&gt; + </userInput> + </com.izforge.izpack.panels.UserInputPanel> + <com.izforge.izpack.panels.UserInputPanel> + <userInput> <entry key="installPath" value=&quot;@jboss.home(a)&quot; /> </userInput> </com.izforge.izpack.panels.UserInputPanel> Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -57,6 +57,8 @@ <condition type="packselection" id="isJBoss422Download"> <packid>Download JBoss-4.2.2</packid> </condition> + + <!-- Target Server Conditions --> <condition type="variable" id="isJBoss422"> <name>jbossSelection</name> <value>jboss422</value> @@ -69,6 +71,24 @@ <name>jbossSelection</name> <value>jboss500</value> </condition> + + <!-- Target Database Conditions --> + <condition type="variable" id="isHypersonic"> + <name>dbSelection</name> + <value>hsqldb</value> + </condition> + <condition type="variable" id="isMySQL"> + <name>dbSelection</name> + <value>mysql</value> + </condition> + <condition type="variable" id="isPostgreSQL"> + <name>dbSelection</name> + <value>postgresql</value> + </condition> + <condition type="variable" id="isSybase"> + <name>dbSelection</name> + <value>sybase</value> + </condition> </conditions> <!-- Panels --> @@ -78,6 +98,7 @@ <panel classname="TreePacksPanel" /> <panel classname="UserInputPanel" /> <panel classname="UserInputPanel" /> + <panel classname="UserInputPanel" /> <panel classname="SummaryPanel" /> <panel classname="InstallPanel" /> <panel classname="FinishPanel" /> @@ -139,36 +160,7 @@ </fileset> </pack> - <!-- Optional Downloads --> - <pack name="Optional Components" required="no" preselected="no"> - <description>Optional jBPM3 Downloads</description> - </pack> - - <!-- JBoss-4.2.2 --> - <pack name="Download JBoss-4.2.2" required="no" parent="Optional Components" preselected="no"> - <description>Download and Install JBoss-4.2.2</description> - <!-- http://jira.codehaus.org/browse/IZPACK-158 --> - <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> - </pack> - - <!-- Eclipse-3.4.0 --> - <pack name="Download Eclipse-3.4.0" required="no" parent="Optional Components" preselected="no"> - <description>Download and Install Eclipse-3.4.0</description> - <!-- http://jira.codehaus.org/browse/IZPACK-158 --> - <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> - </pack> - - <pack name="GWT-Console" required="no" parent="Optional Components" preselected="no"> - <description>GWT-Console (Preview, use at your own risk)</description> - <!-- jbpm/gwt-console.war --> - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console.war&quot; - targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/" unpack="false" override="true" /> - - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server.war&quot; - targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="true" override="true" /> - </pack> - - <!-- jBPM3 Server Components --> + <!-- jBPM3 Server Components --> <pack name="jBPM3 Server Components" required="yes" preselected="yes"> <description>The jBPM3 Server Components</description> @@ -191,55 +183,71 @@ <!-- jbpm-destinations-service --> <file src=&quot;(a){resources.dir}/destination/jbpm-destinations-service.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> - </pack> - - <!-- jBPM Databases --> - <pack name="jBPM3 Databases" required="no" preselected="no"> - <description>The jBPM3 Supported Databases.</description> - </pack> - - <!-- jBPM Hypersonic Database --> - <pack name="jBPM3 Hypersonic Database" required="no" parent="jBPM3 Databases" preselected="yes"> - <description>The Hypersonic Database</description> - <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${installPath}/server/${jbossTargetServer}/data"> + + <!-- Database Hypsersonic --> + <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${installPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> <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-core-config/hibernate.cfg.hsqldb.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - </pack> - - <!-- jBPM MySQL Database --> - <pack name="jBPM3 MySQL Database" required="no" parent="jBPM3 Databases" preselected="no"> - <description>The MySQL Database</description> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-hsqldb-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml&quot; condition="isHypersonic" + target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + + <!-- Database MySQL --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> + override="true" condition="isMySQL"> <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-core-config/hibernate.cfg.mysql.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - </pack> - - <!-- jBPM PostgreSQL Database --> - <pack name="jBPM3 PostgreSQL Database" required="no" parent="jBPM3 Databases" preselected="no"> - <description>The PostgreSQL Database</description> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-mysql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml&quot; condition="isMySQL" + target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + + <!-- Database PostgreSQL --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> + override="true" condition="isPostgreSQL"> <include name="postgresql.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-core-config/hibernate.cfg.postgresql.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - </pack> - - <!-- jBPM Sybase Database --> - <pack name="jBPM3 Sybase Database" required="no" parent="jBPM3 Databases" preselected="no"> - <description>The Sybase Database</description> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-postgresql-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isPostgreSQL"/> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml&quot; condition="isPostgreSQL" + target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + + <!-- Database Sybase --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" - override="true"> + override="true" condition="isSybase"> <include name="jtds.jar" /> </fileset> - <file src=&quot;(a){resources.dir}/database/jbpm-sybase-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" /> - <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.sybase.xml&quot; target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-sybase-ds.xml&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase"/> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.sybase.xml&quot; condition="isSybase" + target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> </pack> + <!-- Optional Components --> + <pack name="Optional Components" required="no" preselected="no"> + <description>Optional jBPM3 Components</description> + </pack> + + <!-- JBoss-4.2.2 --> + <pack name="Download JBoss-4.2.2" required="no" parent="Optional Components" preselected="no"> + <description>Download and Install JBoss-4.2.2</description> + <!-- http://jira.codehaus.org/browse/IZPACK-158 --> + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> + </pack> + + <!-- Eclipse-3.4.0 --> + <pack name="Download Eclipse-3.4.0" required="no" parent="Optional Components" preselected="no"> + <description>Download and Install Eclipse-3.4.0</description> + <!-- http://jira.codehaus.org/browse/IZPACK-158 --> + <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> + </pack> + + <!-- GWT Console --> + <pack name="GWT-Console" required="no" parent="Optional Components" preselected="no"> + <description>GWT-Console (Preview, use at your own risk)</description> + <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console.war&quot; + targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/" unpack="false" override="true" /> + + <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server.war&quot; + targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="true" override="true" /> + </pack> + </packs> </installation> \ No newline at end of file Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -14,6 +14,17 @@ </field> </panel> <panel order="1"> + <field type="radio" variable="dbSelection"> + <description align="left" txt="Please choose your target database" /> + <spec> + <choice txt="Hypersonic" value="hsqldb" set="true" /> + <choice txt="MySQL" value="mysql" /> + <choice txt="PostgreSQL" value="postgresql" /> + <choice txt="Sybase" value="sybase" /> + </spec> + </field> + </panel> + <panel order="2"> <createForUnselectedPack name="Download JBoss-4.2.2" /> <field type="dir" align="left" variable="installPath"> <spec txt="Install Path:" size="25" set="${jboss.home}" /> Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-11-06 09:26:05 UTC (rev 2766) +++ jbpm3/trunk/pom.xml 2008-11-06 10:17:39 UTC (rev 2767) @@ -51,7 +51,7 @@ <hibernate.version>3.2.6.ga</hibernate.version> <hibernate.annotations.version>3.3.1.GA</hibernate.annotations.version> <hibernate.validator.version>3.0.0.ga</hibernate.validator.version> - <izpack.version>4.0.0</izpack.version> + <izpack.version>4.1.0</izpack.version> <jasper.reports.version>3.0.0</jasper.reports.version> <javax.ejb.version>3.0</javax.ejb.version> <javax.el.version>1.2</javax.el.version>