8:18 p.m.
Author: jeff.yuchang
Date: 2010-09-28 21:18:09 -0400 (Tue, 28 Sep 2010)
New Revision: 995
Added:
trunk/qa/jdbc/db2.properties
Modified:
trunk/distribution/src/main/release/db/build.xml
trunk/distribution/src/main/release/install/build.xml
trunk/integration-tests/build.xml
trunk/qa/build.xml
Log:
* added db2 integartion script for hudson job.
Modified: trunk/distribution/src/main/release/db/build.xml
===================================================================
--- trunk/distribution/src/main/release/db/build.xml 2010-09-29 01:01:41 UTC (rev 994)
+++ trunk/distribution/src/main/release/db/build.xml 2010-09-29 01:18:09 UTC (rev 995)
@@ -11,6 +11,10 @@
<available file="${basedir}/../../libs/ojdbc14.jar" />
</condition>
+ <condition property="is.db2jdbc.available">
+ <available file="${basedir}/../../libs/db2jcc.jar" />
+ </condition>
+
<condition property="show.table.sql" value="show tables;">
<equals arg1="${database}" arg2="mysql" />
</condition>
@@ -27,6 +31,10 @@
<equals arg1="${database}" arg2="sqlserver" />
</condition>
+ <condition property="show.table.sql" value="select tabname from
SYSCAT.TABLES WHERE TABSCHEMA='RIFTSAW' ">
+ <equals arg1="${database}" arg2="db2" />
+ </condition>
+
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
<echo message="database....... ${database}" />
@@ -39,6 +47,10 @@
<copy file="${basedir}/../../libs/ojdbc14.jar"
todir="${basedir}/drivers"/>
</target>
+ <target name="copy.db2jdbc" if="is.db2jdbc.available">
+ <copy file="${basedir}/../../libs/db2jcc.jar"
todir="${basedir}/drivers"/>
+ </target>
+
<!-- ### CREATE RiftSaw SCHEMA ############################################# -->
<target name="create.riftsaw.schema"
depends="log.properties, copy.ojdbc"
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-09-29 01:01:41 UTC (rev
994)
+++ trunk/distribution/src/main/release/install/build.xml 2010-09-29 01:18:09 UTC (rev
995)
@@ -188,6 +188,13 @@
todir="${deploy.dir}/${bpel-runtime}/lib" />
</target>
+ <target name="internal.install.riftsaw.into.jboss.db.db2">
+ <available file="../db/drivers/db2jcc.jar"
property="db2.driver.jar.available" />
+ <fail message="please download the db2 driver jar, rename it to db2jcc.jar
and put it in the db/drivers directory" unless="db2.driver.jar.available"
/>
+ <copy file="../db/drivers/db2jcc.jar"
+ todir="${deploy.dir}/${bpel-runtime}/lib" />
+ </target>
+
<!-- uninstall database specific driver -->
<target name="internal.uninstall.riftsaw.into.jboss.db.hsql" />
@@ -204,6 +211,8 @@
<target name="internal.uninstall.riftsaw.into.jboss.db.oracle"/>
+ <target name="internal.uninstall.riftsaw.into.jboss.db.db2" />
+
<target name="internal.install.riftsaw.ws.stack"
unless="keep.ws.stack">
<echo>Replacing the Web Service Stack to
${ws.stack}-${ws.version}</echo>
<antcall target="get.ws.stack" />
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2010-09-29 01:01:41 UTC (rev 994)
+++ trunk/integration-tests/build.xml 2010-09-29 01:18:09 UTC (rev 995)
@@ -14,6 +14,10 @@
<condition property="is.ojdbc.available">
<available file="${basedir}/../distribution/target/libs/ojdbc14.jar"
/>
</condition>
+
+ <condition property="is.db2driver.available">
+ <available file="${basedir}/../distribution/target/libs/db2jcc.jar"
/>
+ </condition>
<condition property="is.replace.qa.jdbc">
<equals arg1="true" arg2="${replace.qa.jdbc}" />
@@ -24,6 +28,11 @@
todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/>
</target>
+ <target name="copy.db2driver" if="is.db2driver.available">
+ <copy file="${basedir}/../distribution/target/libs/db2jcc.jar"
+
todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/>
+ </target>
+
<target name="copy.rosetta.aop">
<copy file="${dependency.rosetta.aop}"
tofile="${basedir}/target/rosetta.aop" />
@@ -43,6 +52,7 @@
<unzip dest="${basedir}/../distribution/target/dist"
src="${basedir}/../distribution/target/riftsaw-${riftsaw.engine.version}.zip"/>
<antcall target="copy.ojdbc" />
+ <antcall target="copy.db2driver" />
</target>
<target name="deploy-riftsaw" >
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2010-09-29 01:01:41 UTC (rev 994)
+++ trunk/qa/build.xml 2010-09-29 01:18:09 UTC (rev 995)
@@ -37,6 +37,8 @@
<property name="org_jboss_as_config" value="default" />
<property name="ojdbc.url"
value="http://www.qa.jboss.com/jdbc-drivers/maven2/com/oracle/ojdbc1...
+ <property name="db2driver.url" value =
"http://www.qa.jboss.com/jdbc-drivers/maven2/com/ibm/db2jcc/3.58.82/db2jcc-3.58.82.jar"
/>
+
<property name="replace.qa.jdbc" value="true" />
<property name="org_jboss_esb_home"
value="${jboss.parent.dir}/jbossesb-${jbossesb.version}" />
@@ -62,7 +64,11 @@
<condition property="is.oracle">
<equals arg1="oracle" arg2="${database}"/>
</condition>
-
+
+ <condition property="is.db2">
+ <equals arg1="db2" arg2="${database}" />
+ </condition>
+
<condition property="is.replace.qa.jdbc">
<equals arg1="true" arg2="${replace.qa.jdbc}" />
</condition>
@@ -100,7 +106,8 @@
</ant>
<antcall target="get.ojdbc" />
-
+ <antcall target="get.db2driver" />
+
</target>
<!-- ### INSTALL RiftSaw into JBossESB
################################################## -->
@@ -127,6 +134,8 @@
<unzip src="${jbossesb.distro.path}" dest="${riftsaw.home}"
/>
<antcall target="get.ojdbc" />
+ <antcall target="get.db2driver" />
+
<antcall target="remove.security.constraints" />
</target>
@@ -153,6 +162,13 @@
<mkdir dir="../distribution/target/libs"/>
<get dest="../distribution/target/libs/ojdbc14.jar"
src="${ojdbc.url}"/>
</target>
+
+ <target name="get.db2driver"
+ if="is.db2"
+ description="Download db2 jdbc driver">
+ <mkdir dir="../distribution/target/libs"/>
+ <get dest="../distribution/target/libs/db2jcc.jar"
src="${db2jdbc.url}"/>
+ </target>
<target name="get.soa-p"
unless="is.soa-p.distro.available"
Added: trunk/qa/jdbc/db2.properties
===================================================================
--- trunk/qa/jdbc/db2.properties (rev 0)
+++ trunk/qa/jdbc/db2.properties 2010-09-29 01:18:09 UTC (rev 995)
@@ -0,0 +1,10 @@
+connection.url=jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa
+driver=com.ibm.db2.jcc.DB2Driver
+username=riftsaw
+password=riftsaw
+dialect=org.hibernate.dialect.DB2Dialect
+connection.url=jdbc:db2://localhost/riftsaw
+driver=com.ibm.db2.jcc.DB2Driver
+username=riftsaw
+password=riftsaw
+dialect=org.hibernate.dialect.DB2Dialect
\ No newline at end of file