1:58 a.m.
Author: alex.guizar(a)jboss.com
Date: 2009-10-14 02:58:29 -0400 (Wed, 14 Oct 2009)
New Revision: 5740
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml
jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
Log:
[JBPM-2582] Generate database update script correctly
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml 2009-10-14 06:58:14 UTC (rev
5739)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml 2009-10-14 06:58:29 UTC (rev
5740)
@@ -50,11 +50,9 @@
<jdbc.sybase.port>5000</jdbc.sybase.port>
<jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
<jdbc.sybase.url>jdbc:jtds:sybase://${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
- <!-- jconnect.url
jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database} -->
<jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
<jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
<jdbc.sybase.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.sybase.driver>
- <!-- jconnect.driver com.sybase.jdbc3.jdbc.SybDriver -->
<jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
</properties>
</profile>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml 2009-10-14 06:58:14 UTC (rev
5739)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml 2009-10-14 06:58:29 UTC (rev
5740)
@@ -50,11 +50,9 @@
<jdbc.sybase.port>5000</jdbc.sybase.port>
<jdbc.sybase.database>jbpm3</jdbc.sybase.database>
<jdbc.sybase.url>jdbc:jtds:sybase://${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
- <!-- jconnect.url
jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database} -->
<jdbc.sybase.username>jbpm3xa</jdbc.sybase.username>
<jdbc.sybase.password>jbpm3xa</jdbc.sybase.password>
<jdbc.sybase.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.sybase.driver>
- <!-- jconnect.driver com.sybase.jdbc3.jdbc.SybDriver -->
<jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
</properties>
</profile>
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-10-14 06:58:14 UTC (rev 5739)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-10-14 06:58:29 UTC (rev 5740)
@@ -248,8 +248,18 @@
<version>${sun.facelets.version}</version>
</dependency>
- <!-- Database Driver Versions -->
+ <!-- Database Drivers -->
<dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>${db2jcc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>${db2jcc.version}</version>
+ </dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
@@ -260,15 +270,30 @@
<version>${jtds.version}</version>
</dependency>
<dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>msjdbc</artifactId>
+ <version>${msjdbc.version}</version>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc14</artifactId>
+ <version>${ojdbc.version}</version>
+ </dependency>
+ <dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sybase</groupId>
+ <artifactId>jconnect</artifactId>
+ <version>${jconnect.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -424,13 +449,11 @@
<dependency>
<groupId>com.ibm</groupId>
<artifactId>db2jcc</artifactId>
- <version>${db2jcc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.ibm</groupId>
<artifactId>db2jcc_license_cu</artifactId>
- <version>${db2jcc.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -479,7 +502,7 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>msjdbc</artifactId>
- <version>${msjdbc.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
@@ -521,7 +544,6 @@
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc14</artifactId>
- <version>${ojdbc.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -575,7 +597,6 @@
<dependency>
<groupId>com.sybase</groupId>
<artifactId>jconnect</artifactId>
- <version>${jconnect.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2009-10-14 06:58:14 UTC (rev 5739)
+++ jbpm3/branches/jbpm-3.2-soa/profiles.example.xml 2009-10-14 06:58:29 UTC (rev 5740)
@@ -24,20 +24,23 @@
<jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
<jdbc.db2.username>jbpmtest</jdbc.db2.username>
<jdbc.db2.password>jbpmtest</jdbc.db2.password>
+ <jdbc.db2.driver>com.ibm.db2.jcc.DB2Driver</jdbc.db2.driver>
- <jdbc.mssql.server>localhost</jdbc.mssql.server>
+ <jdbc.mssql.server>dev30.qa.atl.jboss.com</jdbc.mssql.server>
<jdbc.mssql.port>3918</jdbc.mssql.port>
- <jdbc.mssql.database>jbpmtest</jdbc.mssql.database>
+ <jdbc.mssql.database>jbpm</jdbc.mssql.database>
<jdbc.mssql.url>jdbc:sqlserver://${jdbc.mssql.server}:${jdbc.mssql.port};databaseName=${jdbc.mssql.database}</jdbc.mssql.url>
- <jdbc.mssql.username>jbpmtest</jdbc.mssql.username>
- <jdbc.mssql.password>jbpmtest</jdbc.mssql.password>
+ <jdbc.mssql.username>jbpm</jdbc.mssql.username>
+ <jdbc.mssql.password>jbpm</jdbc.mssql.password>
+
<jdbc.mssql.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.mssql.driver>
<jdbc.mysql.server>localhost</jdbc.mysql.server>
<jdbc.mysql.port>3306</jdbc.mysql.port>
<jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
<jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
<jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
- <jdbc.mysql.password></jdbc.mysql.password>
+ <jdbc.mysql.password>jbpmtest</jdbc.mysql.password>
+ <jdbc.mysql.driver>com.mysql.jdbc.Driver</jdbc.mysql.driver>
<jdbc.oracle.server>localhost</jdbc.oracle.server>
<jdbc.oracle.port>1521</jdbc.oracle.port>
@@ -45,23 +48,23 @@
<jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
<jdbc.oracle.username>jbpmtest</jdbc.oracle.username>
<jdbc.oracle.password>jbpmtest</jdbc.oracle.password>
+
<jdbc.oracle.driver>oracle.jdbc.driver.OracleDriver</jdbc.oracle.driver>
<jdbc.postgresql.server>localhost</jdbc.postgresql.server>
<jdbc.postgresql.port>5432</jdbc.postgresql.port>
<jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
<jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
<jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
- <jdbc.postgresql.password></jdbc.postgresql.password>
+ <jdbc.postgresql.password>jbpmtest</jdbc.postgresql.password>
+
<jdbc.postgresql.driver>org.postgresql.Driver</jdbc.postgresql.driver>
<jdbc.sybase.server>localhost</jdbc.sybase.server>
<jdbc.sybase.port>5000</jdbc.sybase.port>
<jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
<jdbc.sybase.url>jdbc:jtds:sybase://${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
- <!-- jconnect.url
jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database} -->
<jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
<jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
<jdbc.sybase.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.sybase.driver>
- <!-- jconnect.driver com.sybase.jdbc3.jdbc.SybDriver -->
<jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
<altDeploymentRepository>repository.jboss.org::default::file:${user.home}/jbpm/repository</altDeploymentRepository>