[jbpm-commits] JBoss JBPM SVN: r4070 - in jbpm4/trunk/modules/config/src/main/config: hibernate/jdbc and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Feb 27 11:29:03 EST 2009
Author: tom.baeyens at jboss.com
Date: 2009-02-27 11:29:03 -0500 (Fri, 27 Feb 2009)
New Revision: 4070
Added:
jbpm4/trunk/modules/config/src/main/config/build.properties
jbpm4/trunk/modules/config/src/main/config/filter.properties
Modified:
jbpm4/trunk/modules/config/src/main/config/build.xml
jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/db2.xml
jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/mysql.xml
jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/oracle.xml
jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/postgresql.xml
jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/sybase.xml
jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml
jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml
jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml
jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml
jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml
Log:
added filtering of config properties
Added: jbpm4/trunk/modules/config/src/main/config/build.properties
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/build.properties (rev 0)
+++ jbpm4/trunk/modules/config/src/main/config/build.properties 2009-02-27 16:29:03 UTC (rev 4070)
@@ -0,0 +1,7 @@
+jbpm.config.dest.dir=../../../target/classes
+jbpm.config.hibernate.cache=hashtable
+jbpm.config.hibernate.connection.type=jdbc
+jbpm.config.hibernate.database=oracle
+ jbpm.config.hibernate.format.sql=include
+ jbpm.config.hibernate.jpdl=include
+jbpm.config.identity=include
Modified: jbpm4/trunk/modules/config/src/main/config/build.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/build.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/build.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -4,16 +4,8 @@
<property file="build.properties" />
- <!-- configurable properties -->
- <property name="jbpm.config.dest.dir" value="../../../target/classes" />
- <property name="jbpm.config.hibernate.cache" value="hashtable" />
- <property name="jbpm.config.hibernate.connection.type" value="jdbc" />
- <property name="jbpm.config.hibernate.database" value="hsqldb.inmemory" />
- <property name="jbpm.config.hibernate.format.sql" value="include" />
- <property name="jbpm.config.hibernate.jpdl" value="include" />
- <property name="jbpm.config.identity" value="include" />
-
<target name="generate" description="generates a full jbpm configuration">
+ <filter filtersfile="filter.properties" />
<antcall target="jbpm.cfg.xml" />
<antcall target="hibernate.mapping.files" />
<condition property="is.identity.included">
Added: jbpm4/trunk/modules/config/src/main/config/filter.properties
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/filter.properties (rev 0)
+++ jbpm4/trunk/modules/config/src/main/config/filter.properties 2009-02-27 16:29:03 UTC (rev 4070)
@@ -0,0 +1,29 @@
+jdbc.mysql.server=localhost
+jdbc.mysql.port=3306
+jdbc.mysql.database=jbpm
+jdbc.mysql.url=jdbc:mysql://localhost:3306/jbpm
+jdbc.mysql.username=jbpm
+jdbc.mysql.password=jbpm
+
+jdbc.postgresql.server=localhost
+jdbc.postgresql.port=5432
+jdbc.postgresql.database=jbpm
+jdbc.postgresql.url=jdbc:postgresql://localhost:5432/jbpm
+jdbc.postgresql.username=jbpm
+jdbc.postgresql.password=jbpm
+
+jdbc.sybase.server=localhost
+jdbc.sybase.port=5000
+jdbc.sybase.database=jbpm
+jdbc.sybase.url=jdbc:sybase:Tds:localhost:5000/jbpm
+jdbc.sybase.username=jbpm
+jdbc.sybase.password=jbpm
+jdbc.sybase.driver=com.sybase.jdbc3.jdbc.SybDriver
+jdbc.sybase.datasource=com.sybase.jdbc3.jdbc.SybXADataSource
+
+jdbc.oracle.server=localhost
+jdbc.oracle.port=1521
+jdbc.oracle.database=XE
+jdbc.oracle.username=jbpm
+jdbc.oracle.password=jbpm
+jdbc.oracle.url=jdbc:oracle:thin:@localhost:1521:XE
Modified: jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/db2.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/db2.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/db2.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -1,5 +1,5 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect" />
<property name="hibernate.connection.driver_class" value="com.ibm.db2.jcc.DB2Driver" />
- <property name="hibernate.connection.url" value="${jdbc.db2.url}" />
- <property name="hibernate.connection.username" value="${jdbc.db2.username}" />
- <property name="hibernate.connection.password" value="${jdbc.db2.password}" />
+ <property name="hibernate.connection.url" value="@jdbc.db2.url@" />
+ <property name="hibernate.connection.username" value="@jdbc.db2.username@" />
+ <property name="hibernate.connection.password" value="@jdbc.db2.password@" />
Modified: jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/mysql.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/mysql.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/mysql.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -1,5 +1,5 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" />
<property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
- <property name="hibernate.connection.url" value="${jdbc.mysql.url}" />
- <property name="hibernate.connection.username" value="${jdbc.mysql.username}" />
- <property name="hibernate.connection.password" value="${jdbc.mysql.password}" />
\ No newline at end of file
+ <property name="hibernate.connection.url" value="@jdbc.mysql.url@" />
+ <property name="hibernate.connection.username" value="@jdbc.mysql.username@" />
+ <property name="hibernate.connection.password" value="@jdbc.mysql.password@" />
\ No newline at end of file
Modified: jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/oracle.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/oracle.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/oracle.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -1,6 +1,6 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.Oracle9Dialect" />
<property name="hibernate.connection.driver_class" value="oracle.jdbc.driver.OracleDriver" />
- <property name="hibernate.connection.url" value="${jdbc.oracle.url}" />
- <property name="hibernate.connection.username" value="${jdbc.oracle.username}" />
- <property name="hibernate.connection.password" value="${jdbc.oracle.password}" />
+ <property name="hibernate.connection.url" value="@jdbc.oracle.url@" />
+ <property name="hibernate.connection.username" value="@jdbc.oracle.username@" />
+ <property name="hibernate.connection.password" value="@jdbc.oracle.password@" />
<property name="hibernate.query.substitutions" value="true 1, false 0" />
Modified: jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/postgresql.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/postgresql.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/postgresql.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -1,5 +1,5 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
<property name="hibernate.connection.driver_class" value="org.postgresql.Driver" />
- <property name="hibernate.connection.url" value="${jdbc.postgresql.url}" />
- <property name="hibernate.connection.username" value="${jdbc.postgresql.username}" />
- <property name="hibernate.connection.password" value="${jdbc.postgresql.password}" />
+ <property name="hibernate.connection.url" value="@jdbc.postgresql.url@" />
+ <property name="hibernate.connection.username" value="@jdbc.postgresql.username@" />
+ <property name="hibernate.connection.password" value="@jdbc.postgresql.password@" />
Modified: jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/sybase.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/sybase.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/hibernate/jdbc/sybase.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -1,5 +1,5 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.SybaseDialect" />
<property name="hibernate.connection.driver_class" value="net.sourceforge.jtds.jdbc.Driver" />
- <property name="hibernate.connection.url" value="${jdbc.sybase.url}" />
- <property name="hibernate.connection.username="${jdbc.sybase.username}" />
- <property name="hibernate.connection.password" value="${jdbc.sybase.password}" />
\ No newline at end of file
+ <property name="hibernate.connection.url" value="@jdbc.sybase.url@" />
+ <property name="hibernate.connection.username="@jdbc.sybase.username@" />
+ <property name="hibernate.connection.password" value="@jdbc.sybase.password@" />
\ No newline at end of file
Modified: jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-hsqldb-ds.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -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>
Modified: jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-mysql-ds.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -5,11 +5,11 @@
<jndi-name>JbpmDS</jndi-name>
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
- <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property>
- <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property>
- <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property>
- <user-name>${jdbc.mysql.username}</user-name>
- <password>${jdbc.mysql.password}</password>
+ <xa-datasource-property name="ServerName">@jdbc.mysql.server@</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">@jdbc.mysql.port@</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">@jdbc.mysql.database@</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>
Modified: jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-oracle-ds.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -18,9 +18,9 @@
<!-- 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>
+ <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 -->
Modified: jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-postgresql-ds.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -5,11 +5,11 @@
<jndi-name>JbpmDS</jndi-name>
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
- <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property>
- <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property>
- <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property>
- <user-name>${jdbc.postgresql.username}</user-name>
- <password>${jdbc.postgresql.password}</password>
+ <xa-datasource-property name="ServerName">@jdbc.postgresql.server@</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">@jdbc.postgresql.port@</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">@jdbc.postgresql.database@</xa-datasource-property>
+ <user-name>@jdbc.postgresql.username@</user-name>
+ <password>@jdbc.postgresql.password@</password>
<!-- disable transaction interleaving -->
<track-connection-by-tx />
Modified: jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml
===================================================================
--- jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml 2009-02-27 15:43:56 UTC (rev 4069)
+++ jbpm4/trunk/modules/config/src/main/config/jboss/datasource/jbpm-sybase-ds.xml 2009-02-27 16:29:03 UTC (rev 4070)
@@ -5,12 +5,12 @@
<xa-datasource>
<jndi-name>JbpmDS</jndi-name>
- <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class>
- <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property>
- <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property>
- <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property>
- <user-name>${jdbc.sybase.username}</user-name>
- <password>${jdbc.sybase.password}</password>
+ <xa-datasource-class>@jdbc.sybase.datasource@</xa-datasource-class>
+ <xa-datasource-property name="ServerName">@jdbc.sybase.server@</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">@jdbc.sybase.port@</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">@jdbc.sybase.database@</xa-datasource-property>
+ <user-name>@jdbc.sybase.username@</user-name>
+ <password>@jdbc.sybase.password@</password>
<!-- disable transaction interleaving -->
<track-connection-by-tx />
More information about the jbpm-commits
mailing list