[jbpm-commits] JBoss JBPM SVN: r6876 - in jbpm4/trunk: api and 21 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Dec 18 03:49:41 EST 2010


Author: alex.guizar at jboss.com
Date: 2010-12-18 03:49:40 -0500 (Sat, 18 Dec 2010)
New Revision: 6876

Removed:
   jbpm4/trunk/distro/scripts/assembly-jbpm-single-jar.xml
Modified:
   jbpm4/trunk/api/pom.xml
   jbpm4/trunk/distro/pom.xml
   jbpm4/trunk/distro/scripts/assembly-distro.xml
   jbpm4/trunk/examples/pom.xml
   jbpm4/trunk/integration/pom.xml
   jbpm4/trunk/jpdl/pom.xml
   jbpm4/trunk/migration/pom.xml
   jbpm4/trunk/migration/scripts/assembly-distro.xml
   jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
   jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java
   jbpm4/trunk/pom.xml
   jbpm4/trunk/pvm/pom.xml
   jbpm4/trunk/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/cleandb/pom.xml
   jbpm4/trunk/qa/upgrade/pom.xml
   jbpm4/trunk/test-base/pom.xml
   jbpm4/trunk/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java
   jbpm4/trunk/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java
   jbpm4/trunk/test-cactus/pom.xml
   jbpm4/trunk/test-cfg/pom.xml
   jbpm4/trunk/test-concurrent/pom.xml
   jbpm4/trunk/test-db/pom.xml
   jbpm4/trunk/test-load/pom.xml
Log:
JBPM-2985 switch to jboss parent v5 for plugin management;
clean up dependencies in several pom files



Modified: jbpm4/trunk/api/pom.xml
===================================================================
--- jbpm4/trunk/api/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/api/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -53,10 +53,6 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>

Modified: jbpm4/trunk/distro/pom.xml
===================================================================
--- jbpm4/trunk/distro/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/distro/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -9,13 +9,15 @@
 
 <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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <!-- Module Info -->
   <name>jBPM 4 - Distro</name>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jbpm-distro</artifactId>
+  <packaging>pom</packaging>
 
   <!-- Parent -->
   <parent>
@@ -32,53 +34,55 @@
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-examples</artifactId>
-      <classifier>tests</classifier>
+      <artifactId>jbpm-bpmn</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-db</artifactId>      
+      <artifactId>jbpm-console-form-plugin</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-enterprise</artifactId>      
+      <artifactId>jbpm-console-graphView-plugin</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-console-integration</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-console-form-plugin</artifactId>
+      <artifactId>jbpm-console-reports</artifactId>
     </dependency>
-     <dependency>
-      <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-console-graphView-plugin</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-console-reports</artifactId>
+      <artifactId>jbpm-db</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-jboss</artifactId>      
+      <artifactId>jbpm-enterprise</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-tomcat6</artifactId>
+      <artifactId>jbpm-examples</artifactId>
+      <classifier>tests</classifier>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-jpdl</artifactId>
+      <artifactId>jbpm-gpd</artifactId>
+      <type>zip</type>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-bpmn</artifactId>
+      <artifactId>jbpm-jboss</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-gpd</artifactId>
-      <type>zip</type>
+      <artifactId>jbpm-jpdl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
@@ -90,26 +94,54 @@
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-test-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-test-db</artifactId>
       <classifier>tests</classifier>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.birt</groupId>
-      <artifactId>report-engine</artifactId>
-      <type>zip</type>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-tomcat6</artifactId>
     </dependency>
+
+    <!-- Thirdparty dependencies -->
     <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-compiler</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
     </dependency>
-
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.birt</groupId>
+      <artifactId>report-engine</artifactId>
+      <type>zip</type>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp-wiser</artifactId>
+    </dependency>
 
-    <!-- GWT Console -->
+    <!-- GWT console -->
     <dependency>
       <groupId>org.jboss.bpm</groupId>
       <artifactId>gwt-console</artifactId>
@@ -124,11 +156,11 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.bpm</groupId>
-      <artifactId>gwt-console-server-integration</artifactId>          
+      <artifactId>gwt-console-server-integration</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.bpm</groupId>
-      <artifactId>gwt-console-rpc</artifactId>      
+      <artifactId>gwt-console-rpc</artifactId>
       <scope>provided</scope>
     </dependency>
     
@@ -139,7 +171,7 @@
       <type>war</type>
     </dependency>
 
-    <!-- Database Drivers -->
+    <!-- Database drivers -->
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -152,27 +184,37 @@
 
   <!-- Plugins -->
   <build>
-    <finalName>jbpm-${project.version}</finalName>
     <plugins>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+        <artifactId>maven-shade-plugin</artifactId>
         <executions>
           <execution>
             <id>create-jbpm-single-jar</id>
             <phase>process-resources</phase>
             <goals>
-              <goal>single</goal>
+              <goal>shade</goal>
             </goals>
             <configuration>
-              <finalName>jbpm</finalName>
-              <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
-              <appendAssemblyId>false</appendAssemblyId>
-              <descriptors>
-                <descriptor>scripts/assembly-jbpm-single-jar.xml</descriptor>
-              </descriptors>
+              <outputFile>${project.build.directory}/jbpm.jar</outputFile>
+              <artifactSet>
+                <includes>
+                  <include>org.jbpm.jbpm4:jbpm-api</include>
+                  <include>org.jbpm.jbpm4:jbpm-bpmn</include>
+                  <include>org.jbpm.jbpm4:jbpm-enterprise</include>
+                  <include>org.jbpm.jbpm4:jbpm-jpdl</include>
+                  <include>org.jbpm.jbpm4:jbpm-log</include>
+                  <include>org.jbpm.jbpm4:jbpm-pvm</include>
+                  <include>org.jbpm.jbpm4:jbpm-test-base</include>
+                </includes>
+              </artifactSet>
             </configuration>
           </execution>
+        </executions>
+      </plugin>
 
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
           <execution>
             <id>create-distribution-package</id>
             <phase>package</phase>
@@ -181,7 +223,6 @@
             </goals>
             <configuration>
               <finalName>jbpm-${project.version}</finalName>
-              <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
                 <descriptor>scripts/assembly-distro.xml</descriptor>

Modified: jbpm4/trunk/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/distro/scripts/assembly-distro.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/distro/scripts/assembly-distro.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -4,12 +4,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
                       http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>jbpm.distribution</id>
+  <id>jbpm-distribution</id>
   <formats>
     <format>zip</format>
   </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>jbpm-${project.version}</baseDirectory>
 
   <!-- Dependency Sets -->
   <dependencySets>
@@ -26,7 +24,6 @@
         <exclude>org.jbpm.jbpm4:jbpm-pvm:jar</exclude>
         <exclude>org.jbpm.jbpm4:jbpm-jpdl:jar</exclude>
         <exclude>org.jbpm.jbpm4:jbpm-enterprise:jar</exclude>
-        <exclude>org.jbpm.jbpm4:jbpm-distro:jar</exclude>
         <exclude>org.jbpm.jbpm4:jbpm-gpd:zip</exclude>
         <exclude>org.jbpm.jbpm4.dependencies.signavio:jbpmeditor:war</exclude>
       </excludes>

Deleted: jbpm4/trunk/distro/scripts/assembly-jbpm-single-jar.xml
===================================================================
--- jbpm4/trunk/distro/scripts/assembly-jbpm-single-jar.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/distro/scripts/assembly-jbpm-single-jar.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
-                      http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>jbpm.single.jar</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <dependencySets>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-api</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputFileNameMapping />
-      <outputDirectory />
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-log</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputFileNameMapping />
-      <outputDirectory />
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-pvm</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory />
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-jpdl</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory />
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-bpmn</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory />
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-test-base</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory />
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-enterprise</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory />
-    </dependencySet>
-  </dependencySets>
-</assembly>

Modified: jbpm4/trunk/examples/pom.xml
===================================================================
--- jbpm4/trunk/examples/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/examples/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -44,28 +44,40 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-lgpl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-core</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-compiler</artifactId>
-      <scope>runtime</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.subethamail</groupId>
-      <artifactId>subethasmtp-wiser</artifactId>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp-wiser</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-lgpl</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: jbpm4/trunk/integration/pom.xml
===================================================================
--- jbpm4/trunk/integration/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/integration/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -39,21 +39,6 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.jbpm.jbpm4</groupId>
-        <artifactId>jbpm-jpdl</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jacc-api</artifactId>
         <version>${jboss.jacc.version}</version>
@@ -111,11 +96,6 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
         <version>${slf4j.version}</version>
       </dependency>

Modified: jbpm4/trunk/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/jpdl/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/jpdl/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -7,7 +7,10 @@
 <!--  See terms of license at http://www.gnu.org.                           -->
 <!-- ====================================================================== -->
 
-<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>jBPM 4 - jPDL</name>
@@ -43,13 +46,24 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-core</artifactId>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.jms</groupId>
@@ -62,6 +76,11 @@
       <artifactId>mail</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: jbpm4/trunk/migration/pom.xml
===================================================================
--- jbpm4/trunk/migration/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/migration/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -9,10 +9,11 @@
 
 <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">
+  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>jBPM 4 - Migration - Tool</name>
+  <name>jBPM 4 - Migration Tool</name>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jpdl-migration</artifactId>
 
@@ -32,25 +33,12 @@
     </dependency>
 
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <version>1.6.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>xml-apis</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -58,6 +46,21 @@
       <artifactId>mail</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>juel</groupId>
+      <artifactId>juel-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <!-- Profiles -->
@@ -107,8 +110,8 @@
                 </goals>
                 <configuration>
                   <finalName>migration-distro</finalName>
-                  <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
                   <appendAssemblyId>false</appendAssemblyId>
+                  <attach>false</attach>
                   <descriptors>
                     <descriptor>scripts/assembly-distro.xml</descriptor>
                   </descriptors>

Modified: jbpm4/trunk/migration/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/migration/scripts/assembly-distro.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/migration/scripts/assembly-distro.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
-  <includeBaseDirectory>false</includeBaseDirectory>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
+                      http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>migration-distro</id>
   <formats>
     <format>dir</format>
   </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
   <dependencySets>
-  	<dependencySet>	
-      <unpack>false</unpack>
+    <dependencySet>
       <includes>
         <include>org.jbpm.jbpm4:jpdl-migration</include>
       </includes>
     </dependencySet>
     <dependencySet>
-      <outputDirectory>lib</outputDirectory>	
-      <unpack>false</unpack>
       <excludes>
         <exclude>org.jbpm.jbpm4:jpdl-migration</exclude>
       </excludes>
+      <outputDirectory>lib</outputDirectory>
     </dependencySet>
-   </dependencySets>
-   <fileSets>
+  </dependencySets>
+
+  <fileSets>
     <fileSet>
       <directory>${project.basedir}/src/main/java</directory>
-      <outputDirectory>src</outputDirectory>	
-      <useDefaultExcludes>true</useDefaultExcludes>
+      <outputDirectory>src</outputDirectory>
     </fileSet>
   </fileSets>
 </assembly>

Modified: jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java
===================================================================
--- jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java	2010-12-18 08:49:40 UTC (rev 6876)
@@ -24,192 +24,184 @@
 import java.io.InputStream;
 import java.util.List;
 
+import junit.framework.TestCase;
+
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.jbpm.jpdl.internal.xml.JpdlParser;
 import org.jbpm.pvm.internal.env.EnvironmentFactory;
 import org.jbpm.pvm.internal.processengine.ProcessEngineImpl;
 import org.jbpm.pvm.internal.xml.Problem;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
 import org.xml.sax.InputSource;
 
 /**
  * Test the jpdl3Converter
- *
+ * 
  */
-public class Jpdl3ConverterReaderTest {
-    @Test
-    public void testSimpleProcesss() throws Exception {
-        testConvert("simple.xml");
-    }
+public class Jpdl3ConverterReaderTest extends TestCase {
 
-    @Test
-    public void testBusinessTrip() throws Exception {
-        setUpEnviroment();
-        testConvert("businesstrip.xml");
-    }
+  public void testSimpleProcesss() throws Exception {
+    convertAndValidate("simple.xml");
+  }
 
-    @Test
-    public void testAssignment() throws Exception {
-        testConvert("assignment.xml");
-    }
+  public void testBusinessTrip() throws Exception {
+    setUpEnviroment();
+    convertAndValidate("businesstrip.xml");
+  }
 
-    @Test
-    public void testEvent() throws Exception {
-        setUpEnviroment();
-        testConvert("process-event.xml");
-    }
+  public void testAssignment() throws Exception {
+    convertAndValidate("assignment.xml");
+  }
 
-    @Test
-    public void testDescision() throws Exception {
-        testConvert("testDecision.xml");
-    }
+  public void testEvent() throws Exception {
+    setUpEnviroment();
+    convertAndValidate("process-event.xml");
+  }
 
-    @Test
-    public void testProcessState() throws Exception {
-        Document convertedDoc = convert("process-state.xml");
-        Element ele = convertedDoc.getRootElement();
-        String subProcessKey = ele.element("sub-process").attributeValue("sub-process-key");
-        Assert.assertEquals("interview", subProcessKey);
-        validate(convertedDoc);
+  public void testDecision() throws Exception {
+    convertAndValidate("testDecision.xml");
+  }
 
-    }
+  public void testProcessState() throws Exception {
+    Document convertedDoc = convert("process-state.xml");
+    Element ele = convertedDoc.getRootElement();
+    String subProcessKey = ele.element("sub-process").attributeValue("sub-process-key");
+    assertEquals("interview", subProcessKey);
+    validate(convertedDoc);
+  }
 
-    @Test
-    public void testScript() throws Exception {
-        setUpEnviroment();
-        Document doc = convert("script.xml");
-        Element stateEle = doc.getRootElement().element("state");
-        Assert.assertEquals("async", stateEle.attributeValue("continue"));
-        validate(doc);
-    }
+  public void testScript() throws Exception {
+    setUpEnviroment();
+    Document doc = convert("script.xml");
+    Element stateEle = doc.getRootElement().element("state");
+    assertEquals("async", stateEle.attributeValue("continue"));
+    validate(doc);
+  }
 
-    @Test
-    // Unsupported exception handler conversion test
-    public void testExceptionHandler() throws Exception {
-        InputStream inputStream = getClass().getClassLoader()
-                .getResourceAsStream("exception-handler.xml");
-        // Convert to process file to jpdl4
-        InputSource ins = new InputSource(inputStream);
-        Jpdl3Converter converter = new Jpdl3Converter(ins);
-        Document doc = converter.readAndConvert();
-        Assert.assertEquals(converter.problems.size(), 2);
-        Assert.assertTrue(converter.problems.get(0).toString().indexOf("[WARNING] Unsupported exception handler conversion for element") > -1);
-        Assert.assertTrue(converter.problems.get(1).toString().indexOf("[WARNING] Unsupported exception handler conversion for element") > -1);
-    }
+  // Unsupported exception handler conversion test
+  public void testExceptionHandler() throws Exception {
+    InputStream inputStream = getClass().getClassLoader()
+      .getResourceAsStream("exception-handler.xml");
+    // Convert to process file to jpdl4
+    InputSource ins = new InputSource(inputStream);
+    Jpdl3Converter converter = new Jpdl3Converter(ins);
+    converter.readAndConvert();
+    assertEquals(converter.problems.size(), 2);
+    assertTrue(converter.problems.get(0)
+      .toString()
+      .indexOf("[WARNING] Unsupported exception handler conversion for element") > -1);
+    assertTrue(converter.problems.get(1)
+      .toString()
+      .indexOf("[WARNING] Unsupported exception handler conversion for element") > -1);
+  }
 
-    @Test
-    public void testSuperStateAndMailNode() throws Exception {
-        InputStream inputStream = getClass().getClassLoader()
-                .getResourceAsStream("superstate-mail.xml");
-        // Convert to process file to jpdl4
-        InputSource ins = new InputSource(inputStream);
-        Jpdl3Converter converter = new Jpdl3Converter(ins);
-        Document doc = converter.readAndConvert();
-        validate(doc);
-    }
+  public void testSuperStateAndMailNode() throws Exception {
+    InputStream inputStream = getClass().getClassLoader()
+      .getResourceAsStream("superstate-mail.xml");
+    // Convert to process file to jpdl4
+    InputSource ins = new InputSource(inputStream);
+    Jpdl3Converter converter = new Jpdl3Converter(ins);
+    Document doc = converter.readAndConvert();
+    validate(doc);
+  }
 
-    @Test
-    public void testTransitionResolved() {
-        InputStream inputStream = getClass().getClassLoader()
-                .getResourceAsStream("test-transition-resolve.xml");
-        // Convert to process file to jpdl4
-        InputSource ins = new InputSource(inputStream);
-        Jpdl3Converter converter = new Jpdl3Converter(ins);
-        Document doc = converter.readAndConvert();
-        Assert.assertEquals(converter.problems.size(), 2);
-        for (org.jbpm.jpdl.internal.convert.problem.Problem pb : converter.problems) {
-            System.out.println(pb);
-        }
-        Assert.assertTrue(converter.problems.get(0).toString().startsWith(
-        "[WARNING] transition to='first2'"));
-        Assert.assertTrue(converter.problems.get(1).toString().startsWith(
-        "[WARNING] transition to='end2'"));
-
+  public void testTransitionResolved() {
+    InputStream inputStream = getClass().getClassLoader()
+      .getResourceAsStream("test-transition-resolve.xml");
+    // Convert to process file to jpdl4
+    InputSource ins = new InputSource(inputStream);
+    Jpdl3Converter converter = new Jpdl3Converter(ins);
+    converter.readAndConvert();
+    assertEquals(converter.problems.size(), 2);
+    for (org.jbpm.jpdl.internal.convert.problem.Problem pb : converter.problems) {
+      System.out.println(pb);
     }
+    assertTrue(converter.problems.get(0)
+      .toString()
+      .startsWith("[WARNING] transition to='first2'"));
+    assertTrue(converter.problems.get(1)
+      .toString()
+      .startsWith("[WARNING] transition to='end2'"));
 
-    @Test
-    public void testTimer() throws Exception {
-        String xml = convert("timer.xml").asXML();
-        List<Problem> problems = new JpdlParser().createParse().setString(xml)
-                .execute().getProblems();
-        Assert.assertEquals(2, problems.size());
-        Assert.assertTrue(problems.get(0).getMsg().startsWith(
-                "unrecognized event listener"));
-        Assert.assertTrue(problems.get(1).getMsg().startsWith(
-                "unrecognized event listener"));
-    }
+  }
 
-    @Test
-    public void testMailNode() throws Exception {
-        setUpEnviroment();
-        String xml = convert("mail-node.xml").asXML();
-        List<Problem> problems = new JpdlParser().createParse().setString(xml)
-                .execute().getProblems();
-        Assert.assertEquals(0, problems.size());
+  public void testTimer() throws Exception {
+    String xml = convert("timer.xml").asXML();
+    List<Problem> problems = new JpdlParser().createParse()
+      .setString(xml)
+      .execute()
+      .getProblems();
+    assertEquals(2, problems.size());
+    assertTrue(problems.get(0).getMsg().startsWith("unrecognized event listener"));
+    assertTrue(problems.get(1).getMsg().startsWith("unrecognized event listener"));
+  }
 
-    }
+  public void testMailNode() throws Exception {
+    setUpEnviroment();
+    String xml = convert("mail-node.xml").asXML();
+    List<Problem> problems = new JpdlParser().createParse()
+      .setString(xml)
+      .execute()
+      .getProblems();
+    assertEquals(0, problems.size());
+  }
 
+  private void convertAndValidate(String resourcefile) throws Exception {
+    Document doc = convert(resourcefile);
+    validate(doc);
+  }
 
+  private Document convert(String resouceFile) throws Exception {
+    InputStream inputStream = getClass().getClassLoader().getResourceAsStream(resouceFile);
+    // Convert to process file to jpdl4
+    InputSource ins = new InputSource(inputStream);
+    Jpdl3Converter converter = new Jpdl3Converter(ins);
+    Document doc = converter.readAndConvert();
+    // System.out.println(doc.asXML());
+    return doc;
+  }
 
-    private void testConvert(String resourcefile) throws Exception {
-        Document doc = convert(resourcefile);
-        validate(doc);
-    }
+  private void validate(Document convertedDoc) throws Exception {
+    System.out.println(convertedDoc.asXML());
+    List<Problem> problems = new JpdlParser().createParse()
+      .setString(convertedDoc.asXML())
+      .execute()
+      .getProblems();
+    assertEquals(problems.toString(), 0, problems.size());
+  }
 
+  private void setUpEnviroment() throws Exception {
+    EnvironmentFactory environmentFactory = ProcessEngineImpl.parseXmlString("<jbpm-configuration>"
+      + "  <process-engine-context>"
+      + "    <script-manager default-expression-language='juel'"
+      + "                    default-script-language='juel'>"
+      + "      <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />"
+      + "    </script-manager>"
+      + "    <mail-template name='my-template'> "
+      + "       <to addresses='${addressee}' />"
+      + "           <subject>rectify ${newspaper}</subject>"
+      + "           <text>${newspaper} ${date} ${details}</text>"
+      + "    </mail-template>"
+      + "    <mail-template name='task-notification'> "
+      + "       <to addresses='${addressee}' />"
+      + "           <subject>rectify ${newspaper}</subject>"
+      + "           <text>${newspaper} ${date} ${details}</text>"
+      + "    </mail-template>"
+      + "     <mail-template name='task-reminder'> "
+      + "       <to addresses='${addressee}' />"
+      + "           <subject>Task reminder</subject>"
+      + "           <text>Task reminder</text>"
+      + "    </mail-template>"
+      + "    <hibernate-configuration>"
+      + "      <cfg resource='jbpm.hibernate.cfg.xml' />"
+      + "    </hibernate-configuration>"
+      + "    <hibernate-session-factory />"
+      + "  </process-engine-context>"
+      + "  <transaction-context>"
+      + "    <db-session/>"
+      + "    <hibernate-session />"
+      + "  </transaction-context>" + "</jbpm-configuration>");
 
-    private Document convert(String resouceFile) throws Exception {
-        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(resouceFile);
-        // Convert to process file to jpdl4
-        InputSource ins = new InputSource(inputStream);
-        Jpdl3Converter converter = new Jpdl3Converter(ins);
-        Document doc = converter.readAndConvert();
-        //System.out.println(doc.asXML());
-        return doc;
-    }
-
-    private void validate(Document convertedDoc) throws Exception {
-      System.out.println(convertedDoc.asXML());
-      List<Problem> problems = new JpdlParser().createParse().setString(convertedDoc.asXML()).execute().getProblems();
-      Assert.assertEquals(problems.toString(), 0, problems.size());
-    }
-
-    private void setUpEnviroment() throws Exception {
-        EnvironmentFactory environmentFactory = ProcessEngineImpl
-          .parseXmlString("<jbpm-configuration>"
-                        + "  <process-engine-context>"
-                        + "    <script-manager default-expression-language='juel'"
-                        + "                    default-script-language='juel'>"
-                        + "      <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />"
-                        + "    </script-manager>"
-                        + "    <mail-template name='my-template'> "
-                        + "       <to addresses='${addressee}' />"
-                        + "           <subject>rectify ${newspaper}</subject>"
-                        + "           <text>${newspaper} ${date} ${details}</text>"
-                        + "    </mail-template>"
-                        + "    <mail-template name='task-notification'> "
-                        + "       <to addresses='${addressee}' />"
-                        + "           <subject>rectify ${newspaper}</subject>"
-                        + "           <text>${newspaper} ${date} ${details}</text>"
-                        + "    </mail-template>"
-                        + "     <mail-template name='task-reminder'> "
-                        + "       <to addresses='${addressee}' />"
-                        + "           <subject>Task reminder</subject>"
-                        + "           <text>Task reminder</text>"
-                        + "    </mail-template>"
-                        + "    <hibernate-configuration>"
-                        + "      <cfg resource='jbpm.hibernate.cfg.xml' />"
-                        + "    </hibernate-configuration>"
-                        + "    <hibernate-session-factory />"
-                        + "  </process-engine-context>"
-                        + "  <transaction-context>"
-                        + "    <db-session/>"
-                        + "    <hibernate-session />"
-                        + "  </transaction-context>"
-                        + "</jbpm-configuration>");
-
-        environmentFactory.openEnvironment();
-    }
+    environmentFactory.openEnvironment();
+  }
 }

Modified: jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java
===================================================================
--- jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java	2010-12-18 08:49:40 UTC (rev 6876)
@@ -26,167 +26,153 @@
 import java.net.URL;
 
 import junit.framework.Assert;
+import junit.framework.TestCase;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
 /**
  * Test the command line parser and validation
- *
  */
-public class JpdlConverterToolTest {
-	
-	JpdlConverterTool tool = new JpdlConverterTool();
-	java.io.ByteArrayOutputStream bout = null;
-	PrintStream oldOut = null;
-	
-	java.io.ByteArrayOutputStream errorOut = null;
-	PrintStream oldError = null;
-	
-	@Before
-	public void replaceSystemOut() {
-		oldOut = System.out;
-        bout = new java.io.ByteArrayOutputStream();		
-		System.setOut(new java.io.PrintStream(bout));
-		
-		oldError = System.err;
-		errorOut = new java.io.ByteArrayOutputStream();	
-		System.setErr(new java.io.PrintStream(errorOut));
-	}
-	
-	@After
-	public void restoreSystemOut() {
-		System.setErr(oldError);
-		System.setOut(oldOut);		
-	}
-	
-	@Test
-	public void wrongArgs1() {
-    	String args[] = {"-v","-t"};
-		try {
-			tool.parseParam(args);
-			Assert.fail("No Illegal command exception thrown");
-		} catch (Exception e) {
-			//do nothing
-		}
-	}
-	@Test
-	public void wrongArgs2() {
-		
-		String args2[] = {"-v","-o"};
-		try {
-			tool.parseParam(args2);
-			Assert.fail("No Illegal command exception thrown");
-		} catch (Exception e) {
-			//do nothing
-		}
-		
-	}	
-	@Test
-	public void wrongArgs3() {
-		String args3[] = {"-v","-o", "tmp.xml"};
-		try {
-			tool.parseParam(args3);
-			Assert.fail("No Illegal command exception thrown");
-		} catch (Exception e) {
-			//do nothing
-		}
-	}
-	
-	@Test
-	public void wrongArgs4() {	
-		String args4[] = {"-o", "tmp.xml", "process.xml", "myprocess.xml"};
-		try {
-			tool.parseParam(args4);
-			Assert.fail("No Illegal command exception thrown");
-		} catch (Exception e) {
-			//do nothing
-		}	
-		
-	}
-	
-	
-	@Test
-	public void rightArgs() throws Exception {	
-		String args4[] = {"-o", "tmp.xml", "process.xml"};
-		tool.parseParam(args4);	
-		String args5[] = {"process.xml"};
-		tool.parseParam(args5);	
-		String args6[] = {"-v","process.xml"};
-		tool.parseParam(args6);
-		String args7[] = {"-o","process.xml", "processed.xml"};
-		tool.parseParam(args7);
-	}
-	
-	
-	@Test
-	public void validateArgs1() throws Exception {	
-		ConverterContext context = new ConverterContext();
-		context.put(ConverterContext.PROCESS_FILE, "test.xml");
-		try {
-			tool.validate(context);
-			Assert.fail("No Illegal command exception thrown");
-		} catch (Exception e) {
-			//
-		}
-	}
-	
-	@Test
-	public void validateArgs2() throws Exception {
-		String fileName = getResource("simple.xml");
-		ConverterContext context = new ConverterContext();
-		context.put(ConverterContext.PROCESS_FILE, fileName);
-		context.put(ConverterContext.OUPUTFILE, "/mytest/histest");
-		try {
-			tool.validate(context);
-			Assert.fail("No Illegal command exception thrown");
-		} catch (Exception e) {
-			//
-		}
-	}
-	
-	@Ignore
-	//Test convert the process file under current directory
-    //it will generate a tmp file under migration dir.
-	//Enable this test until we find how to set the current directory
-	public void runConcretProcess() throws Exception {
-		String fileName = getResource("simple.xml");
-		String args[] = new String[]{"-v",fileName};
-		JpdlConverterTool.main(args);
-		URL url = new URL(fileName);
-		File tmpFile = new File(url.getFile());
-		File destFile = new File(tmpFile.getParentFile(), "simple.converted.jpdl.xml");
-		Assert.assertTrue(destFile.exists());		
-	}
-	
-	@Test
-	public void runConcretProcess2() throws Exception {
-		String fileName = getResource("simple.xml");
-		URL url = new URL(fileName);
-		File tmpFile = new File(url.getFile());
-		File outputfile = new File(tmpFile.getParentFile(), "tmp-output.xml");
-			
-		String args[] = new String[]{"-v","-o", outputfile.getAbsolutePath(),fileName};
-		JpdlConverterTool.main(args);
-	
-		Assert.assertTrue(outputfile.exists());	
-		Assert.assertTrue(outputfile.length() > 0);	
-	}
-	
-	@Test
-	public void testErrorMessage() throws Exception {
-		String fileName = getResource("invalid.xml");
-		String args[] = new String[]{fileName};			
-		JpdlConverterTool.main(args);
-		String str = new String(errorOut.toByteArray());		
-		Assert.assertTrue(str.indexOf("[ERROR] cvc-complex-type.2.4.a:") > -1);				
-	}
-	
-	
-    public String getResource(String file) throws Exception {
-    	URL url = getClass().getClassLoader().getResource(file);
-    	return url.toString();
+public class JpdlConverterToolTest extends TestCase {
+
+  JpdlConverterTool tool = new JpdlConverterTool();
+  java.io.ByteArrayOutputStream bout = null;
+  PrintStream oldOut = null;
+
+  java.io.ByteArrayOutputStream errorOut = null;
+  PrintStream oldError = null;
+
+  protected void setUp() {
+    oldOut = System.out;
+    bout = new java.io.ByteArrayOutputStream();
+    System.setOut(new java.io.PrintStream(bout));
+
+    oldError = System.err;
+    errorOut = new java.io.ByteArrayOutputStream();
+    System.setErr(new java.io.PrintStream(errorOut));
+  }
+
+  protected void tearDown() {
+    System.setErr(oldError);
+    System.setOut(oldOut);
+  }
+
+  public void testWrongArgs1() {
+    String args[] = { "-v", "-t" };
+    try {
+      tool.parseParam(args);
+      Assert.fail("No Illegal command exception thrown");
     }
+    catch (Exception e) {
+      // do nothing
+    }
+  }
+
+  public void testWrongArgs2() {
+    String args2[] = { "-v", "-o" };
+    try {
+      tool.parseParam(args2);
+      Assert.fail("No Illegal command exception thrown");
+    }
+    catch (Exception e) {
+      // do nothing
+    }
+
+  }
+
+  public void testWrongArgs3() {
+    String args3[] = { "-v", "-o", "tmp.xml" };
+    try {
+      tool.parseParam(args3);
+      Assert.fail("No Illegal command exception thrown");
+    }
+    catch (Exception e) {
+      // do nothing
+    }
+  }
+
+  public void testWrongArgs4() {
+    String args4[] = { "-o", "tmp.xml", "process.xml", "myprocess.xml" };
+    try {
+      tool.parseParam(args4);
+      Assert.fail("No Illegal command exception thrown");
+    }
+    catch (Exception e) {
+      // do nothing
+    }
+  }
+
+  public void testRightArgs() throws Exception {
+    String args4[] = { "-o", "tmp.xml", "process.xml" };
+    tool.parseParam(args4);
+    String args5[] = { "process.xml" };
+    tool.parseParam(args5);
+    String args6[] = { "-v", "process.xml" };
+    tool.parseParam(args6);
+    String args7[] = { "-o", "process.xml", "processed.xml" };
+    tool.parseParam(args7);
+  }
+
+  public void testValidateArgs1() throws Exception {
+    ConverterContext context = new ConverterContext();
+    context.put(ConverterContext.PROCESS_FILE, "test.xml");
+    try {
+      tool.validate(context);
+      Assert.fail("No Illegal command exception thrown");
+    }
+    catch (Exception e) {
+      //
+    }
+  }
+
+  public void testValidateArgs2() throws Exception {
+    String fileName = getResource("simple.xml");
+    ConverterContext context = new ConverterContext();
+    context.put(ConverterContext.PROCESS_FILE, fileName);
+    context.put(ConverterContext.OUPUTFILE, "/mytest/histest");
+    try {
+      tool.validate(context);
+      Assert.fail("No Illegal command exception thrown");
+    }
+    catch (Exception e) {
+      //
+    }
+  }
+
+  // Test convert the process file under current directory
+  // it will generate a tmp file under migration dir.
+  // Enable this test until we find how to set the current directory
+  public void runConcretProcess() throws Exception {
+    String fileName = getResource("simple.xml");
+    String args[] = new String[] { "-v", fileName };
+    JpdlConverterTool.main(args);
+    URL url = new URL(fileName);
+    File tmpFile = new File(url.getFile());
+    File destFile = new File(tmpFile.getParentFile(), "simple.converted.jpdl.xml");
+    Assert.assertTrue(destFile.exists());
+  }
+
+  public void testRunConcretProcess2() throws Exception {
+    String fileName = getResource("simple.xml");
+    URL url = new URL(fileName);
+    File tmpFile = new File(url.getFile());
+    File outputfile = new File(tmpFile.getParentFile(), "tmp-output.xml");
+
+    String args[] = new String[] { "-v", "-o", outputfile.getAbsolutePath(), fileName };
+    JpdlConverterTool.main(args);
+
+    Assert.assertTrue(outputfile.exists());
+    Assert.assertTrue(outputfile.length() > 0);
+  }
+
+  public void testErrorMessage() throws Exception {
+    String fileName = getResource("invalid.xml");
+    String args[] = new String[] { fileName };
+    JpdlConverterTool.main(args);
+    String str = new String(errorOut.toByteArray());
+    Assert.assertTrue(str.indexOf("[ERROR] cvc-complex-type.2.4.a:") > -1);
+  }
+
+  private String getResource(String file) throws Exception {
+    URL url = getClass().getClassLoader().getResource(file);
+    return url.toString();
+  }
 }

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -13,6 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <name>jBPM 4</name>
+  <url>http://jboss.org/jbpm</url>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jbpm</artifactId>
   <version>4.5-SNAPSHOT</version>
@@ -20,18 +21,28 @@
 
   <!-- Parent -->
   <parent>
-    <artifactId>jbpm-parent</artifactId>
-    <groupId>org.jbpm</groupId>
-    <version>1.0.4</version>
+    <artifactId>jboss-parent</artifactId>
+    <groupId>org.jboss</groupId>
+    <version>5</version>
   </parent>
 
-  <!-- Source Control Management -->
+  <!-- Source Control, Issue and Continuous Integration Management -->
   <scm>
     <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/jbpm4</connection>
     <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/jbpm4</developerConnection>
     <url>http://fisheye.jboss.org/browse/jbpm/jbpm4</url>
   </scm>
 
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.jboss.org/browse/JBPM</url>
+  </issueManagement>
+
+  <ciManagement>
+    <system>hudson</system>
+    <url>http://hudson.jboss.org/hudson/view/jBPM</url>
+  </ciManagement>
+
   <!-- Modules -->
   <modules>
     <module>api</module>
@@ -49,46 +60,21 @@
 
   <!-- Properties -->
   <properties>
-    <activation.version>1.1.1</activation.version>
-    <apache.ant.version>1.7.0</apache.ant.version>
-    <asm.version>1.5.3</asm.version>
-    <aspectjrt.version>1.5.3</aspectjrt.version>
-    <beanshell.version>2.0b5</beanshell.version>
     <cactus.version>1.8.1</cactus.version>
-    <cdi.version>1.0</cdi.version>
-    <commons.httpclient.version>3.1</commons.httpclient.version>
     <drools.version>5.0.1</drools.version>
-    <errai.version>1.1-M2</errai.version>
-    <freemarker.version>2.3.15</freemarker.version>
-    <groovy.version>1.5.6</groovy.version>
     <gwt.console.version>2.1</gwt.console.version>
-    <hibernate.version>3.3.1.GA</hibernate.version>
-    <hsqldb.version>1.8.0.7</hsqldb.version>
-    <jbpm.gpd.version>4.4</jbpm.gpd.version>
-    <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version>
-    <jboss.client.version>5.0.1.GA</jboss.client.version>
     <juel.version>2.2.1</juel.version>
-    <juel.engine.version>2.1.0</juel.engine.version>
     <junit.version>3.8.2</junit.version>
-    <livetribe.version>2.0.5</livetribe.version>
-    <log4j.version>1.2.14</log4j.version>
-    <mail.version>1.4.1</mail.version>
     <picketlink.version>1.1.1.GA</picketlink.version>
-    <report.engine.version>2.3.2</report.engine.version>
-    <servlet-api.version>2.5</servlet-api.version>
-    <signavio.jbpmeditor.version>1.1</signavio.jbpmeditor.version>
     <slf4j.version>1.5.2</slf4j.version>
     <spring.version>2.0.8</spring.version>
-    <stax.api.version>1.0.1</stax.api.version>
-    <wiser.version>1.2</wiser.version>
-    <woodstox.version>3.2.6</woodstox.version>
 
     <mysql.connector.version>5.0.8</mysql.connector.version>
     <oracle.version>10.2.0.4</oracle.version>
     <postgresql.version>8.3-603.jdbc3</postgresql.version>
   </properties>
 
-  <!-- DependencyManagement -->
+  <!-- Dependency management -->
   <dependencyManagement>
     <dependencies>
       <!-- Core engine components -->
@@ -198,13 +184,13 @@
         <groupId>org.jbpm.jbpm4</groupId>
         <artifactId>jbpm-gpd</artifactId>
         <type>zip</type>
-        <version>${jbpm.gpd.version}</version>
+        <version>4.4</version>
       </dependency>
       <dependency>
         <groupId>org.jbpm.jbpm4.dependencies.signavio</groupId>
         <artifactId>jbpmeditor</artifactId>
         <type>war</type>
-        <version>${signavio.jbpmeditor.version}</version>
+        <version>1.1</version>
       </dependency>
 
       <!-- External dependencies -->
@@ -212,27 +198,27 @@
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
-        <version>${activation.version}</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
-        <version>${apache.ant.version}</version>
+        <version>1.7.0</version>
       </dependency>
       <dependency>
         <groupId>asm</groupId>
         <artifactId>asm</artifactId>
-        <version>${asm.version}</version>
+        <version>1.5.3</version>
       </dependency>
       <dependency>
         <groupId>aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
-        <version>${aspectjrt.version}</version>
+        <version>1.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.beanshell</groupId>
         <artifactId>bsh</artifactId>
-        <version>${beanshell.version}</version>
+        <version>2.0b5</version>
       </dependency>
       <dependency>
         <groupId>cactus</groupId>
@@ -252,14 +238,19 @@
       <dependency>
         <groupId>javax.enterprise</groupId>
         <artifactId>cdi-api</artifactId>
-        <version>${cdi.version}</version>
+        <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
-        <version>${commons.httpclient.version}</version>
+        <version>3.1</version>
       </dependency>
       <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.1.1</version>
+      </dependency>
+      <dependency>
         <groupId>org.drools</groupId>
         <artifactId>drools-core</artifactId>
         <version>${drools.version}</version>
@@ -272,22 +263,22 @@
       <dependency>
         <groupId>org.jboss.errai</groupId>
         <artifactId>errai-common</artifactId>
-        <version>${errai.version}</version>
+        <version>1.1-M2</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.errai</groupId>
         <artifactId>errai-bus</artifactId>
-        <version>${errai.version}</version>
+        <version>1.1-M2</version>
       </dependency>
       <dependency>
         <groupId>org.freemarker</groupId>
         <artifactId>freemarker</artifactId>
-        <version>${freemarker.version}</version>
+        <version>2.3.15</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-all</artifactId>
-        <version>${groovy.version}</version>
+        <version>1.5.6</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.bpm</groupId>
@@ -317,23 +308,33 @@
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
-        <version>${hibernate.version}</version>
+        <version>3.3.1.GA</version>
       </dependency>
       <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-entitymanager</artifactId>
+        <version>3.4.0.GA</version>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-javaee</artifactId>
-        <version>${jboss.client.version}</version>
+        <version>5.0.1.GA</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
         <artifactId>jboss-as-client</artifactId>
-        <version>${jboss.client.version}</version>
+        <version>5.0.1.GA</version>
         <type>pom</type>
       </dependency>
       <dependency>
+        <groupId>javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.4.GA</version>
+      </dependency>
+      <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-j2ee</artifactId>
-        <version>${jboss.j2ee.version}</version>
+        <version>4.2.2.GA</version>
       </dependency>
       <dependency>
         <groupId>juel</groupId>
@@ -354,7 +355,7 @@
         -->
         <groupId>juel</groupId>
         <artifactId>juel-engine</artifactId>
-        <version>${juel.engine.version}</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
@@ -364,19 +365,29 @@
       <dependency>
         <groupId>org.livetribe</groupId>
         <artifactId>livetribe-jsr223</artifactId>
-        <version>${livetribe.version}</version>
+        <version>2.0.5</version>
       </dependency>
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
+        <version>1.2.14</version>
       </dependency>
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
-        <version>${mail.version}</version>
+        <version>1.4.1</version>
       </dependency>
       <dependency>
+        <groupId>com.mockrunner</groupId>
+        <artifactId>mockrunner</artifactId>
+        <version>0.4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockejb</groupId>
+        <artifactId>mockejb</artifactId>
+        <version>0.6-beta2</version>
+      </dependency>
+      <dependency>
         <groupId>org.picketlink.idm</groupId>
         <artifactId>picketlink-idm-core</artifactId>
         <version>${picketlink.version}</version>
@@ -390,12 +401,12 @@
         <groupId>org.eclipse.birt</groupId>
         <artifactId>report-engine</artifactId>
         <type>zip</type>
-        <version>${report.engine.version}</version>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
-        <version>${servlet-api.version}</version>
+        <version>2.5</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -419,25 +430,20 @@
       </dependency>
       <dependency>
         <groupId>org.subethamail</groupId>
-        <artifactId>subethasmtp-smtp</artifactId>
-        <version>${wiser.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.subethamail</groupId>
         <artifactId>subethasmtp-wiser</artifactId>
-        <version>${wiser.version}</version>
+        <version>1.2</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>wstx-lgpl</artifactId>
-        <version>${woodstox.version}</version>
+        <version>3.2.6</version>
       </dependency>
 
-      <!-- Database Driver Versions  -->
+      <!-- Database driver versions  -->
       <dependency>
         <groupId>hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
-        <version>${hsqldb.version}</version>
+        <version>1.8.0.7</version>
       </dependency>
       <dependency>
         <groupId>mysql</groupId>
@@ -454,16 +460,23 @@
 
   <!-- Plugins -->
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.jboss.maven.plugins</groupId>
+          <artifactId>maven-jdocbook-plugin</artifactId>
+          <version>2.1.2</version>
+        </plugin>
+        <plugin>
+        	<groupId>org.apache.maven.plugins</groupId>
+        	<artifactId>maven-shade-plugin</artifactId>
+        	<version>1.4</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -516,7 +529,6 @@
   </pluginRepositories>
 
   <profiles>
-    <!-- schema for direct db integration test. see qa\hudson-jbpm4-db.* -->
     <profile>
       <id>docs</id>
       <modules>
@@ -544,22 +556,11 @@
               <skipTests>true</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
 
-    <!-- schema for direct db integration test. see qa\hudson-jbpm4-db.* -->
+    <!-- Schema for database test suite. See qa/hudson-jbpm4-db.sh -->
     <profile>
       <id>schema</id>
       <modules>
@@ -756,6 +757,7 @@
         <module>test-concurrent</module>
         <module>test-upgrade</module>
       </modules>
+
       <build>
         <plugins>
           <plugin>

Modified: jbpm4/trunk/pvm/pom.xml
===================================================================
--- jbpm4/trunk/pvm/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/pvm/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -38,20 +38,16 @@
       <artifactId>jbpm-test-base</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.beanshell</groupId>
       <artifactId>bsh</artifactId>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.enterprise</groupId>
@@ -66,7 +62,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -81,8 +77,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>3.4.0.GA</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
@@ -90,12 +85,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.4.GA</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-j2ee</artifactId>
       <scope>provided</scope>
@@ -111,10 +100,12 @@
     <dependency>
       <groupId>juel</groupId>
       <artifactId>juel-engine</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.livetribe</groupId>
       <artifactId>livetribe-jsr223</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
@@ -122,22 +113,32 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>com.mockrunner</groupId>
+      <artifactId>mockrunner</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockejb</groupId>
+      <artifactId>mockejb</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.picketlink.idm</groupId>
       <artifactId>picketlink-idm-core</artifactId>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.picketlink.idm</groupId>
       <artifactId>picketlink-idm-hibernate</artifactId>
-      <scope>provided</scope>
+      <optional>true</optional>
       <exclusions>
         <exclusion>
-          <artifactId>hibernate-cglib-repack</artifactId>
           <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-cglib-repack</artifactId>
         </exclusion>
         <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
           <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -147,14 +148,19 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
-      <scope>runtime</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-      <scope>provided</scope>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp-wiser</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -162,12 +168,6 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <showDeprecation>false</showDeprecation>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
@@ -190,8 +190,7 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
               <quiet>true</quiet>
-              <source>1.5</source>
-              <verbose>false</verbose>
+              <source>${maven.compiler.source}</source>
               <noqualifier>all</noqualifier>
               <excludePackageNames>*.internal:*.test</excludePackageNames>
             </configuration>

Modified: jbpm4/trunk/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java
===================================================================
--- jbpm4/trunk/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java	2010-12-18 08:49:40 UTC (rev 6876)
@@ -24,31 +24,35 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.jbpm.api.Configuration;
 import org.jbpm.api.ProcessEngine;
+import org.jbpm.internal.log.Log;
 
 /**
  * common strategy for jbpm ant tasks to obtain a hibernate SessionFactory.
  */
-public abstract class AntHelper {
+public class AntHelper {
 
-  final static Map<String, ProcessEngine> processEngines = new HashMap<String, ProcessEngine>();
+  private static final Map<String, ProcessEngine> processEngines = new HashMap<String, ProcessEngine>();
 
-  private static final Log log = LogFactory.getLog(AntHelper.class);
+  private static final Log log = Log.getLog(AntHelper.class.getName());
 
+  private AntHelper() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static ProcessEngine getProcessEngine(String jbpmCfgXml) {
     ProcessEngine processEngine = processEngines.get(jbpmCfgXml);
     if (processEngine == null) {
       Configuration configuration = new Configuration();
-      if (jbpmCfgXml!=null) {
-        log.debug("using jbpm configuration "+jbpmCfgXml);
+      if (jbpmCfgXml != null) {
+        log.debug("using jbpm configuration " + jbpmCfgXml);
         configuration.setResource(jbpmCfgXml);
-      } else {
+      }
+      else {
         log.debug("using default jbpm.cfg.xml configuration");
       }
-      
+
       processEngine = configuration.buildProcessEngine();
 
       processEngines.put(jbpmCfgXml, processEngine);

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/qa/build.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -27,7 +27,7 @@
 
   <!-- DERIVED PROPERTIES -->
   <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" />
-  <property name="jbpm.distro.dir" value="../modules/distro/target" />
+  <property name="jbpm.distro.dir" value="../distro/target" />
   <property name="jbpm.distro.path" value="${jbpm.distro.dir}/jbpm-${jbpm.version}.zip" />
 
   <condition property="is.hsqldb">
@@ -100,7 +100,7 @@
 
     <!-- add the cactus libs -->
     <copy todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib">
-      <fileset dir="../modules/test-cactus/target/jbpm.test.webapp.libs" />
+      <fileset dir="../test-cactus/target/jbpm.test.webapp.libs" />
     </copy>
 
     <!-- add the bsh lib -->
@@ -188,7 +188,7 @@
 
     <!-- add the cactus libs -->
     <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib">
-      <fileset dir="../modules/test-cactus/target/jbpm.test.webapp.libs" />
+      <fileset dir="../test-cactus/target/jbpm.test.webapp.libs" />
     </copy>
   </target>
 
@@ -230,11 +230,11 @@
           todir="${jboss.home}/server/default/deploy/jbpm-test" />
 
     <!-- deploy the test ejbs -->
-    <copy file="../modules/test-enterprise/test-enterprise-ejb/target/jbpm-test-enterprise-ejb-${jbpm.version}.jar"
+    <copy file="../test-enterprise-ejb/target/jbpm-test-enterprise-ejb-${jbpm.version}.jar"
           todir="${jboss.home}/server/default/deploy/jbpm-test" />
 
     <!-- copy the test classes to the test web app  -->
-    <copy file="../modules/test-enterprise/test-enterprise-suite/target/jbpm-test-enterprise-suite-${jbpm.version}-tests.jar"
+    <copy file="../test-enterprise-suite/target/jbpm-test-enterprise-suite-${jbpm.version}-tests.jar"
           todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" />
   </target>
 
@@ -395,7 +395,7 @@
           overwrite="true"
           failonerror="false" />
     <!-- copy the oracle jar as it is not allowed to be part of our distro -->
-    <copy file="../modules/distro/target/libs/ojdbc14.jar" todir="${jbpm.home}/lib" />
+    <copy file="../distro/target/libs/ojdbc14.jar" todir="${jbpm.home}/lib" />
   </target>
 
 </project>

Modified: jbpm4/trunk/qa/cleandb/pom.xml
===================================================================
--- jbpm4/trunk/qa/cleandb/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/qa/cleandb/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
+<!--  jBPM: Workflow in Java                                                -->
 <!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
 <!--  Distributable under LGPL license.                                     -->
 <!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: pom.xml 5246 2009-07-06 11:07:48Z tom.baeyens 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>jBPM 4 - Fetch old distro</name>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jbpm-fetch-old-distro</artifactId>
@@ -70,16 +69,14 @@
   <!-- Repositories -->
   <repositories>
     <repository>
-      <id>repository.jboss.org</id>
-      <url>http://repository.jboss.com/maven2</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
+      <id>public-jboss-repository-group</id>
+      <name>Public JBoss Repository Group</name>
+      <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
     </repository>
     <repository>
       <id>qa.jboss.com</id>
+      <name>JBoss QA Repository</name>
       <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
     </repository>
   </repositories>
-
 </project>

Modified: jbpm4/trunk/qa/upgrade/pom.xml
===================================================================
--- jbpm4/trunk/qa/upgrade/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/qa/upgrade/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
+<!--  jBPM: Workflow in Java                                                -->
 <!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
 <!--  Distributable under LGPL license.                                     -->
 <!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: pom.xml 5246 2009-07-06 11:07:48Z tom.baeyens 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>jBPM 4 - Fetch old distro</name>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jbpm-fetch-old-distro</artifactId>
-  <packaging>jar</packaging>
   <version>4.4-SNAPSHOT</version>
 
   <build>
@@ -62,16 +60,14 @@
   <!-- Repositories -->
   <repositories>
     <repository>
-      <id>repository.jboss.org</id>
-      <url>http://repository.jboss.com/maven2</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
+      <id>public-jboss-repository-group</id>
+      <name>Public JBoss Repository Group</name>
+      <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
     </repository>
     <repository>
       <id>qa.jboss.com</id>
+      <name>JBoss QA Repository</name>
       <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
     </repository>
   </repositories>
-
 </project>

Modified: jbpm4/trunk/test-base/pom.xml
===================================================================
--- jbpm4/trunk/test-base/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-base/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -28,23 +28,16 @@
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-log</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-      <version>2.1.1</version>
-      <scope>runtime</scope>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
@@ -57,15 +50,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
       <scope>provided</scope>
@@ -78,23 +62,18 @@
     <dependency>
       <groupId>com.mockrunner</groupId>
       <artifactId>mockrunner</artifactId>
-      <version>0.4.1</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
-      <!-- mockrunner transitive dependency (not in mockrunner pom) -->
       <groupId>org.mockejb</groupId>
       <artifactId>mockejb</artifactId>
-      <version>0.6-beta2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib-full</artifactId>
-        </exclusion>
-      </exclusions>
+      <scope>runtime</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.subethamail</groupId>
       <artifactId>subethasmtp-wiser</artifactId>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 </project>

Modified: jbpm4/trunk/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java
===================================================================
--- jbpm4/trunk/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-base/src/main/java/org/jbpm/test/ejb/JbpmEjbMockTestCase.java	2010-12-18 08:49:40 UTC (rev 6876)
@@ -1,44 +1,33 @@
 package org.jbpm.test.ejb;
+
 import org.jbpm.test.JbpmTestCase;
 
 import com.mockrunner.ejb.EJBTestModule;
 import com.mockrunner.mock.ejb.EJBMockObjectFactory;
 
+public class JbpmEjbMockTestCase extends JbpmTestCase {
 
-public class JbpmEjbMockTestCase extends JbpmTestCase
-{
-
   private EJBMockObjectFactory ejbMockFactory;
   private EJBTestModule ejbTestModule;
-  
-  private EJBTestModule createEJBTestModule()
-  {
+
+  private EJBTestModule createEJBTestModule() {
     return new EJBTestModule(getEJBMockObjectFactory());
   }
-  
-  private EJBMockObjectFactory createEJBMockObjectFactory()
-  {
+
+  private EJBMockObjectFactory createEJBMockObjectFactory() {
     return new EJBMockObjectFactory();
   }
 
-  private EJBMockObjectFactory getEJBMockObjectFactory()
-  {
-      synchronized(EJBMockObjectFactory.class) 
-      {
-          if(ejbMockFactory == null)
-          {
-              ejbMockFactory = createEJBMockObjectFactory();
-          }
-      }
-      return ejbMockFactory;
+  private EJBMockObjectFactory getEJBMockObjectFactory() {
+    if (ejbMockFactory == null) ejbMockFactory = createEJBMockObjectFactory();
+    return ejbMockFactory;
   }
 
   protected void bindToContext(String name, Object object) {
     ejbTestModule.bindToContext(name, object);
   }
 
-  protected void setUp() throws Exception 
-  {
+  protected void setUp() throws Exception {
     super.setUp();
     ejbTestModule = createEJBTestModule();
   }

Modified: jbpm4/trunk/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java
===================================================================
--- jbpm4/trunk/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-base/src/main/java/org/jbpm/test/jms/JbpmJmsMockTestCase.java	2010-12-18 08:49:40 UTC (rev 6876)
@@ -1,4 +1,5 @@
 package org.jbpm.test.jms;
+
 import javax.jms.ConnectionFactory;
 import javax.jms.Queue;
 
@@ -8,61 +9,47 @@
 import com.mockrunner.jms.JMSTestModule;
 import com.mockrunner.mock.jms.JMSMockObjectFactory;
 
+public class JbpmJmsMockTestCase extends JbpmEjbMockTestCase {
 
-public class JbpmJmsMockTestCase extends JbpmEjbMockTestCase
-{
-
   private JMSMockObjectFactory jmsMockFactory;
   private JMSTestModule jmsTestModule;
-  
+
   private ConnectionFactory connectionFactory;
   private Queue queue;
 
-  private JMSTestModule createJMSTestModule(JMSMockObjectFactory mockFactory)
-  {
-      return new JMSTestModule(mockFactory);
+  private JMSTestModule createJMSTestModule(JMSMockObjectFactory mockFactory) {
+    return new JMSTestModule(mockFactory);
   }
 
-  private JMSMockObjectFactory createJMSMockObjectFactory()
-  {
-      return new JMSMockObjectFactory();
+  private JMSMockObjectFactory createJMSMockObjectFactory() {
+    return new JMSMockObjectFactory();
   }
-  
-  private JMSMockObjectFactory getJMSMockObjectFactory()
-  {
-      synchronized(JMSMockObjectFactory.class) 
-      {
-          if(jmsMockFactory == null)
-          {
-              jmsMockFactory = createJMSMockObjectFactory();
-          }
-      }
-      return jmsMockFactory;
+
+  private JMSMockObjectFactory getJMSMockObjectFactory() {
+    if (jmsMockFactory == null) jmsMockFactory = createJMSMockObjectFactory();
+    return jmsMockFactory;
   }
-  
-  private DestinationManager getDestinationManager()
-  {
-      return jmsTestModule.getDestinationManager();
+
+  private DestinationManager getDestinationManager() {
+    return jmsTestModule.getDestinationManager();
   }
-  
+
   protected ConnectionFactory getConnectionFactory() {
     if (connectionFactory == null) {
       connectionFactory = getJMSMockObjectFactory().createMockConnectionFactory();
     }
     return connectionFactory;
   }
-  
+
   protected Queue getQueue() {
     if (queue == null) {
       queue = getDestinationManager().createQueue("testQueue");
     }
     return queue;
   }
-  
-  protected void setUp() throws Exception 
-  {
+
+  protected void setUp() throws Exception {
     super.setUp();
     jmsTestModule = createJMSTestModule(getJMSMockObjectFactory());
   }
-
 }

Modified: jbpm4/trunk/test-cactus/pom.xml
===================================================================
--- jbpm4/trunk/test-cactus/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-cactus/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -7,9 +7,9 @@
 <!--  See terms of license at http://www.gnu.org.                           -->
 <!-- ====================================================================== -->
 
-<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>jBPM 4 - Test Cactus</name>
@@ -27,13 +27,19 @@
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-jpdl</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-bpmn</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-console-reports</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-examples</artifactId>
       <classifier>tests</classifier>
     </dependency>
@@ -42,10 +48,36 @@
       <artifactId>jbpm-test-db</artifactId>
       <classifier>tests</classifier>
     </dependency>
+
     <dependency>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+    </dependency>
+    <dependency>
       <groupId>cactus</groupId>
       <artifactId>cactus.core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>cactus</groupId>
+      <artifactId>cactus.integration.ant</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>cactus</groupId>
+      <artifactId>cactus.integration.shared.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp-smtp</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp-wiser</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -66,62 +98,20 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>copy.libs</id>
+                <id>copy-dependencies</id>
                 <phase>package</phase>
                 <goals>
-                  <goal>copy</goal>
+                  <goal>copy-dependencies</goal>
                 </goals>
                 <configuration>
-                  <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>aspectj</groupId>
-                      <artifactId>aspectjrt</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>cactus</groupId>
-                      <artifactId>cactus.core</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>cactus</groupId>
-                      <artifactId>cactus.integration.ant</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>cactus</groupId>
-                      <artifactId>cactus.integration.shared.api</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>commons-logging</groupId>
-                      <artifactId>commons-logging</artifactId>
-                      <version>1.1</version>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.jbpm.jbpm4</groupId>
-                      <artifactId>jbpm-examples</artifactId>
-                      <classifier>tests</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.jbpm.jbpm4</groupId>
-                      <artifactId>jbpm-test-db</artifactId>
-                      <classifier>tests</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.jbpm.jbpm4</groupId>
-                      <artifactId>jbpm-console-reports</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.subethamail</groupId>
-                      <artifactId>subethasmtp-wiser</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.subethamail</groupId>
-                      <artifactId>subethasmtp-smtp</artifactId>
-                    </artifactItem>
-                  </artifactItems>
+                  <outputDirectory>
+                    ${project.build.directory}/jbpm.test.webapp.libs
+                  </outputDirectory>
+                  <includeScope>compile</includeScope>
+                  <excludeTransitive>true</excludeTransitive>
                 </configuration>
               </execution>
             </executions>
@@ -138,63 +128,20 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>copy.libs</id>
+                <id>copy-dependencies</id>
                 <phase>package</phase>
                 <goals>
-                  <goal>copy</goal>
+                  <goal>copy-dependencies</goal>
                 </goals>
                 <configuration>
-                  <outputDirectory>${project.build.directory}/jbpm.test.webapp.libs
+                  <outputDirectory>
+                    ${project.build.directory}/jbpm.test.webapp.libs
                   </outputDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>aspectj</groupId>
-                      <artifactId>aspectjrt</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>cactus</groupId>
-                      <artifactId>cactus.core</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>cactus</groupId>
-                      <artifactId>cactus.integration.ant</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>cactus</groupId>
-                      <artifactId>cactus.integration.shared.api</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>commons-logging</groupId>
-                      <artifactId>commons-logging</artifactId>
-                      <version>1.1</version>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.jbpm.jbpm4</groupId>
-                      <artifactId>jbpm-examples</artifactId>
-                      <classifier>tests</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.jbpm.jbpm4</groupId>
-                      <artifactId>jbpm-test-db</artifactId>
-                      <classifier>tests</classifier>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.jbpm.jbpm4</groupId>
-                      <artifactId>jbpm-console-reports</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.subethamail</groupId>
-                      <artifactId>subethasmtp-wiser</artifactId>
-                    </artifactItem>
-                    <artifactItem>
-                      <groupId>org.subethamail</groupId>
-                      <artifactId>subethasmtp-smtp</artifactId>
-                    </artifactItem>
-                  </artifactItems>
+                  <includeScope>compile</includeScope>
+                  <excludeTransitive>true</excludeTransitive>
                 </configuration>
               </execution>
             </executions>
@@ -209,37 +156,12 @@
         <dependency>
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
+          <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>org.jbpm.jbpm4</groupId>
-          <artifactId>jbpm-examples</artifactId>
-          <classifier>tests</classifier>
-        </dependency>
-        <dependency>
-          <groupId>org.jbpm.jbpm4</groupId>
-          <artifactId>jbpm-test-db</artifactId>
-          <classifier>tests</classifier>
-        </dependency>
-        <dependency>
-          <groupId>cactus</groupId>
-          <artifactId>cactus.core</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>cactus</groupId>
-          <artifactId>cactus.integration.shared.api</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>cactus</groupId>
-          <artifactId>cactus.integration.ant</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>aspectj</groupId>
-          <artifactId>aspectjrt</artifactId>
-        </dependency>
-        <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
-          <scope>runtime</scope>
+          <scope>test</scope>
         </dependency>
       </dependencies>
 
@@ -256,11 +178,13 @@
                 </goals>
                 <configuration>
                   <tasks>
-                    <java classname="org.jbpm.cactustool.CactusTestGenerator" classpathref="maven.test.classpath">
+                    <java classname="org.jbpm.cactustool.CactusTestGenerator"
+                      classpathref="maven.test.classpath">
                       <arg file="${project.build.testSourceDirectory}" />
                       <arg file="${basedir}/../examples/src/test/java" />
                       <arg file="${basedir}/../test-db/src/test/java" />
-                      <sysproperty key="excluded.tests" value="SQLStmtTest.java AttachmentTest.java" />
+                      <sysproperty key="excluded.tests"
+                        value="SQLStmtTest.java AttachmentTest.java" />
                     </java>
                   </tasks>
                 </configuration>
@@ -275,7 +199,8 @@
                 <configuration>
                   <tasks>
                     <delete>
-                      <fileset dir="${project.build.testSourceDirectory}" includes="org/jbpm/test/AllIntegrationTests.java" />
+                      <fileset dir="${project.build.testSourceDirectory}"
+                        includes="org/jbpm/test/AllIntegrationTests.java" />
                     </delete>
                   </tasks>
                 </configuration>

Modified: jbpm4/trunk/test-cfg/pom.xml
===================================================================
--- jbpm4/trunk/test-cfg/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-cfg/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -9,7 +9,8 @@
 
 <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">
+  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>jBPM 4 - Test Configuration</name>
@@ -46,15 +47,9 @@
     </dependency>
 
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
-      <version>3.4.0.GA</version>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
@@ -64,9 +59,19 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <scope>runtime</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.mockrunner</groupId>
+      <artifactId>mockrunner</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockejb</groupId>
+      <artifactId>mockejb</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
       <scope>test</scope>
@@ -76,5 +81,15 @@
       <artifactId>spring-mock</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp-wiser</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: jbpm4/trunk/test-concurrent/pom.xml
===================================================================
--- jbpm4/trunk/test-concurrent/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-concurrent/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -47,6 +47,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <!-- DB drivers -->
     <dependency>
       <groupId>com.h2database</groupId>

Modified: jbpm4/trunk/test-db/pom.xml
===================================================================
--- jbpm4/trunk/test-db/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-db/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -4,12 +4,13 @@
 <!--  jBPM: Workflow in Java                                                -->
 <!--                                                                        -->
 <!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
+<!--  See terms of license at http://www.gnu.org                            -->
 <!-- ====================================================================== -->
 
 <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">
+  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>jBPM 4 - Test DB</name>
@@ -27,43 +28,51 @@
   <dependencies>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-test-base</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-jpdl</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-bpmn</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-console-reports</artifactId>
-      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-core</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>
       <artifactId>drools-compiler</artifactId>
-      <scope>runtime</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp-wiser</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -131,10 +140,12 @@
                     <copy todir="target/jdbc.properties" overwrite="true">
                       <fileset dir="../../qa/jdbc" />
                     </copy>
-                    <copy todir="target/jdbc.properties" overwrite="true" failonerror="false">
+                    <copy todir="target/jdbc.properties" overwrite="true"
+                      failonerror="false">
                       <fileset dir="${user.home}/.jbpm4/jdbc" />
                     </copy>
-                    <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
+                    <ant antfile="../distro/src/main/files/install/build.xml"
+                      target="create.cfg">
                       <property name="tx" value="standalone.testsuite" />
                       <property name="mail.cfg" value="testsuite" />
                       <property name="database" value="${database}" />
@@ -171,7 +182,8 @@
                 </goals>
                 <configuration>
                   <tasks>
-                    <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
+                    <ant antfile="../distro/src/main/files/install/build.xml"
+                      target="create.cfg">
                       <property name="tx" value="spring.testsuite" />
                       <property name="hibernate.connection.type" value="spring" />
                       <property name="database" value="hsqldb.inmem" />

Modified: jbpm4/trunk/test-load/pom.xml
===================================================================
--- jbpm4/trunk/test-load/pom.xml	2010-12-17 23:15:14 UTC (rev 6875)
+++ jbpm4/trunk/test-load/pom.xml	2010-12-18 08:49:40 UTC (rev 6876)
@@ -37,6 +37,12 @@
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-jpdl</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <!-- Profiles -->



More information about the jbpm-commits mailing list