Author: jeff.yuchang
Date: 2009-10-26 07:08:27 -0400 (Mon, 26 Oct 2009)
New Revision: 203
Added:
trunk/distribution/src/main/release/db/datasource/bpel-oracle-ds.xml
trunk/distribution/src/main/release/db/datasource/bpel-postgres-ds.xml
trunk/distribution/src/main/release/db/datasource/bpel-sqlserver-ds.xml
trunk/distribution/src/main/release/db/jdbc/oracle.properties
trunk/distribution/src/main/release/db/jdbc/postgres.properties
trunk/distribution/src/main/release/db/jdbc/sqlserver.properties
Removed:
trunk/distribution/src/main/release/db/hibernate/
Modified:
trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml
trunk/distribution/src/main/release/db/jdbc/derby.properties
trunk/distribution/src/main/release/db/jdbc/hsql.properties
trunk/distribution/src/main/release/db/jdbc/mysql.properties
trunk/distribution/src/main/release/install/build.xml
Log:
* Added the sqlserver, oracle and postgres.
* Consolidated the jdbc/database.properties, remove the hibernate folder.
Modified: trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml
===================================================================
--- trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml 2009-10-26
06:28:09 UTC (rev 202)
+++ trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml 2009-10-26
11:08:27 UTC (rev 203)
@@ -15,7 +15,7 @@
<local-tx-datasource>
<jndi-name>BPELDB</jndi-name>
<connection-url>@connection.url(a)</connection-url>
- <driver-class>com.mysql.jdbc.Driver</driver-class>
+ <driver-class>@driver@</driver-class>
<user-name>@username@</user-name>
<password>@password@</password>
<!--
Added: trunk/distribution/src/main/release/db/datasource/bpel-oracle-ds.xml
===================================================================
--- trunk/distribution/src/main/release/db/datasource/bpel-oracle-ds.xml
(rev 0)
+++ trunk/distribution/src/main/release/db/datasource/bpel-oracle-ds.xml 2009-10-26
11:08:27 UTC (rev 203)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>BPELDB</jndi-name>
+ <connection-url>@connection.url(a)</connection-url>
+ <driver-class>@driver@</driver-class>
+ <user-name>@username@</user-name>
+ <password>@password@</password>
+
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>100</max-pool-size>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional)
-->
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
\ No newline at end of file
Added: trunk/distribution/src/main/release/db/datasource/bpel-postgres-ds.xml
===================================================================
--- trunk/distribution/src/main/release/db/datasource/bpel-postgres-ds.xml
(rev 0)
+++ trunk/distribution/src/main/release/db/datasource/bpel-postgres-ds.xml 2009-10-26
11:08:27 UTC (rev 203)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>BPELDB</jndi-name>
+ <connection-url>@connection.url(a)</connection-url>
+ <driver-class>@driver@</driver-class>
+ <user-name>@username@</user-name>
+ <password>@password@</password>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional)
-->
+ <metadata>
+ <type-mapping>PostgreSQL 8.0</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
\ No newline at end of file
Added: trunk/distribution/src/main/release/db/datasource/bpel-sqlserver-ds.xml
===================================================================
--- trunk/distribution/src/main/release/db/datasource/bpel-sqlserver-ds.xml
(rev 0)
+++ trunk/distribution/src/main/release/db/datasource/bpel-sqlserver-ds.xml 2009-10-26
11:08:27 UTC (rev 203)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>BPELDB</jndi-name>
+ <connection-url>@connection.url(a)</connection-url>
+ <driver-class>@driver@</driver-class>
+ <user-name>@username@</user-name>
+ <password>@password@</password>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional)
-->
+ <metadata>
+ <type-mapping>MS SQLSERVER2000</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+
+</datasources>
\ No newline at end of file
Modified: trunk/distribution/src/main/release/db/jdbc/derby.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/derby.properties 2009-10-26 06:28:09 UTC
(rev 202)
+++ trunk/distribution/src/main/release/db/jdbc/derby.properties 2009-10-26 11:08:27 UTC
(rev 203)
@@ -1,4 +1,5 @@
connection.url=jdbc:derby:${jboss.server.data.dir}${/}derby${/}BPELDB;create=true
driver=org.apache.derby.jdbc.EmbeddedDriver
username=sa
-password=
\ No newline at end of file
+password=
+dialect=org.hibernate.dialect.DerbyDialect
\ No newline at end of file
Modified: trunk/distribution/src/main/release/db/jdbc/hsql.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/hsql.properties 2009-10-26 06:28:09 UTC
(rev 202)
+++ trunk/distribution/src/main/release/db/jdbc/hsql.properties 2009-10-26 11:08:27 UTC
(rev 203)
@@ -2,3 +2,4 @@
driver=org.h2.Driver
username=sa
password=
+dialect=org.hibernate.dialect.H2Dialect
Modified: trunk/distribution/src/main/release/db/jdbc/mysql.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/mysql.properties 2009-10-26 06:28:09 UTC
(rev 202)
+++ trunk/distribution/src/main/release/db/jdbc/mysql.properties 2009-10-26 11:08:27 UTC
(rev 203)
@@ -1,4 +1,5 @@
connection.url=jdbc:mysql://localhost/riftsawdb?autoReconnect=true
driver=com.mysql.jdbc.Driver
username=riftsaw
-password=riftsaw
\ No newline at end of file
+password=riftsaw
+dialect=org.hibernate.dialect.MySQLInnoDBDialect
\ No newline at end of file
Added: trunk/distribution/src/main/release/db/jdbc/oracle.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/oracle.properties
(rev 0)
+++ trunk/distribution/src/main/release/db/jdbc/oracle.properties 2009-10-26 11:08:27 UTC
(rev 203)
@@ -0,0 +1,5 @@
+connection.url=jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa
+driver=oracle.jdbc.driver.OracleDriver
+username=riftsaw
+password=riftsaw
+dialect=org.hibernate.dialect.Oracle9Dialect
\ No newline at end of file
Added: trunk/distribution/src/main/release/db/jdbc/postgres.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/postgres.properties
(rev 0)
+++ trunk/distribution/src/main/release/db/jdbc/postgres.properties 2009-10-26 11:08:27
UTC (rev 203)
@@ -0,0 +1,5 @@
+connection.url=jdbc:postgresql://localhost:5432/riftsaw
+driver=org.postgresql.Driver
+username=riftsaw
+password=riftsaw
+dialect=org.hibernate.dialect.PostgreSQLDialect
\ No newline at end of file
Added: trunk/distribution/src/main/release/db/jdbc/sqlserver.properties
===================================================================
--- trunk/distribution/src/main/release/db/jdbc/sqlserver.properties
(rev 0)
+++ trunk/distribution/src/main/release/db/jdbc/sqlserver.properties 2009-10-26 11:08:27
UTC (rev 203)
@@ -0,0 +1,5 @@
+connection.url=jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/riftsaw
+driver=net.sourceforge.jtds.jdbc.Driver
+username=riftsaw
+password=riftsaw
+dialect=org.hibernate.dialect.SQLServerDialect
\ No newline at end of file
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2009-10-26 06:28:09 UTC (rev
202)
+++ trunk/distribution/src/main/release/install/build.xml 2009-10-26 11:08:27 UTC (rev
203)
@@ -55,7 +55,7 @@
<copy file="../db/bpel.properties"
toFile="${deploy.dir}/${bpel-runtime}/bpel.properties"
overwrite="true">
- <filterset filtersfile="../db/hibernate/${database}.properties"
/>
+ <filterset filtersfile="../db/jdbc/${database}.properties" />
</copy>
<copy file="../db/datasource/bpel-${database}-ds.xml"
@@ -92,8 +92,8 @@
<echo message="Undeploy the BPEL runtime from JBoss ESB server" />
<delete dir="${deployers.dir}/${bpel-deployer}" />
<delete dir="${deploy.dir}/${bpel-runtime}" />
- <delete file="${deploy.dir}/${jbossesb-bpel}" />
-
+ <delete file="${deploy.dir}/${jbossesb-bpel}" />
+
<!--install appropriate db driver-->
<antcall target="internal.uninstall.riftsaw.into.jboss.db.${database}"
/>
@@ -129,7 +129,7 @@
<include name="derby*.jar"/>
</fileset>
</copy>
- </target>
+ </target>
<target name="internal.install.riftsaw.into.jboss.db.mysql">
<copy todir="${deploy.dir}/${bpel-runtime}/lib"
overwrite="true">
@@ -139,14 +139,34 @@
</copy>
</target>
+ <target name="internal.install.riftsaw.into.jboss.db.sqlserver">
+ <copy todir="${deploy.dir}/${bpel-runtime}/lib"
overwrite="true">
+ <fileset dir="../db/drivers">
+ <include name="jtds-*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="internal.install.riftsaw.into.jboss.db.postgres">
+ <copy todir="${deploy.dir}/${bpel-runtime}/lib"
overwrite="true">
+ <fileset dir="../db/drivers">
+ <include name="postgresql-*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- uninstall database specific driver -->
<target name="internal.uninstall.riftsaw.into.jboss.db.hsql" />
<target name="internal.uninstall.riftsaw.into.jboss.db.derby">
<delete file="${server.lib.dir}/derby-10.4.1.3.jar"/>
<delete file="${server.lib.dir}/derbytools-10.4.1.3.jar"/>
- </target>
+ </target>
<target name="internal.uninstall.riftsaw.into.jboss.db.mysql" />
+ <target name="internal.uninstall.riftsaw.into.jboss.db.sqlserver" />
+
+ <target name="internal.uninstall.riftsaw.into.jboss.db.postgres" />
+
</project>