[jbpm-commits] JBoss JBPM SVN: r4697 - in jbpm4/trunk: modules/distro/src/main/files/jboss and 1 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-05-02 15:35:04 -0400 (Sat, 02 May 2009)
New Revision: 4697

Modified:
   jbpm4/trunk/modules/distro/pom.xml
   jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
   jbpm4/trunk/qa/build.xml
Log:
added installation of the oracle lib during integration test suite

Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml	2009-05-02 17:21:18 UTC (rev 4696)
+++ jbpm4/trunk/modules/distro/pom.xml	2009-05-02 19:35:04 UTC (rev 4697)
@@ -142,6 +142,7 @@
   <build>
     <finalName>jbpm-${project.version}</finalName>
     <plugins>
+    
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-3</version>
@@ -182,6 +183,31 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>get.oracle.driver.lib</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.oracle</groupId>
+                  <artifactId>ojdbc14</artifactId>
+                  <version>${oracle.version}</version>
+                  <destFileName>ojdbc14.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>target/oracle</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-05-02 17:21:18 UTC (rev 4696)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-05-02 19:35:04 UTC (rev 4697)
@@ -169,8 +169,12 @@
   </target>
 
   <!-- ### THE ORACLE SPECIFIC PART ####################################### -->
-  <target name="internal.install.jbpm.into.jboss.db.oracle" />
-
+  <target name="internal.install.jbpm.into.jboss.db.oracle">
+  	<available file="${jbpm.home}/lib/ojdbc14.jar" property="oracle.driver.jar.available" />
+  	<fail message="please download the oracle driver jar ojdbc14.jar from oracle and put it in the ${jbpm.home}/lib directory" unless="oracle.driver.jar.available" />
+    <copy file="${jbpm.home}/lib/ojdbc14.jar" 
+    	    todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
+  </target>
 	
   <!-- ### START JBOSS ################################################### -->
   <target name="start.jboss" depends="log.properties" description="starts jboss and waits till jboss is booted, then lets jboss run in the background">

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-05-02 17:21:18 UTC (rev 4696)
+++ jbpm4/trunk/qa/build.xml	2009-05-02 19:35:04 UTC (rev 4697)
@@ -39,20 +39,27 @@
 
   <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" />
 
-	<target name="integration.testrun.setup" depends="log.properties">
-		<antcall target="reinstall.jbpm" />
+	<target name="integration.testrun.setup" depends="log.properties, reinstall.jbpm, post.install">
+    <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
+    <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" />
+    <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" />
+    <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" />
+	</target>
+	
+	<target name="post.install">
+		<!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory -->
     <copy file="db/${database}.properties" 
           todir="${jbpm.home}/db/jdbc" 
           overwrite="true" 
           failonerror="false" />
+    <!-- overwrite the jdbc properties in the distro with those specified in the user specific properties -->
     <copy file="${user.home}/.jbpm4/db/${database}.properties" 
           todir="${jbpm.home}/db/jdbc" 
           overwrite="true" 
           failonerror="false" />
-    <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
-    <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" />
-    <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" />
-    <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" />
+		<!-- copy the oracle jar as it is not allowed to be part of our distro -->
+    <copy file="../modules/distro/target/oracle/ojdbc14.jar" 
+          todir="${jbpm.home}/lib"/>
 	</target>
 
   <target name="integration.testrun.teardown">