[jbpm-commits] JBoss JBPM SVN: r5705 - in jbpm3/branches/jbpm-3.2-soa: hudson and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-10-06 02:19:58 -0400 (Tue, 06 Oct 2009)
New Revision: 5705

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-2563] switch to jtds for standalone tests as jconnect does not provide database metadata

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-06 05:21:34 UTC (rev 5704)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.local.qa.xml	2009-10-06 06:19:58 UTC (rev 5705)
@@ -49,10 +49,12 @@
         <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:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+        <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>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+        <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-06 05:21:34 UTC (rev 5704)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.redhat.qa.xml	2009-10-06 06:19:58 UTC (rev 5705)
@@ -49,10 +49,12 @@
         <jdbc.sybase.server>dev77.qa.atl2.redhat.com</jdbc.sybase.server>
         <jdbc.sybase.port>4100</jdbc.sybase.port>
         <jdbc.sybase.database>jbpm3</jdbc.sybase.database>
-        <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+        <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>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+        <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-06 05:21:34 UTC (rev 5704)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml	2009-10-06 06:19:58 UTC (rev 5705)
@@ -80,6 +80,7 @@
   	<db2jcc.version>3.1.57</db2jcc.version>
     <hsqldb.version>1.8.0.7</hsqldb.version>
     <jconnect.version>6.0.5</jconnect.version>
+    <jtds.version>1.2.2</jtds.version>
   	<msjdbc.version>1.2.2828.100</msjdbc.version>
     <mysql.connector.version>5.0.7</mysql.connector.version>
     <ojdbc.version>10.2.0.4</ojdbc.version>
@@ -254,6 +255,11 @@
         <version>${hsqldb.version}</version>
       </dependency>
       <dependency>
+      	<groupId>net.sourceforge.jtds</groupId>
+      	<artifactId>jtds</artifactId>
+      	<version>${jtds.version}</version>
+      </dependency>
+      <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
         <version>${mysql.connector.version}</version>
@@ -562,6 +568,11 @@
       </activation>
       <dependencies>
         <dependency>
+          <groupId>net.sourceforge.jtds</groupId>
+          <artifactId>jtds</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
           <groupId>com.sybase</groupId>
           <artifactId>jconnect</artifactId>
           <version>${jconnect.version}</version>

Modified: jbpm3/branches/jbpm-3.2-soa/profiles.example.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/profiles.example.xml	2009-10-06 05:21:34 UTC (rev 5704)
+++ jbpm3/branches/jbpm-3.2-soa/profiles.example.xml	2009-10-06 06:19:58 UTC (rev 5705)
@@ -56,10 +56,12 @@
         <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:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+        <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>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+        <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>