[jbpm-commits] JBoss JBPM SVN: r6878 - in jbpm4/trunk: examples and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-12-20 22:22:34 -0500 (Mon, 20 Dec 2010)
New Revision: 6878

Modified:
   jbpm4/trunk/distro/pom.xml
   jbpm4/trunk/examples/pom.xml
   jbpm4/trunk/test-cfg/pom.xml
   jbpm4/trunk/test-db/pom.xml
Log:
JBPM-2985 restore livetribe (javax.script) dep for jdk5 compatibility, 2nd part;
JBPM-2986 fix relative paths to qa/jdbc/ directory

Modified: jbpm4/trunk/distro/pom.xml
===================================================================
--- jbpm4/trunk/distro/pom.xml	2010-12-20 05:06:54 UTC (rev 6877)
+++ jbpm4/trunk/distro/pom.xml	2010-12-21 03:22:34 UTC (rev 6878)
@@ -128,6 +128,10 @@
       <artifactId>javassist</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.livetribe</groupId>
+      <artifactId>livetribe-jsr223</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.eclipse.birt</groupId>
       <artifactId>report-engine</artifactId>
       <type>zip</type>

Modified: jbpm4/trunk/examples/pom.xml
===================================================================
--- jbpm4/trunk/examples/pom.xml	2010-12-20 05:06:54 UTC (rev 6877)
+++ jbpm4/trunk/examples/pom.xml	2010-12-21 03:22:34 UTC (rev 6878)
@@ -130,7 +130,7 @@
                     <echo message="database: ${database}" />
                     <mkdir dir="target/jdbc.properties" />
                     <copy todir="target/jdbc.properties" overwrite="true">
-                      <fileset dir="../../qa/jdbc" />
+                      <fileset dir="../qa/jdbc" />
                     </copy>
                     <copy todir="target/jdbc.properties" overwrite="true" failonerror="false">
                       <fileset dir="${user.home}/.jbpm4/jdbc" />

Modified: jbpm4/trunk/test-cfg/pom.xml
===================================================================
--- jbpm4/trunk/test-cfg/pom.xml	2010-12-20 05:06:54 UTC (rev 6877)
+++ jbpm4/trunk/test-cfg/pom.xml	2010-12-21 03:22:34 UTC (rev 6878)
@@ -92,4 +92,20 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jdk5</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.livetribe</groupId>
+          <artifactId>livetribe-jsr223</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

Modified: jbpm4/trunk/test-db/pom.xml
===================================================================
--- jbpm4/trunk/test-db/pom.xml	2010-12-20 05:06:54 UTC (rev 6877)
+++ jbpm4/trunk/test-db/pom.xml	2010-12-21 03:22:34 UTC (rev 6878)
@@ -138,7 +138,7 @@
                     <echo message="database: ${database}" />
                     <mkdir dir="target/jdbc.properties" />
                     <copy todir="target/jdbc.properties" overwrite="true">
-                      <fileset dir="../../qa/jdbc" />
+                      <fileset dir="../qa/jdbc" />
                     </copy>
                     <copy todir="target/jdbc.properties" overwrite="true"
                       failonerror="false">