[jbpm-commits] JBoss JBPM SVN: r4009 - in jbpm4/trunk/modules: distro/src/main/resources/installer and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-02-24 13:03:58 -0500 (Tue, 24 Feb 2009) New Revision: 4009 Added: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml Modified: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml Log: Installer: Added oracle as database choice. Removed postgresql. Make hypersonic the default choice Modified: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-24 18:02:17 UTC (rev 4008) +++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-24 18:03:58 UTC (rev 4009) @@ -82,6 +82,12 @@ <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/> + <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"/> @@ -97,6 +103,9 @@ <condition property="database.is.postgresql" value="true" else="false"> <equals arg1="${database}" arg2="postgresql"/> </condition> + <condition property="database.is.oracle" value="true" else="false"> + <equals arg1="${database}" arg2="oracle"/> + </condition> <condition property="database.is.sybase" value="true" else="false"> <equals arg1="${database}" arg2="sybase"/> </condition> @@ -115,7 +124,8 @@ <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.sybase" value="${database.is.sybase}" /> <filter token="jbpm.target.container" value="${jbpm.target.container}" /> <filter token="jboss.home" value="${jboss.home}" /> <filter token="product.version" value="${product.version}" /> Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 18:02:17 UTC (rev 4008) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 18:03:58 UTC (rev 4009) @@ -80,6 +80,10 @@ <name>dbSelection</name> <value>postgresql</value> </condition> + <condition type="variable" id="isOracle"> + <name>dbSelection</name> + <value>oracle</value> + </condition> <condition type="variable" id="isSybase"> <name>dbSelection</name> <value>sybase</value> @@ -278,6 +282,11 @@ <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" /> + <!-- NOTE: oracle driver needs to be provided manually --> <!-- ============================== Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-24 18:02:17 UTC (rev 4008) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-24 18:03:58 UTC (rev 4009) @@ -25,10 +25,11 @@ <field type="radio" variable="dbSelection"> <description align="left" txt="Select your target database" /> <spec> - <choice txt="Hypersonic" value="hsqldb"/> - <choice txt="MySQL" value="mysql" set="true"/> + <choice txt="Hypersonic" value="hsqldb" set="true"/> + <choice txt="MySQL" value="mysql"/> + <choice txt="Oracle" value="oracle"/> <!-- choice txt="PostgreSQL" value="postgresql"/--> - <choice txt="Sybase" value="sybase"/> + <!--choice txt="Sybase" value="sybase"/--> </spec> </field> </panel> Added: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml 2009-02-24 18:03:58 UTC (rev 4009) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ===================================================================== --> +<!-- --> +<!-- JBoss Server Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<!-- $Id: oracle-xa-ds.xml 77479 2008-08-26 10:33:09Z alex.loubyansky(a)jboss.com $ --> + +<!-- ===================================================================== --> +<!-- ATTENTION: DO NOT FORGET TO SET Pad=true IN transaction-service.xml --> +<!-- ===================================================================== --> + +<datasources> + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + <!-- uncomment to enable interleaving <interleaving/> --> + <isSameRM-override-value>false</isSameRM-override-value> + <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> + <xa-datasource-property name="URL">${jdbc.oracle.url}</xa-datasource-property> + <xa-datasource-property name="User">${jdbc.oracle.username}</xa-datasource-property> + <xa-datasource-property name="Password">${jdbc.oracle.password}</xa-datasource-property> + <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool --> + <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name--> + <!-- Checks the Oracle error codes and messages for fatal errors --> + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> + <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa --> + <no-tx-separate-pools/> + + <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) --> + <metadata> + <type-mapping>Oracle9i</type-mapping> + </metadata> + </xa-datasource> + + <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" + name="jboss.jca:service=OracleXAExceptionFormatter"> + <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> + </mbean> + +</datasources>