[jbpm-commits] JBoss JBPM SVN: r2825 - in jbpm3/branches/jbpm-3.3.0.GA: modules/core/src/main/resources and 1 other directories.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-11-08 21:00:45 -0500 (Sat, 08 Nov 2008)
New Revision: 2825

Modified:
   jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml
   jbpm3/branches/jbpm-3.3.0.GA/modules/distribution/src/main/resources/installer/user-input-spec.xml
   jbpm3/branches/jbpm-3.3.0.GA/pom.xml
Log:
Add sybase support to installer

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml	2008-11-09 00:49:25 UTC (rev 2824)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml	2008-11-09 02:00:45 UTC (rev 2825)
@@ -5,7 +5,7 @@
   <xa-datasource>
     <jndi-name>JbpmDS</jndi-name>
 
-    <xa-datasource-class>${jdbc.sybase.driver}</xa-datasource-class>
+    <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</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>

Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/modules/distribution/src/main/resources/installer/user-input-spec.xml	2008-11-09 00:49:25 UTC (rev 2824)
+++ jbpm3/branches/jbpm-3.3.0.GA/modules/distribution/src/main/resources/installer/user-input-spec.xml	2008-11-09 02:00:45 UTC (rev 2825)
@@ -17,10 +17,10 @@
     <field type="radio" variable="dbSelection">
       <description align="left" txt="Please choose your target database" />
       <spec>
-        <choice txt="Hypersonic" value="hsqldb" set="true" />
-        <choice txt="MySQL" value="mysql" />
-        <!-- choice txt="PostgreSQL" value="postgresql" /-->
-        <!-- choice txt="Sybase" value="sybase" /-->
+        <choice txt="Hypersonic" value="hsqldb" set="true"/>
+        <choice txt="MySQL" value="mysql"/>
+        <!-- choice txt="PostgreSQL" value="postgresql"/-->
+        <choice txt="Sybase" value="sybase"/>
       </spec>
     </field>
   </panel>

Modified: jbpm3/branches/jbpm-3.3.0.GA/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.3.0.GA/pom.xml	2008-11-09 00:49:25 UTC (rev 2824)
+++ jbpm3/branches/jbpm-3.3.0.GA/pom.xml	2008-11-09 02:00:45 UTC (rev 2825)
@@ -82,6 +82,7 @@
     <mysql.connector.version>5.0.8</mysql.connector.version>
     <postgresql.version>8.3-603.jdbc3</postgresql.version>
     <jtds.version>1.2.2</jtds.version>
+    <jconnect.version>6.0.5</jconnect.version>
   </properties>
 
   <!-- DependencyManagement -->
@@ -372,6 +373,16 @@
         <artifactId>jtds</artifactId>
         <version>${jtds.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.sybase</groupId>
+        <artifactId>jconnect</artifactId>
+        <version>${jconnect.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sourceforge.jtds</groupId>
+        <artifactId>jtds</artifactId>
+        <version>${jtds.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -579,16 +590,17 @@
       </properties>
       <dependencies>
         <dependency>
-          <groupId>com.sybase</groupId>
-          <artifactId>jconnect</artifactId>
-          <version>6.0.5</version>
+          <groupId>net.sourceforge.jtds</groupId>
+          <artifactId>jtds</artifactId>
           <scope>test</scope>
         </dependency>
+        <!-- 
         <dependency>
-          <groupId>net.sourceforge.jtds</groupId>
-          <artifactId>jtds</artifactId>
+          <groupId>com.sybase</groupId>
+          <artifactId>jconnect</artifactId>
           <scope>test</scope>
         </dependency>
+        -->
       </dependencies>
       <repositories>
         <repository>