[jbpm-commits] JBoss JBPM SVN: r4348 - in jbpm3/branches/jbpm-3.2.5.SP: hudson/hudson-home and 9 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sun Mar 29 12:29:31 EDT 2009


Author: alex.guizar at jboss.com
Date: 2009-03-29 12:29:30 -0400 (Sun, 29 Mar 2009)
New Revision: 4348

Added:
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-oracle-ds.xml
Modified:
   jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh
   jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml
   jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.oracle.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/antrun-installer.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml
   jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml
   jbpm3/branches/jbpm-3.2.5.SP/pom.xml
Log:
JBPM-1367: add qa for oracle

Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/command.sh	2009-03-29 16:29:30 UTC (rev 4348)
@@ -12,15 +12,15 @@
 case "$CONTAINER" in
   jboss422*)
     JBOSS_BUILD=jboss-4.2.2.GA
-  ;;
+    ;;
 
   jboss423*)
     JBOSS_BUILD=jboss-4.2.3.GA
-  ;;
+    ;;
 
   jboss500*)
     JBOSS_BUILD=jboss-5.0.0.GA
-  ;;
+    ;;
 esac
 
 #
@@ -44,7 +44,7 @@
 fi
 
 #
-# build the tests
+# Build the tests
 #
 MVN_CMD="mvn -o $ENVIRONMENT process-test-classes"
 echo $MVN_CMD; $MVN_CMD 2>&1; MVN_STATUS=$?
@@ -67,16 +67,22 @@
 cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml
 cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml
 
-# FIXME: find out whether jTDS can be made to work with XA data source
-# https://jira.jboss.org/jira/browse/JBPM-1818
+# Install Sybase JDBC driver manually, as the distribution cannot contain it
 SYBASE_JDBC_DRIVER=~/.m2/repository/com/sybase/jconnect/6.0.5/jconnect-6.0.5.jar
 if [ -f $SYBASE_JDBC_DRIVER ]; then
   echo "cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar"
   cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar
 fi
 
+# Install Oracle JDBC driver manually, as the distribution cannot contain it
+ORACLE_JDBC_DRIVER=~/.m2/repository/com/oracle/ojdbc14/10.2.0.4/ojdbc14-10.2.0.4.jar
+if [ -f $ORACLE_JDBC_DRIVER ]; then
+  echo "cp $ORACLE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar"
+  cp $ORACLE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar
+fi
+
 #
-# start jbossas
+# Start JBoss AS
 #
 $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
 
@@ -89,13 +95,13 @@
 fi
 
 #
-# log dependency tree
+# Log dependency tree
 #
 MVN_CMD="mvn -o $ENVIRONMENT dependency:tree"
 echo $MVN_CMD; $MVN_CMD | tee $WORKSPACE/dependency-tree.txt
 
 #
-# execute tests
+# Execute tests
 #
 MVN_CMD="mvn -o -fae $ENVIRONMENT test"
 echo $MVN_CMD; $MVN_CMD 2>&1 | tee $WORKSPACE/tests.log
@@ -103,7 +109,7 @@
 cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
 
 #
-# stop jbossas
+# Stop JBoss AS
 #
 $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
 cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log

Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -41,8 +41,8 @@
     <axis>
       <name>database</name>
       <values>
-        <string>postgresql</string>
         <string>sybase</string>
+        <string>oracle</string>
       </values>
     </axis>
     <axis>

Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -44,6 +44,7 @@
         <string>mysql</string>
         <string>postgresql</string>
         <string>sybase</string>
+        <string>oracle</string>
       </values>
     </axis>
     <axis>

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/pom.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -198,28 +198,28 @@
       <id>soa</id>
       <build>
         <plugins>
-            <plugin>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <executions>
-                <execution>
-                  <phase>process-resources</phase>
-                  <goals>
-                    <goal>run</goal>
-                  </goals>
-                  <configuration>
-                    <tasks>
-                      <property name="database" value="${database}" />
-                      <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
-                      <ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" />
-                    </tasks>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>          
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <property name="database" value="${database}" />
+                    <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
+                    <ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" />
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
-    
+
     <!-- 
     Name:  no-database
     Descr: Setup the default database   
@@ -323,5 +323,27 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- 
+    Name:  oracle
+    Descr: Oracle Database Setup   
+    -->
+    <profile>
+      <id>oracle</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>oracle</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
   </profiles>
 </project>

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.oracle.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.oracle.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/hibernate.properties.oracle.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -1,12 +1,10 @@
 
     <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
+    <property name="hibernate.dialect">org.hibernate.dialect.Oracle10gDialect</property>
 
     <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://www.oracle.com -->
     <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
     <property name="hibernate.connection.url">${jdbc.oracle.url}</property>
     <property name="hibernate.connection.username">${jdbc.oracle.username}</property>
     <property name="hibernate.connection.password">${jdbc.oracle.password}</property>
     <!-- JDBC connection properties (end) -->
-

Added: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-oracle-ds.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-oracle-ds.xml	                        (rev 0)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-oracle-ds.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+  <xa-datasource>
+    <jndi-name>JbpmDS</jndi-name>
+
+    <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
+    <xa-datasource-property name="ServerName">${jdbc.oracle.server}</xa-datasource-property>
+    <xa-datasource-property name="PortNumber">${jdbc.oracle.port}</xa-datasource-property>
+    <xa-datasource-property name="DatabaseName">${jdbc.oracle.database}</xa-datasource-property>
+    <user-name>${jdbc.oracle.username}</user-name>
+    <password>${jdbc.oracle.password}</password>
+
+    <!-- separate connections used inside and outside a JTA transaction -->
+    <no-tx-separate-pools />
+    <!-- disable transaction interleaving -->
+    <track-connection-by-tx />
+
+    <isSameRM-override-value>false</isSameRM-override-value>
+
+    <!-- check oracle error codes and messages for fatal errors -->
+    <exception-sorter-class-name>
+      org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter
+    </exception-sorter-class-name>
+    <!-- use pingDatabase method to check a connection is still valid -->
+    <valid-connection-checker-class-name>
+      org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker
+    </valid-connection-checker-class-name>
+
+    <!-- corresponding type-mapping in standardjbosscmp-jdbc.xml -->
+    <metadata>
+      <type-mapping>Oracle9i</type-mapping>
+    </metadata>
+  </xa-datasource>
+
+  <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" 
+         name="jboss.jca:service=OracleXAExceptionFormatter">
+    <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
+  </mbean>
+</datasources>
\ No newline at end of file

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/db/pom.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -69,11 +69,6 @@
     	<artifactId>postgresql</artifactId>
     	<scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 
   <!-- Plugins -->

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/pom.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -176,10 +176,6 @@
       <groupId>postgresql</groupId>
       <artifactId>postgresql</artifactId>
     </dependency>
-    <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-    </dependency>
   </dependencies>
 
   <!-- Plugins -->

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/antrun-installer.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/scripts/antrun-installer.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -88,6 +88,12 @@
     <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/>
     <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/>
 
+    <property name="oracle.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml"/>
+    <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties"/>
+    <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation"/>
+    <macro-enable file="${oracle.cfg.xml}" section="DataSource properties"/>
+    <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties"/>
+
     <condition property="database.is.hsqldb" value="true" else="false">
       <equals arg1="${database}" arg2="hsqldb"/>
     </condition>
@@ -100,6 +106,9 @@
     <condition property="database.is.sybase" value="true" else="false">
       <equals arg1="${database}" arg2="sybase"/>
     </condition>
+    <condition property="database.is.oracle" value="true" else="false">
+      <equals arg1="${database}" arg2="oracle"/>
+    </condition>
 
   </target>
 
@@ -116,6 +125,7 @@
         <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="database.is.oracle" value="${database.is.oracle}" />
         <filter token="jbpm.target.container" value="${jbpm.target.container}" />
         <filter token="jboss.home" value="${jboss.home}" />
         <filter token="product.version" value="${product.version}" />

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/install-definition.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -83,6 +83,10 @@
       <name>dbSelection</name>
       <value>sybase</value>
     </condition>
+    <condition type="variable" id="isOracle">
+      <name>dbSelection</name>
+      <value>oracle</value>
+    </condition>
   </conditions>
 
   <!-- Panels -->
@@ -230,13 +234,15 @@
         <include name="hibernate.cfg.mysql.xml"/>
         <include name="hibernate.cfg.postgresql.xml"/>
         <include name="hibernate.cfg.sybase.xml"/>
+        <include name="hibernate.cfg.oracle.xml"/>
         <include name="jbpm-hsqldb-ds.xml"/>
         <include name="jbpm-mysql-ds.xml"/>
         <include name="jbpm-postgresql-ds.xml"/>
         <include name="jbpm-sybase-ds.xml"/>
+        <include name="jbpm-oracle-ds.xml"/>
       </fileset>
       
-      <!-- Database Hypsersonic -->
+      <!-- Database Hypersonic -->
       <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
       <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" 
         target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
@@ -264,9 +270,11 @@
       <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase"/>
       <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml" condition="isSybase" 
         target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
-      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isSybase">
-        <include name="jtds.jar" />
-      </fileset>
+
+      <!-- Database Oracle -->
+      <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isOracle"/>
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml" condition="isOracle" 
+        target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
     </pack>
 
     <!-- 

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/distribution/src/main/resources/installer/user-input-spec.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -18,10 +18,11 @@
     <field type="radio" variable="dbSelection">
       <description align="left" txt="Please choose your target database" />
       <spec>
-        <choice txt="Hypersonic" value="hsqldb"/>
-        <choice txt="MySQL" value="mysql" set="true"/>
+        <choice txt="Hypersonic" value="hsqldb" set="true"/>
+        <choice txt="MySQL" value="mysql"/>
         <choice txt="PostgreSQL" value="postgresql"/>
         <choice txt="Sybase" value="sybase"/>
+        <choice txt="Oracle" value="oracle"/>
       </spec>
     </field>
   </panel>

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/enterprise/pom.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-  <!-- ====================================================================== -->
-  <!--                                                                        -->
-  <!--  JBoss, the OpenSource J2EE webOS                                      -->
-  <!--                                                                        -->
-  <!--  Distributable under LGPL license.                                     -->
-  <!--  See terms of license at http://www.gnu.org.                           -->
-  <!--                                                                        -->
-  <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
 
-  <!-- $Id$ -->
+<!-- $Id$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -30,7 +31,7 @@
   <properties>
     <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
   </properties>
-  
+
   <!-- Dependencies -->
   <dependencies>
     <!-- jBPM Dependencies -->
@@ -210,7 +211,7 @@
         </plugins>
       </build>
     </profile>
-    
+
     <!-- 
     Name:  no-database
     Descr: Setup the default database   
@@ -335,5 +336,29 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- 
+    Name:  oracle
+    Descr: Oracle Database Setup   
+    -->
+    <profile>
+      <id>oracle</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>oracle</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+      </dependencies>
+    </profile>
+
   </profiles>
 </project>

Modified: jbpm3/branches/jbpm-3.2.5.SP/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/pom.xml	2009-03-29 11:04:09 UTC (rev 4347)
+++ jbpm3/branches/jbpm-3.2.5.SP/pom.xml	2009-03-29 16:29:30 UTC (rev 4348)
@@ -10,7 +10,9 @@
 <!-- ====================================================================== -->
 
 <!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler at jboss.com $ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <name>JBoss jBPM3</name>
   <groupId>org.jbpm.jbpm3</groupId>
@@ -33,7 +35,7 @@
     <module>modules/examples</module>
     <module>modules/simulation</module>
 
-    <!--  Execute as part of -Pdistro 
+    <!-- Execute as part of -Pdistro
     <module>modules/db</module>
     <module>modules/userguide</module>
     -->
@@ -88,6 +90,8 @@
     <mysql.connector.version>5.0.7</mysql.connector.version>
     <postgresql.version>8.2-504.jdbc3</postgresql.version>
     <jtds.version>1.2.2</jtds.version>
+    <jconnect.version>6.0.5</jconnect.version>
+    <ojdbc.version>10.2.0.4</ojdbc.version>
   </properties>
 
   <!-- DependencyManagement -->
@@ -123,7 +127,7 @@
       <!-- BPM Spec Dependencies-->
       <dependency>
         <groupId>org.jboss.bpm</groupId>
-       <artifactId>bpm-spec-api</artifactId>
+        <artifactId>bpm-spec-api</artifactId>
         <version>${bpm.spec.version}</version>
       </dependency>
 
@@ -382,11 +386,6 @@
         <artifactId>postgresql</artifactId>
         <version>${postgresql.version}</version>
       </dependency>
-      <dependency>
-        <groupId>net.sourceforge.jtds</groupId>
-        <artifactId>jtds</artifactId>
-        <version>${jtds.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -556,7 +555,7 @@
         <dependency>
           <groupId>com.oracle</groupId>
           <artifactId>ojdbc14</artifactId>
-          <version>10.0.2.0</version>
+          <version>${ojdbc.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -567,7 +566,7 @@
         </repository>
       </repositories>
     </profile>
-    
+
     <!--
     Name:  postgresql
     Descr: MySQL Database Setup
@@ -605,7 +604,7 @@
         <dependency>
           <groupId>com.sybase</groupId>
           <artifactId>jconnect</artifactId>
-          <version>6.0.5</version>
+          <version>${jconnect.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -616,6 +615,6 @@
         </repository>
       </repositories>
     </profile>
-    
+
   </profiles>
 </project>




More information about the jbpm-commits mailing list