[jbpm-commits] JBoss JBPM SVN: r5100 - in jbpm3/branches/jbpm-3.2-soa: modules/distribution/scripts and 1 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-06-24 00:57:29 -0400 (Wed, 24 Jun 2009) New Revision: 5100 Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml Log: JBPM-1357: Add QA for db2 (RESOLVED) Offer DB2 as an option in the installer Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-06-23 20:29:56 UTC (rev 5099) +++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-06-24 04:57:29 UTC (rev 5100) @@ -86,20 +86,27 @@ cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml -# Install Sybase JDBC driver manually, as the distribution cannot contain it +# Install Sybase JDBC driver manually as it is not redistributable SYBASE_JDBC_DRIVER=~/.m2/repository/com/sybase/jconnect/6.0.5/jconnect-6.0.5.jar if [ -f $SYBASE_JDBC_DRIVER ]; then echo "cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar fi -# Install Oracle JDBC driver manually, as the distribution cannot contain it +# Install Oracle JDBC driver manually as it is not redistributable ORACLE_JDBC_DRIVER=~/.m2/repository/com/oracle/ojdbc14/10.2.0.4/ojdbc14-10.2.0.4.jar if [ -f $ORACLE_JDBC_DRIVER ]; then echo "cp $ORACLE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" cp $ORACLE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar fi +# Install DB2 JDBC driver manually as it is not redistributable +DB2_JDBC_DRIVER=~/.m2/repository/com/ibm/db2jcc/3.1.57/db2jcc-3.1.57.jar +if [ -f $DB2_JDBC_DRIVER ]; then + echo "cp $DB2_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" + cp $DB2_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar +fi + # # Start JBoss AS # Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-23 20:29:56 UTC (rev 5099) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-24 04:57:29 UTC (rev 5100) @@ -107,6 +107,13 @@ <macro-enable file="${oracle.cfg.xml}" section="DataSource properties"/> <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties"/> + <property name="db2.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.db2.xml"/> + <macro-disable file="${db2.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${db2.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${db2.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${db2.cfg.xml}" section="JTA transaction properties"/> + + <!-- <condition property="database.is.hsqldb" value="true" else="false"> <equals arg1="${database}" arg2="hsqldb"/> </condition> @@ -122,6 +129,10 @@ <condition property="database.is.oracle" value="true" else="false"> <equals arg1="${database}" arg2="oracle"/> </condition> + <condition property="database.is.db2" value="true" else="false"> + <equals arg1="${database}" arg2="db2"/> + </condition> + --> <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes"> <dirset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources" includes="*"/> @@ -137,11 +148,14 @@ <fileset dir="${resources.dir}/installer" /> <filterset> <filter token="database" value="${database}" /> + <!-- <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> <filter token="database.is.mysql" value="${database.is.mysql}" /> <filter token="database.is.postgresql" value="${database.is.postgresql}" /> <filter token="database.is.sybase" value="${database.is.sybase}" /> <filter token="database.is.oracle" value="${database.is.oracle}" /> + <filter token="database.is.db2" value="${database.is.db2}" /> + --> <filter token="jbpm.target.container" value="${jbpm.target.container}" /> <filter token="jboss.home" value="${jboss.home}" /> <filter token="product.version" value="${product.version}" /> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-23 20:29:56 UTC (rev 5099) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-24 04:57:29 UTC (rev 5100) @@ -59,7 +59,7 @@ <name>jbossSelection</name> <value>jboss501</value> </condition> - + <!-- Target Database Conditions --> <condition type="variable" id="isHypersonic"> <name>dbSelection</name> @@ -81,6 +81,10 @@ <name>dbSelection</name> <value>oracle</value> </condition> + <condition type="variable" id="isDB2"> + <name>dbSelection</name> + <value>db2</value> + </condition> </conditions> <!-- Panels --> @@ -98,15 +102,12 @@ <!-- Packs --> <packs> - + <!-- ******************************** - * * * jBPM Standalone * - * * ******************************** --> - <pack name="jBPM3 Standalone" required="yes" preselected="yes"> <description>The jBPM3 Standalone Components</description> @@ -140,7 +141,6 @@ <!-- jbpm3/lib --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> - <include name="activation.jar" /> <include name="antlr.jar" /> <include name="asm.jar" /> <include name="bsh.jar" /> @@ -169,14 +169,10 @@ <!-- ******************************** - * * * JBoss Integration * - * * ******************************** --> - <pack name="jBPM3 JBoss Integration" required="no" preselected="yes"> - <description>The jBPM3 JBoss Integration</description> <!-- jbpm/jbpm-service.sar --> @@ -184,11 +180,6 @@ <include name="jbpm.cfg.xml" /> <include name="hibernate.extra.hbm.xml" /> </fileset> - <!-- - <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-jpdl.jar" /> <include name="jbpm-identity.jar" /> @@ -200,14 +191,13 @@ <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-enterprise.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" unpack="true" override="true" /> - <!-- jbpm/jbpm-userguide.war --> <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" unpack="true" override="true" /> - + <!-- jbpm-destinations-service --> <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"> <include name="hibernate.cfg.hsqldb.xml"/> @@ -215,13 +205,15 @@ <include name="hibernate.cfg.postgresql.xml"/> <include name="hibernate.cfg.sybase.xml"/> <include name="hibernate.cfg.oracle.xml"/> + <include name="hibernate.cfg.db2.xml"/> <include name="jbpm-hsqldb-ds.xml"/> <include name="jbpm-mysql-ds.xml"/> <include name="jbpm-postgresql-ds.xml"/> <include name="jbpm-sybase-ds.xml"/> <include name="jbpm-oracle-ds.xml"/> + <include name="jbpm-db2-ds.xml"/> </fileset> - + <!-- Database Hypersonic --> <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" @@ -229,7 +221,7 @@ <fileset dir=&quot;(a){resources.dir}/database&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic"> <include name="hypersonic/jbpmDB.*" /> </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" @@ -237,7 +229,7 @@ <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 PostgreSQL --> <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-postgresql-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isPostgreSQL"/> <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.postgresql.xml&quot; condition="isPostgreSQL" @@ -245,7 +237,7 @@ <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isPostgreSQL"> <include name="postgresql.jar" /> </fileset> - + <!-- Database Sybase --> <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase"/> <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml&quot; condition="isSybase" @@ -255,49 +247,30 @@ <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" /> + + <!-- Database DB2 --> + <file src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-db2-ds.xml&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isDB2"/> + <singlefile src=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.db2.xml&quot; condition="isDB2" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> </pack> <!-- ******************************** - * * * JSF Console * - * * ******************************** --> <pack name="JSF-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes"> <description>JSF-Console</description> - <!-- jbpm/jsf-console.war --> <file src=&quot;(a){deploy.artifacts.dir}/lib/jsf-console.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war" unpack="true" override="true" /> - </pack> - + <!-- ******************************** - * * - * GWT Console * - * * - ******************************** - - <pack name="GWT-Console" parent="jBPM3 JBoss Integration" required="no" preselected="yes"> - <description>GWT-Console (Preview, use at your own risk)</description> - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/report-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server-report.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /> - <file src=&quot;(a){deploy.artifacts.dir}/lib/report-engine.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /> - </pack> - --> - - <!-- - ******************************** - * * * Optional Components * - * * ******************************** --> - <pack name="Optional Components" required="no" preselected="no"> <description>Optional jBPM3 Components</description> </pack> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-06-23 20:29:56 UTC (rev 5099) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-spec.xml 2009-06-24 04:57:29 UTC (rev 5100) @@ -23,6 +23,7 @@ <choice txt="PostgreSQL" value="postgresql"/> <choice txt="Sybase" value="sybase"/> <choice txt="Oracle" value="oracle"/> + <choice txt="DB2" value="db2"/> </spec> </field> </panel>