[jbpm-commits] JBoss JBPM SVN: r2664 - in jbpm3/trunk: modules/distribution and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Oct 29 21:56:59 EDT 2008


Author: alex.guizar at jboss.com
Date: 2008-10-29 21:56:59 -0400 (Wed, 29 Oct 2008)
New Revision: 2664

Added:
   jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml
Removed:
   jbpm3/trunk/.classpath
Modified:
   jbpm3/trunk/modules/distribution/pom.xml
   jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
   jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml
   jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
   jbpm3/trunk/pom.xml
Log:
[JBPM-1802] added sybase database option to installer

Deleted: jbpm3/trunk/.classpath
===================================================================
--- jbpm3/trunk/.classpath	2008-10-29 23:12:03 UTC (rev 2663)
+++ jbpm3/trunk/.classpath	2008-10-30 01:56:59 UTC (rev 2664)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml	2008-10-29 23:12:03 UTC (rev 2663)
+++ jbpm3/trunk/modules/distribution/pom.xml	2008-10-30 01:56:59 UTC (rev 2664)
@@ -158,6 +158,10 @@
       <groupId>postgresql</groupId>
       <artifactId>postgresql</artifactId>
     </dependency>
+    <dependency>
+      <groupId>net.sourceforge.jtds</groupId>
+      <artifactId>jtds</artifactId>
+    </dependency>
   </dependencies>
 
   <!-- Plugins -->

Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml	2008-10-29 23:12:03 UTC (rev 2663)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml	2008-10-30 01:56:59 UTC (rev 2664)
@@ -85,6 +85,12 @@
     <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/>
     <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/>
 
+    <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-core-config/hibernate.cfg.sybase.xml"/>
+    <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/>
+    <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/>
+    <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/>
+    <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/>
+
     <condition property="database.is.hsqldb" value="true" else="false">
       <equals arg1="${database}" arg2="hsqldb"/>
     </condition>
@@ -94,6 +100,9 @@
     <condition property="database.is.postgresql" value="true" else="false">
       <equals arg1="${database}" arg2="postgresql"/>
     </condition>
+    <condition property="database.is.sybase" value="true" else="false">
+      <equals arg1="${database}" arg2="sybase"/>
+    </condition>
 
   </target>
 
@@ -108,6 +117,7 @@
         <filter token="database.is.hsqldb" value="${database.is.hsqldb}" />
         <filter token="database.is.mysql" value="${database.is.mysql}" />
         <filter token="database.is.postgresql" value="${database.is.postgresql}" />
+      	<filter token="database.is.sybase" value="${database.is.sybase}" />
         <filter token="jbpm.target.container" value="${jbpm.target.container}" />
         <filter token="jboss.home" value="${jboss.home}" />
         <filter token="product.version" value="${product.version}" />

Added: jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml	                        (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/database/jbpm-sybase-ds.xml	2008-10-30 01:56:59 UTC (rev 2664)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+
+  <xa-datasource>
+    <jndi-name>JbpmDS</jndi-name>
+
+    <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class>
+    <xa-datasource-property name="ServerName">dev01.qa.atl.jboss.com</xa-datasource-property>
+    <xa-datasource-property name="PortNumber">4100</xa-datasource-property>
+    <xa-datasource-property name="DatabaseName">jbpmteam</xa-datasource-property>
+    <xa-datasource-property name="User">jbpmteam</xa-datasource-property>
+    <xa-datasource-property name="Password">jbpmteam</xa-datasource-property>
+
+    <!-- disable transaction interleaving -->
+    <track-connection-by-tx />
+
+    <exception-sorter-class-name>
+      org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter
+    </exception-sorter-class-name>
+
+    <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml -->
+    <metadata>
+      <type-mapping>Sybase</type-mapping>
+    </metadata>
+  </xa-datasource>
+
+</datasources>

Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml	2008-10-29 23:12:03 UTC (rev 2663)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml	2008-10-30 01:56:59 UTC (rev 2664)
@@ -13,6 +13,7 @@
     <pack name="jBPM3 Hypersonic Database" index="6" selected="@database.is.hsqldb@" />
     <pack name="jBPM3 MySQL Database" index="7" selected="@database.is.mysql@" />
     <pack name="jBPM3 PostgreSQL Database" index="8" selected="@database.is.postgresql@" />
+    <pack name="jBPM3 Sybase Database" index="8" selected="@database.is.sybase@" />
   </com.izforge.izpack.panels.TreePacksPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>

Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2008-10-29 23:12:03 UTC (rev 2663)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2008-10-30 01:56:59 UTC (rev 2664)
@@ -227,6 +227,17 @@
       <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml" target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
     </pack>
 
+    <!-- jBPM Sybase Database -->
+    <pack name="jBPM3 Sybase Database" required="no" parent="jBPM3 Databases" preselected="no">
+      <description>The Sybase Database</description>
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+        override="true">
+        <include name="jtds.jar" />
+      </fileset>
+      <file src="@{resources.dir}/database/jbpm-sybase-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.sybase.xml" target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+    </pack>
+
     <!-- jBPM JMS Destinations -->
     <pack name="jBPM3 JMS Destinations" required="no" preselected="yes">
       <description>The JMS Destinations</description>

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-10-29 23:12:03 UTC (rev 2663)
+++ jbpm3/trunk/pom.xml	2008-10-30 01:56:59 UTC (rev 2664)
@@ -80,6 +80,7 @@
     <hsqldb.version>1.8.0.7</hsqldb.version>
     <mysql.connector.version>5.0.8</mysql.connector.version>
     <postgresql.version>8.3-603.jdbc3</postgresql.version>
+    <jtds.version>1.2.2</jtds.version>
   </properties>
 
   <!-- DependencyManagement -->
@@ -104,7 +105,6 @@
         <type>war</type>
       </dependency>
 
-
       <!-- Thirdparty Dependencies -->
       <dependency>
         <groupId>bsh</groupId>
@@ -354,6 +354,11 @@
         <artifactId>postgresql</artifactId>
         <version>${postgresql.version}</version>
       </dependency>
+      <dependency>
+        <groupId>net.sourceforge.jtds</groupId>
+        <artifactId>jtds</artifactId>
+        <version>${jtds.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -547,17 +552,16 @@
       </activation>
       <dependencies>
         <dependency>
+          <groupId>net.sourceforge.jtds</groupId>
+          <artifactId>jtds</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
           <groupId>com.sybase</groupId>
           <artifactId>jconnect</artifactId>
           <version>6.0.5</version>
           <scope>test</scope>
         </dependency>
-        <dependency>
-        	<groupId>net.sourceforge.jtds</groupId>
-        	<artifactId>jtds</artifactId>
-        	<version>1.2.2</version>
-        	<scope>test</scope>
-        </dependency>
       </dependencies>
       <repositories>
         <repository>




More information about the jbpm-commits mailing list