[jbpm-commits] JBoss JBPM SVN: r5085 - in jbpm3/branches/jbpm-3.2-soa: hudson and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jun 23 01:26:15 EDT 2009


Author: alex.guizar at jboss.com
Date: 2009-06-23 01:26:15 -0400 (Tue, 23 Jun 2009)
New Revision: 5085

Added:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-db2-ds.xml
Modified:
   jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml
   jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml
   jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa
   jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa
   jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
   jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml
   jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-1357: Add QA for db2 (CODING IN PROGRESS)
Provide connection properties, data source, maven profiles for DB2

Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml	2009-06-23 05:26:15 UTC (rev 5085)
@@ -41,8 +41,10 @@
     <axis>
       <name>database</name>
       <values>
+        <string>postgresql</string>
         <string>sybase</string>
         <string>oracle</string>
+        <string>db2</string>
       </values>
     </axis>
     <axis>

Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml	2009-06-23 05:26:15 UTC (rev 5085)
@@ -45,13 +45,13 @@
         <string>postgresql</string>
         <string>sybase</string>
         <string>oracle</string>
+        <string>db2</string>
       </values>
     </axis>
     <axis>
       <name>jdk</name>
       <values>
         <string>jdk1.4</string>
-        <string>jdk1.5</string>
       </values>
     </axis>
   </axes>

Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.local.qa	2009-06-23 05:26:15 UTC (rev 5085)
@@ -4,12 +4,10 @@
 
     <!-- This profile can also be defined in ~/.m2/settings.xml -->   
     <profile>
-      <id>jboss-home-profile</id>
+      <id>local</id>
 
       <activation>
-        <property>
-          <name>user.name</name>
-        </property>
+        <activeByDefault>true</activeByDefault>
       </activation>
 
       <properties>
@@ -20,7 +18,7 @@
         <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
         <jdbc.mysql.password></jdbc.mysql.password>
 
-        <jdbc.sybase.server>192.168.0.101</jdbc.sybase.server>
+        <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>

Modified: jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/profiles.xml.redhat.qa	2009-06-23 05:26:15 UTC (rev 5085)
@@ -4,12 +4,10 @@
 
     <!-- This profile can also be defined in ~/.m2/settings.xml -->   
     <profile>
-      <id>jboss-home-profile</id>
+      <id>redhat</id>
 
       <activation>
-        <property>
-          <name>user.name</name>
-        </property>
+        <activeByDefault>true</activeByDefault>
       </activation>
 
       <properties>
@@ -42,6 +40,13 @@
         <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url>
         <jdbc.oracle.username>jbpm3</jdbc.oracle.username>
         <jdbc.oracle.password>jbpm3</jdbc.oracle.password>
+
+        <jdbc.db2.server>dev67.qa.atl.jboss.com</jdbc.db2.server>
+        <jdbc.db2.port>50000</jdbc.db2.port>
+        <jdbc.db2.database>jbossqa</jdbc.db2.database>
+        <jdbc.db2.url>jdbc:db2://${jdbc.db2.server}:${jdbc.db2.port}/${jdbc.db2.database}</jdbc.db2.url>
+        <jdbc.db2.username>jbpm3</jdbc.db2.username>
+        <jdbc.db2.password>jbpm3</jdbc.db2.password>
       </properties>
     </profile>
 

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml	2009-06-23 05:26:15 UTC (rev 5085)
@@ -348,5 +348,26 @@
       </build>
     </profile>
 
+    <!-- 
+    Name:  db2
+    Descr: DB2 Database Setup   
+    -->
+    <profile>
+    	<id>db2</id>
+    	<activation>
+    		<property>
+    			<name>database</name>
+    			<value>db2</value>
+    		</property>
+    	</activation>
+    	<build>
+    		<plugins>
+    			<plugin>
+    				<artifactId>maven-surefire-plugin</artifactId>
+    			</plugin>
+    		</plugins>
+    	</build>
+    </profile>
+
   </profiles>
 </project>

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-jbpm-config.xml	2009-06-23 05:26:15 UTC (rev 5085)
@@ -90,18 +90,16 @@
     <macro-database-cfg database="mckoi" />
     <macro-database-cfg database="mssql" />
     <macro-database-cfg database="mysql"/>
+    <macro-database-cfg database="oracle" />
     <macro-database-cfg database="postgresql"/>
     <macro-database-cfg database="sapdb" />
     <macro-database-cfg database="sybase"/>
-    <macro-database-cfg database="oracle" />
-    <macro-database-cfg database="postgresql" />
     
     <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
     <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
   	
   	<loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/>
     <echo message="${hibernate.properties.xml}"/>
-    <echo/>
   </target>
  
   <!-- Generate the custom jbpm.cfg.xml for the SOA platform -->	

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.properties.db2.xml	2009-06-23 05:26:15 UTC (rev 5085)
@@ -3,10 +3,9 @@
     <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property>
 
     <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://www-128.ibm.com/developerworks/db2/downloads/jcc -->
     <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property>
-    <property name="hibernate.connection.url">jdbc:db2://localhost:50000/testing</property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
+    <property name="hibernate.connection.url">${jdbc.db2.url}</property>
+    <property name="hibernate.connection.username">${jdbc.db2.username}</property>
+    <property name="hibernate.connection.password">${jdbc.db2.password}</property>
     <!-- JDBC connection properties (end) -->
 

Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-db2-ds.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-db2-ds.xml	                        (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/jbpm-db2-ds.xml	2009-06-23 05:26:15 UTC (rev 5085)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+  <xa-datasource>
+    <jndi-name>JbpmDS</jndi-name>
+
+    <xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
+    <xa-datasource-property name="ServerName">${jdbc.db2.server}</xa-datasource-property>
+    <xa-datasource-property name="PortNumber">${jdbc.db2.port}</xa-datasource-property>
+    <xa-datasource-property name="DatabaseName">${jdbc.db2.database}</xa-datasource-property>
+    <user-name>${jdbc.db2.username}</user-name>
+    <password>${jdbc.db2.password}</password>
+
+    <!-- Must be set if using multiple DB2 XA resources in same transaction -->
+    <isSameRM-override-value>false</isSameRM-override-value>
+
+    <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml -->
+    <metadata>
+      <type-mapping>DB2</type-mapping>
+    </metadata>
+  </xa-datasource>
+</datasources>
\ No newline at end of file

Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml	2009-06-22 18:02:22 UTC (rev 5084)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml	2009-06-23 05:26:15 UTC (rev 5085)
@@ -82,7 +82,8 @@
     <jtds.version>1.2.2</jtds.version>
     <jconnect.version>6.0.5</jconnect.version>
     <ojdbc.version>10.2.0.4</ojdbc.version>
-  </properties>
+  	<db2jcc.version>3.1.57</db2jcc.version>
+	</properties>
 
   <!-- DependencyManagement -->
   <dependencyManagement>
@@ -447,7 +448,7 @@
 
     <!--
     Name:  postgresql
-    Descr: MySQL Database Setup
+    Descr: PostgreSQL Database Setup
     -->
     <profile>
       <id>postgresql</id>
@@ -494,5 +495,39 @@
       </repositories>
     </profile>
 
+    <!--
+    Name:  db2
+    Descr: DB2 Database Setup
+    -->
+    <profile>
+      <id>db2</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>db2</value>
+        </property>
+      </activation>
+      <repositories>
+        <repository>
+          <id>qa.jboss.com</id>
+          <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+        </repository>
+      </repositories>
+      <dependencies>
+        <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>
+    </profile>
+
   </profiles>
 </project>




More information about the jbpm-commits mailing list