[jbpm-commits] JBoss JBPM SVN: r3712 - in jbpm4/branches/hbraun: modules/config/src/main/resources and 23 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Jan 23 05:07:54 EST 2009


Author: heiko.braun at jboss.com
Date: 2009-01-23 05:07:54 -0500 (Fri, 23 Jan 2009)
New Revision: 3712

Added:
   jbpm4/branches/hbraun/modules/db/jbpm4-db.iml
   jbpm4/branches/hbraun/modules/distro/scripts/
   jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml
   jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml
   jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html
   jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml
   jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml
   jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml
   jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml
   jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties
   jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml
Removed:
   jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties
   jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties
Modified:
   jbpm4/branches/hbraun/modules/db/pom.xml
   jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties
   jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties
   jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties
   jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties
   jbpm4/branches/hbraun/modules/distro/pom.xml
   jbpm4/branches/hbraun/modules/enterprise/pom.xml
   jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml
   jbpm4/branches/hbraun/modules/jpdl/pom.xml
   jbpm4/branches/hbraun/modules/pvm/pom.xml
   jbpm4/branches/hbraun/pom.xml
   jbpm4/branches/hbraun/profiles.xml.example
Log:
Clean up config and test coverage, first cut

Deleted: jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/config/src/main/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,12 +0,0 @@
-hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class=org.hsqldb.jdbcDriver
-hibernate.connection.url=jdbc:hsqldb:mem:.
-hibernate.connection.username=sa
-hibernate.connection.password=
-hibernate.hbm2ddl.auto=create-drop
-hibernate.cache.use_second_level_cache=true
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-
-# hibernate.show_sql=true
-# hibernate.format_sql=true
-# hibernate.use_sql_comments=true

Added: jbpm4/branches/hbraun/modules/db/jbpm4-db.iml
===================================================================
--- jbpm4/branches/hbraun/modules/db/jbpm4-db.iml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/db/jbpm4-db.iml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: jbpm4/branches/hbraun/modules/db/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/db/pom.xml	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/db/pom.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -24,7 +24,7 @@
     <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
-
+  
   <!-- Dependencies -->
   <dependencies>
     <dependency>
@@ -51,6 +51,12 @@
   
   <!-- Plugins -->
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>        
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>

Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties
===================================================================
--- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/hsqldb.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,8 +1,11 @@
+##
+## jbpm-db hsqldb config
+##
 hibernate.dialect=org.hibernate.dialect.HSQLDialect
 hibernate.connection.driver_class=org.hsqldb.jdbcDriver
-hibernate.connection.url=jdbc:hsqldb:hsql://${jdbc.server}/${jdbc.dbname}
-hibernate.connection.username=${jdbc.username}
-hibernate.connection.password=${jdbc.password}
+hibernate.connection.url=${jdbc.hsql.url}
+hibernate.connection.username=${jdbc.hsql.username}
+hibernate.connection.password=${jdbc.hsql.password}
 
 hibernate.cache.use_second_level_cache=true
 hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties
===================================================================
--- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/mysql.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,8 +1,11 @@
+##
+## jbpm-db mysql config
+##
 hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 hibernate.connection.driver_class=com.mysql.jdbc.Driver
-hibernate.connection.url=jdbc:mysql://${jdbc.server}/${jdbc.dbname}
-hibernate.connection.username=${jdbc.username}
-hibernate.connection.password=${jdbc.password}
+hibernate.connection.url=${jdbc.mysql.url}
+hibernate.connection.username=${jdbc.mysql.username}
+hibernate.connection.password=${jdbc.mysql.password}
 
 
 hibernate.cache.use_second_level_cache=true

Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties
===================================================================
--- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/postgresql.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,9 +1,9 @@
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 # fetch driver from http://jdbc.postgresql.org/
 hibernate.connection.driver_class=org.postgresql.Driver
-hibernate.connection.url=jdbc:postgresql://${jdbc.server}/${jdbc.dbname}
-hibernate.connection.username=${jdbc.username}
-hibernate.connection.password=${jdbc.password}
+hibernate.connection.url=${jdbc.postgresql.url}
+hibernate.connection.username=${jdbc.postgresql.username}
+hibernate.connection.password=${jdbc.postgresql.password}
 
 hibernate.cache.use_second_level_cache=true
 hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Modified: jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties
===================================================================
--- jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/db/src/main/resources/db.properties/sybase.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,8 +1,8 @@
 hibernate.dialect=org.hibernate.dialect.SybaseDialect
 hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver
-hibernate.connection.url=jdbc:jtds:sybase://${jdbc.server}/${jdbc.dbname}
-hibernate.connection.username=${jdbc.username}
-hibernate.connection.password=${jdbc.password}
+hibernate.connection.url=${jdbc.ybase.url}
+hibernate.connection.username=${jdbc.sybase.username}
+hibernate.connection.password=${jdbc.sybase.password}
 
 hibernate.cache.use_second_level_cache=true
 hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Modified: jbpm4/branches/hbraun/modules/distro/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/pom.xml	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/distro/pom.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -11,7 +11,7 @@
 
 <!-- $Id$ -->
 <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 - Distro</name>
   <groupId>org.jbpm.jbpm4</groupId>
@@ -28,18 +28,13 @@
   <!-- Properties -->
   <properties>
   </properties>
-  
-  <!-- DependencyManagement -->
-  <dependencyManagement>
-  </dependencyManagement>
-  
+
   <!-- Dependencies -->
   <dependencies>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-gpd</artifactId>
       <type>zip</type>
-      <version>4.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
@@ -63,6 +58,12 @@
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-jpdl</artifactId>
+      <classifier>config</classifier>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-db</artifactId>
       <version>${version}</version>
     </dependency>
@@ -76,8 +77,19 @@
       <artifactId>jbpm-test-db</artifactId>
       <version>${version}</version>
     </dependency>
-    <!-- 
+
+    <!-- Please sort by groupid -->
     <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>izpack</groupId>
+      <artifactId>standalone-compiler</artifactId>
+    </dependency>
+
+    <!--
+    <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-workspace</artifactId>
       <version>1.0</version>
@@ -85,7 +97,7 @@
     </dependency>
      -->
   </dependencies>
-  
+
   <!-- Plugins -->
   <build>
     <plugins>
@@ -123,8 +135,57 @@
               </descriptors>
             </configuration>
           </execution>
+
+          <!-- Installer -->
+
+          <execution>
+            <id>create-installer</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>directory-single</goal>
+            </goals>
+            <configuration>
+              <finalName>deploy-artifacts</finalName>
+              <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+
         </executions>
       </plugin>
+
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>izpack</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+                <property name="database" value="${database}" />
+                <property name="jboss.home" value="${jboss.home}" />
+                <property name="jboss422.home" value="${jboss422.home}" />
+                <property name="jboss423.home" value="${jboss423.home}" />
+                <property name="jboss500.home" value="${jboss500.home}" />
+                <property name="jbpm.target.container" value="${jbpm.target.container}" />
+                <property name="product.name" value="${project.name}" />
+                <property name="product.short.name" value="${artifactId}" />
+                <property name="product.version" value="${project.version}" />
+                <property name="user.home" value="${user.home}" />
+                <ant antfile="scripts/antrun-installer.xml" target="build-installer" />
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

Added: jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/scripts/antrun-installer.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id: antrun-installer.xml 3319 2008-12-10 14:29:01Z thomas.diesler at jboss.com $ -->
+<project>
+
+  <macrodef name="macro-disable">
+    <attribute name="file" />
+    <attribute name="section" />
+    <sequential>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacetoken>
+        <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacevalue>
+      </replace>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacetoken>
+        <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue>
+      </replace>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="macro-enable">
+    <attribute name="file" />
+    <attribute name="section" />
+    <sequential>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) ===]]></replacetoken>
+        <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (begin) -->]]></replacevalue>
+      </replace>
+      <replace file="@{file}" summary="true">
+        <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken>
+        <replacevalue><![CDATA[<!-- ]]>@{section}<![CDATA[ (end) -->]]></replacevalue>
+      </replace>
+    </sequential>
+  </macrodef>
+
+  <!-- ================================================================== -->
+  <!-- Setup                                                              -->
+  <!-- ================================================================== -->
+  <property name="output.dir" value="${basedir}/target" />
+  <property name="resources.dir" value="${basedir}/src/main/resources" />
+  <property name="filtered.resources.dir" value="${output.dir}/resources" />
+  <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" />
+  <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" />
+  <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" />
+
+  <!-- ================================================================== -->
+  <!-- Initialization                                                     -->
+  <!-- ================================================================== -->
+  <target name="init">
+
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Configuration                                                     -->
+  <!-- ================================================================== -->
+  <target name="configure" depends="init">
+
+    <!--property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/>
+    <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties"/>
+    <macro-disable file="${hsqldb.cfg.xml}" section="Automatic schema creation"/>
+    <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties"/>
+    <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties"/>
+
+    <property name="mysql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.mysql.xml"/>
+    <macro-disable file="${mysql.cfg.xml}" section="JDBC connection properties"/>
+    <macro-disable file="${mysql.cfg.xml}" section="Automatic schema creation"/>
+    <macro-enable file="${mysql.cfg.xml}" section="DataSource properties"/>
+    <macro-enable file="${mysql.cfg.xml}" section="JTA transaction properties"/>
+
+    <property name="postgresql.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.postgresql.xml"/>
+    <macro-disable file="${postgresql.cfg.xml}" section="JDBC connection properties"/>
+    <macro-disable file="${postgresql.cfg.xml}" section="Automatic schema creation"/>
+    <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/>
+    <macro-enable file="${postgresql.cfg.xml}" section="JTA transaction properties"/>
+
+    <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/>
+    <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/>
+    <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/>
+    <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/>
+    <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/-->
+
+    <condition property="database.is.hsqldb" value="true" else="false">
+      <equals arg1="${database}" arg2="hsqldb"/>
+    </condition>
+    <condition property="database.is.mysql" value="true" else="false">
+      <equals arg1="${database}" arg2="mysql"/>
+    </condition>
+    <condition property="database.is.postgresql" value="true" else="false">
+      <equals arg1="${database}" arg2="postgresql"/>
+    </condition>
+    <condition property="database.is.sybase" value="true" else="false">
+      <equals arg1="${database}" arg2="sybase"/>
+    </condition>
+
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Distribution                                                       -->
+  <!-- ================================================================== -->
+  <target name="build-installer" depends="configure">
+
+    <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true">
+      <fileset dir="${resources.dir}/installer" />
+      <filterset>
+        <filter token="database" value="${database}" />
+        <filter token="database.is.hsqldb" value="${database.is.hsqldb}" />
+        <filter token="database.is.mysql" value="${database.is.mysql}" />
+        <filter token="database.is.postgresql" value="${database.is.postgresql}" />
+      	<filter token="database.is.sybase" value="${database.is.sybase}" />
+        <filter token="jbpm.target.container" value="${jbpm.target.container}" />
+        <filter token="jboss.home" value="${jboss.home}" />
+        <filter token="product.version" value="${product.version}" />
+        <filter token="user.home" value="${user.home}" />
+      </filterset>
+    </copy>
+
+    <!-- Allows us to use the IzPack Ant task, standalone-compiler.jar added to Ant lib -->
+    <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask">
+      <classpath>
+        <pathelement path="${maven.runtime.classpath}" />
+      </classpath>
+    </taskdef>
+    <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" />
+    <mkdir dir="${izpack.temp.dir}" />
+
+    <!-- Run installer build -->
+    <echo message="Running IzPack to build the installer..." />
+    <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jbpm-installer-${product.version}.jar"
+      installerType="standard" inheritAll="true" basedir="${izpack.temp.dir}" />
+
+    <!-- Clean working directory -->
+    <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" />
+  </target>
+</project>
\ No newline at end of file

Added: jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/scripts/assembly-deploy-artifacts.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,155 @@
+<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">
+
+  <id>deploy-artifacts</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <!-- Dependency Sets -->
+  <dependencySets>
+
+    <!-- lib -->
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <useStrictFiltering>true</useStrictFiltering>
+      <scope>compile</scope>
+      <unpack>false</unpack>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <useStrictFiltering>true</useStrictFiltering>
+      <scope>provided</scope>
+      <unpack>false</unpack>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <useStrictFiltering>true</useStrictFiltering>
+      <scope>test</scope>
+      <unpack>false</unpack>
+    </dependencySet>
+     <dependencySet>
+      <includes>
+        <include>org.jbpm.jbpm4:jbpm-gpd:zip</include>
+      </includes>
+      <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping>
+      <outputDirectory>gpd</outputDirectory>
+    </dependencySet>
+  </dependencySets>
+
+  <!-- resources
+  <dependencySet>
+    <outputDirectory>resources/jbpm-jpdl-config</outputDirectory>
+    <useStrictFiltering>true</useStrictFiltering>
+    <includes>
+      <include>*:jbpm-jpdl:jar:config</include>
+    </includes>
+    <unpack>true</unpack>
+  </dependencySet-->
+
+  <fileSets>    
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <includes>
+        <include>jboss.eula.txt</include>
+        <include>license.txt</include>
+        <include>readme.html</include>
+        <include>release.notes.html</include>
+      </includes>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../api/target/site/apidocs</directory>
+      <outputDirectory>doc/javadocs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../api/target/schemadoc</directory>
+      <outputDirectory>doc/schemadoc</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../db/target/create</directory>
+      <outputDirectory>db/create</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../db/target/drop</directory>
+      <outputDirectory>db/drop</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../devguide/target/docbook/publish/en</directory>
+      <outputDirectory>doc/devguide</outputDirectory>
+      <excludes>
+        <exclude>**/*.fo</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../userguide/target/docbook/publish/en</directory>
+      <outputDirectory>doc/userguide</outputDirectory>
+      <excludes>
+        <exclude>**/*.fo</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../api/target/schemadocs</directory>
+      <outputDirectory>doc/schemadocs</outputDirectory>
+      <excludes>
+        <exclude>**/*.fo</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../api/src/main/java</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../api/src/main/resources</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../log/src/main/java</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../pvm/src/main/java</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../pvm/src/main/resources</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../jpdl/src/main/java</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../jpdl/src/main/resources</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../task/src/main/java</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../task/src/main/resources</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../test-base/src/main/java</directory>
+      <outputDirectory>src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../examples/src/test/java</directory>
+      <outputDirectory>examples/src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../examples/src/test/resources</directory>
+      <outputDirectory>examples/src</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../examples/src/eclipse</directory>
+      <outputDirectory>examples</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>

Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/ant-actions-spec.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,14 @@
+<antactions>
+  <pack name="Download JBoss-5.0.0">
+    <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml">
+      <property name="install.path" value="$INSTALL_PATH"/>
+      <target name="download-jboss"/>
+    </antcall>
+  </pack>
+  <pack name="Download Eclipse-3.4.0">
+    <antcall order="afterpack" buildfile="$INSTALL_PATH/Uninstaller/download-helper.xml">
+      <property name="install.path" value="$INSTALL_PATH"/>
+      <target name="download-eclipse"/>
+    </antcall>
+  </pack>
+</antactions>
\ No newline at end of file

Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/auto-install-template.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,34 @@
+<AutomatedInstallation langpack="eng">
+  <com.izforge.izpack.panels.HelloPanel />
+  <com.izforge.izpack.panels.TargetPanel>
+    <installpath>@user.home@/jbpm-jpdl- at product.version@</installpath>
+  </com.izforge.izpack.panels.TargetPanel>
+  <com.izforge.izpack.panels.TreePacksPanel>
+    <pack name="jBPM4 Standalone" index="0" selected="true"/>
+    <pack name="jBPM4 JBoss Integration" index="1" selected="true"/>
+    <pack name="JSF-Console" index="2" selected="true"/>
+    <pack name="GWT-Console" index="3" selected="true"/>
+    <pack name="Optional Components" index="4" selected="false"/>
+    <pack name="Download JBoss-5.0.0" index="5" selected="false"/>
+    <pack name="Download Eclipse-3.4.0" index="6" selected="false"/>
+  </com.izforge.izpack.panels.TreePacksPanel>
+  <com.izforge.izpack.panels.UserInputPanel>
+    <userInput>
+      <entry key="jbossTargetServer" value="default" />
+      <entry key="jbossSelection" value="@jbpm.target.container@" />
+    </userInput>
+  </com.izforge.izpack.panels.UserInputPanel>
+  <com.izforge.izpack.panels.UserInputPanel>
+    <userInput>
+      <entry key="dbSelection" value="@database@"/>
+    </userInput>
+  </com.izforge.izpack.panels.UserInputPanel>
+  <com.izforge.izpack.panels.UserInputPanel>
+    <userInput>
+      <entry key="jbossInstallPath" value="@jboss.home@" />
+    </userInput>
+  </com.izforge.izpack.panels.UserInputPanel>
+  <com.izforge.izpack.panels.SummaryPanel />
+  <com.izforge.izpack.panels.InstallPanel />
+  <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>

Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/download-helper.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id: download-helper.xml 3319 2008-12-10 14:29:01Z thomas.diesler at jboss.com $ -->
+<project>
+
+  <target name="download-jboss">
+    <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip?modtime=1228452561&amp;big_mirror=1" dest="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" usetimestamp="true"/>
+    <unzip src="${install.path}/Uninstaller/jboss-5.0.0.GA.zip" dest="${install.path}"/>
+  </target>
+  <target name="download-eclipse">
+    <get src="http://download.eclipse.org/technology/epp/downloads/release/ganymede/R/eclipse-java-ganymede-linux-gtk.tar.gz" 
+      dest="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" usetimestamp="true"/>
+    <untar src="${install.path}/Uninstaller/eclipse-java-ganymede-linux-gtk.tar.gz" dest="${install.path}" compression="gzip"/>
+  </target>
+
+</project>
\ No newline at end of file

Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<installation version="1.0">
+  <!-- 
+    Ant properties in this file can be referenced with @{},
+    otherwise use variables below in installer files with ${} 
+  -->
+  <info>
+    <appname>@{product.name}</appname>
+    <appversion>@{product.version}</appversion>
+    <uninstaller name="remove.task" write="yes" />
+  </info>
+  <guiprefs width="600" height="440" resizable="yes">
+    <!--
+    <laf name="kunststoff">
+      <os family="unix" />
+    </laf>
+    -->
+  </guiprefs>
+  <locale>
+    <langpack iso3="eng" />
+  </locale>
+
+  <!-- It is necessary to include everything needed, in this case ant self -->
+  <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" />
+  <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" />
+
+  <!-- Setup the Ant Action Listener -->  
+  <listeners>
+    <listener installer="AntActionInstallerListener" />
+  </listeners>
+
+  <!-- Resources -->
+  <resources>
+    <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" />
+    <res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" />
+    <res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" />
+  </resources>
+
+  <!-- Variables -->
+  <variables>
+    <variable name="jboss422.home" value="@{jboss422.home}" />
+    <variable name="jboss423.home" value="@{jboss423.home}" />
+    <variable name="jboss500.home" value="@{jboss500.home}" />
+  </variables>
+
+  <!-- Dynamic Variables -->
+  <dynamicvariables>
+    <variable name="jboss.home" value="${jboss422.home}" condition="isJBoss422" />
+    <variable name="jboss.home" value="${jboss423.home}" condition="isJBoss423" />
+    <variable name="jboss.home" value="${jboss500.home}" condition="isJBoss500" />
+  </dynamicvariables>
+
+  <!-- Conditions -->
+  <conditions>
+    <!-- Target Server Conditions -->
+    <condition type="variable" id="isJBoss422">
+      <name>jbossSelection</name>
+      <value>jboss422</value>
+    </condition>
+    <condition type="variable" id="isJBoss423">
+      <name>jbossSelection</name>
+      <value>jboss423</value>
+    </condition>
+    <condition type="variable" id="isJBoss500">
+      <name>jbossSelection</name>
+      <value>jboss500</value>
+    </condition>
+    
+    <!-- Target Database Conditions -->
+    <condition type="variable" id="isHypersonic">
+      <name>dbSelection</name>
+      <value>hsqldb</value>
+    </condition>
+    <condition type="variable" id="isMySQL">
+      <name>dbSelection</name>
+      <value>mysql</value>
+    </condition>
+    <condition type="variable" id="isPostgreSQL">
+      <name>dbSelection</name>
+      <value>postgresql</value>
+    </condition>
+    <condition type="variable" id="isSybase">
+      <name>dbSelection</name>
+      <value>sybase</value>
+    </condition>
+  </conditions>
+
+  <!-- Panels -->
+  <panels>
+    <panel classname="HelloPanel" />
+    <panel classname="TargetPanel" />
+    <panel classname="TreePacksPanel" />
+    <panel classname="UserInputPanel" />
+    <panel classname="UserInputPanel" />
+    <panel classname="UserInputPanel" />
+    <panel classname="SummaryPanel" />
+    <panel classname="InstallPanel" />
+    <panel classname="FinishPanel" />
+  </panels>
+
+  <!-- Packs -->
+  <packs>
+  
+    <!-- 
+    ********************************
+    *                              *  
+    *   jBPM Standalone            *
+    *                              *
+    ********************************
+    -->
+    
+    <pack name="jBPM4 Standalone" required="yes" preselected="yes">
+      <description>The jBPM4 Standalone Components</description>
+
+      <!-- jbpm4/ -->
+      <file src="@{deploy.artifacts.dir}/release.notes.html" targetdir="$INSTALL_PATH" override="true" />
+      <file src="@{deploy.artifacts.dir}/jboss.eula.txt" targetdir="$INSTALL_PATH" override="true" />
+
+      <!-- 
+        jbpm4/config
+      -->
+      <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
+        unpack="true" override="true" />
+      
+      <!-- 
+        jbpm4/database
+      -->
+      <file src="@{deploy.artifacts.dir}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
+        unpack="true" override="true" />
+
+      <!-- 
+        jbpm4/docs
+      -->
+      <!--file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"  unpack="true" override="true" />
+      <fileset dir="@{deploy.artifacts.dir}/javadoc" targetdir="$INSTALL_PATH/docs" override="true"/-->
+
+      <!-- 
+        jbpm4/lib
+      -->
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
+        <include name="*.jar" />        
+      </fileset>      
+    </pack>
+
+    <!-- 
+    ********************************
+    *                              *  
+    *   JBoss Integration          *
+    *                              *
+    ********************************
+    -->
+    
+    <pack name="jbpm4 JBoss Integration" required="no" preselected="yes">
+    
+      <description>The jbpm4 JBoss Integration</description>
+ 
+      <!-- jbpm/jbpm-service.sar -->
+      <!--fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
+        <include>hibernate.properties</include>
+        <include>jbpm-*-ds.xml</include>
+        <include>jbpm.cfg.xml</include>
+        <include>logging.properties</include>
+      </fileset>
+      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
+        <include name="bpm-process-deployer.xml" />
+      </fileset-->
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
+        <include name="jbpm-db.jar" />
+        <include name="jbpm-jpdl.jar" />
+        <include name="jbpm-jpdl-config.jar" />
+        <include name="jbpm-log.jar" />
+        <include name="jbpm-pvm.jar" />
+        <include name="jbpm-task.jar" />        
+      </fileset>
+      
+      <!-- jbpm/jbpm-enterprise.jar -->
+      <!--file src="@{deploy.artifacts.dir}/lib/jbpm-enterprise.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
+        unpack="true" override="true" /-->
+
+
+      <!-- jbpm/jbpm-userguide.war -->
+      <!--file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
+        unpack="true" override="true" /-->
+        
+      <!-- jbpm-destinations-service -->
+      <!--file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /-->
+      
+      <!-- Database configs to docs/examples/jbpm -->
+      <!--fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true">
+        <include name="hibernate.cfg.hsqldb.xml"/>
+        <include name="hibernate.cfg.mysql.xml"/>
+        <include name="hibernate.cfg.postgresql.xml"/>
+        <include name="hibernate.cfg.sybase.xml"/>
+        <include name="jbpm-hsqldb-ds.xml"/>
+        <include name="jbpm-mysql-ds.xml"/>
+        <include name="jbpm-postgresql-ds.xml"/>
+        <include name="jbpm-sybase-ds.xml"/>
+      </fileset-->
+      
+      <!-- Database Hypsersonic
+      <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" 
+        target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+      <fileset dir="@{resources.dir}/database" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic">
+        <include name="hypersonic/jbpmDB.*" />
+      </fileset>-->
+        
+      <!-- Database MySQL
+      <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/>
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" condition="isMySQL" 
+        target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL">
+        <include name="mysql-connector-java.jar" />
+      </fileset> -->
+      
+    </pack>
+
+    <!-- 
+    ********************************
+    *                              *  
+    *   GWT Console                *
+    *                              *
+    ********************************
+    -->
+    
+    <!--pack name="GWT-Console" parent="jbpm4 JBoss Integration" required="no" preselected="yes">
+      <description>GWT-Console</description>
+      <file src="@{deploy.artifacts.dir}/lib/gwt-console.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/report-server.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/gwt-console-server-report.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/report-engine.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
+    </pack-->
+    
+    <!-- 
+    ********************************
+    *                              *  
+    *   Optional Components        *
+    *                              *
+    ********************************
+    -->
+    
+    <pack name="Optional Components" required="no" preselected="no">
+      <description>Optional jbpm4 Components</description>
+    </pack>
+
+    <!-- JBoss-5.0.0 -->
+    <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no">
+      <description>Download and Install JBoss-5.0.0</description>
+      <!-- http://jira.codehaus.org/browse/IZPACK-158 -->
+      <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/>
+    </pack>
+
+    <!-- Eclipse-3.4.0 -->
+    <!--pack name="Download Eclipse-3.4.0" required="no" parent="Optional Components" preselected="no">
+      <description>Download and Install Eclipse-3.4.0</description>
+      http://jira.codehaus.org/browse/IZPACK-158
+      <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/>
+    </pack-->
+
+  </packs>
+</installation>
\ No newline at end of file

Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/target-panel-dir.txt	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1 @@
+$USER_HOME/jbpm- at product.version@

Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/user-input-spec.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,34 @@
+<userInput>
+  <panel order="0">
+    <createForPack name="jBPM4 JBoss Integration" />
+    <field type="radio" variable="jbossSelection">
+      <description align="left" txt="Please choose your target server" />
+      <spec>
+        <choice txt="JBoss-5.0.0" value="jboss500" set="true"/>
+        <choice txt="JBoss-4.2.3" value="jboss423"/>
+        <choice txt="JBoss-4.2.2" value="jboss422"/>
+      </spec>
+    </field>
+    <field type="text" variable="jbossTargetServer">
+      <spec txt="Server:" size="15" set="default" />
+    </field>
+  </panel>
+  <panel order="1">
+    <createForPack name="jBPM4 JBoss Integration" />
+    <field type="radio" variable="dbSelection">
+      <description align="left" txt="Please choose your target database" />
+      <spec>
+        <choice txt="Hypersonic" value="hsqldb"/>
+        <!--choice txt="MySQL" value="mysql" set="true"/-->
+        <!-- choice txt="PostgreSQL" value="postgresql"/-->
+        <!--choice txt="Sybase" value="sybase"/-->
+      </spec>
+    </field>
+  </panel>
+  <panel order="2">
+    <createForPack name="jBPM4 JBoss Integration" />
+    <field type="dir" align="left" variable="jbossInstallPath">
+      <spec txt="JBoss Home:" size="25" set="${jboss.home}" />
+    </field>
+  </panel>
+</userInput>
\ No newline at end of file

Added: jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/release.notes.html	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,87 @@
+<body><h1>jBPM-4.0.0-SNAPSHOT Release Notes</h1>
+<!--h3>Bug</h3>
+<ul>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1716">JBPM-1716</a>] -         NPE in Transition.fireSuperStateEnterEvents() when destination is null </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1756">JBPM-1756</a>] -         NullPointerException using bcc recipients in org.jbpm.mail.Mail </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1778">JBPM-1778</a>] -         Empty map variables on process creation is set as null </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1811">JBPM-1811</a>] -         JmsMessageTest fails intermitently on HSQLDB </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1829">JBPM-1829</a>] -         Sybase transaction log full - dump needed </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1830">JBPM-1830</a>] -         Fix AppServerConfigurationsTest for sybase on jboss500 </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1913">JBPM-1913</a>] -         Support JBoss AS 5.0 for JSF Console </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1921">JBPM-1921</a>] -         getGroupTaskList(List actorids) behaviour changed </li>
+</ul>
+<p> </p>
+<h3>Feature Request</h3>
+<ul>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1888">JBPM-1888</a>] -         Allow unlocking Token without knowing the lock owner </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1909">JBPM-1909</a>] -         Fix SubjectAuthenticationService </li>
+</ul>
+<p> </p>
+<h3>Quality Risk</h3>
+<ul>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1765">JBPM-1765</a>] -         Unclosed InputStream in org.jbpm.util.ClassLoaderUtil.getProperties </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1887">JBPM-1887</a>] -         ExceptionHandler may cause infinite loop </li>
+</ul>
+<p> </p>
+<h3>Task</h3>
+<ul>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1303">JBPM-1303</a>] -         Add installer support for jboss-5.0.0 </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1764">JBPM-1764</a>] -         Deadlocks make job execution tests fail on Sybase </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1775">JBPM-1775</a>] -         verify if collection exceptionHandlers can be loaded lazy </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1814">JBPM-1814</a>] -         make jbpm installation in jboss optional </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1816">JBPM-1816</a>] -         Sanitize tests that leak JDBC connections </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1819">JBPM-1819</a>] -         re-enable the standard configuration </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1823">JBPM-1823</a>] -         re-enable the datbase upgrade tool </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1824">JBPM-1824</a>] -         Investigate core test failures against Sybase </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1831">JBPM-1831</a>] -         Provide a start/stop script for sybase </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1843">JBPM-1843</a>] -         Revert to jbpm-3.2.2 schema and provide a defined migration path </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1852">JBPM-1852</a>] -         Fix sporadic MailTest failure </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1854">JBPM-1854</a>] -         Update to jbpm-gpd-3.1.6 </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1855">JBPM-1855</a>] -         Release jBPM 3.3.1 GA </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1856">JBPM-1856</a>] -         Support API-1.0.0 Alpha3 on jBPM3 </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1866">JBPM-1866</a>] -         add javadocs to installer </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1883">JBPM-1883</a>] -         Provide an initial implementation of an AS4 deployer </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1884">JBPM-1884</a>] -         Provide an initial implementation of an AS5 deployer </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1894">JBPM-1894</a>] -         Check jBPM library versions </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1902">JBPM-1902</a>] -         Add support for JBoss-5.0.0.GA </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1904">JBPM-1904</a>] -         Add toString() to Commands </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1905">JBPM-1905</a>] -         Improve Commands </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1919">JBPM-1919</a>] -         Ensure backward compatibility of the API </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1920">JBPM-1920</a>] -         Include SOA-P overlays in jbpm build </li>
+<li>[<a href="https://jira.jboss.org/jira/browse/JBPM-1932">JBPM-1932</a>] -         Release the JSF Console 3.3.1.GA </li>
+</ul>
+<h3>Known limitations</h3>
+<h3>XML editing in the process designer</h3>
+<p>Direct editing of XML can lead to crashes in the graphical designer. This will be fixed in one of the next releases.  Before you start editing the process XML source, make sure you create a backup copy.</p>
+<h3>Transition buttons in task forms</h3>
+<p>When generating a task form for a task, the transitions are not  automatically populated in the generation dialog.  Users have to  enter the transition names and the button labels manually.  If you  don't do this no transition buttons will be generated to complete the  task in the task form.</p>
+<p><strong>Workaround</strong>: First option is to add the transition buttons  in the task form generation dialog.  If you generated a task form without transition buttons, you still can complete the task with the console.   Just save the variables in the task form and then in the 'Views' menu,  select 'Transitions'.  There you can click the 'end task' link for  each of the available transitions.</p>
+<h3>Security vulnerability for GPD deployment</h3>
+<p>In the suite distribution, the console that is deployed in the server contains a servlet that allows the designer to deploy processes directly  to a running server.  This servlet is unprotected and people could load  any process into a default installation.  <a href="https://jira.jboss.org/jira/browse/GPD-278">[GPD-278]</a></p>
+<h3>Excluded test cases</h3>
+<p> </p>
+<p><strong>Core tests, HSQLDB</strong></p>
+<p> </p>
+<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --&gt;</p><p>&lt;exclude&gt;org/jbpm/db/JbpmSchemaDbTest.java&lt;/exclude&gt;</p></pre>
+<p> </p>
+<p><strong>Core tests - MySQL</strong></p>
+<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1166] SEAM timer transaction integration --&gt;<br />&lt;exclude&gt;org/jbpm/seam/JobExecutorCustomizationTest.java&lt;/exclude&gt;<br />&lt;!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema  --&gt;<br />&lt;exclude&gt;org/jbpm/db/JbpmSchemaDbTest.java&lt;/exclude&gt;</p></pre>
+<p> </p>
+<p><strong>Core test, Sybase</strong></p>
+<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema  --&gt;<br />&lt;exclude&gt;org/jbpm/db/JbpmSchemaDbTest.java&lt;/exclude&gt;</p></pre>
+<p> </p>
+<p><strong>Enterprise tests - HSQLDB</strong></p>
+<p> </p>
+<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1708] Enterprise EjbSchedulerTest fails --&gt;</p><p>&lt;exclude&gt;org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java&lt;/exclude&gt;</p></pre>
+<p> </p>
+<p><strong>Enterprise tests, Sybase</strong></p>
+<p> </p>
+<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1818] Use Sybase instance that supports XA Transaction --&gt;<br />&lt;exclude&gt;org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java&lt;/exclude&gt;<br />&lt;exclude&gt;org/jbpm/persistence/jta/JtaDbPersistenceTest.java&lt;/exclude&gt;<br />&lt;exclude&gt;org/jbpm/msg/jms/JmsMessageTest.java&lt;/exclude&gt;</p></pre>
+<p> </p>
+<p> </p>
+<p><strong>Examples tests, Sybase</strong></p>
+<p> </p>
+<pre class="jive_text_macro jive_macro_code" jivemacro="code" ___default_attr="plain"><p>&lt;!-- [JBPM-1827] Investigate example test failures against Sybase --&gt;</p><p>&lt;exclude&gt;org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java&lt;/exclude&gt;</p></pre>
+<p> </p-->
+
+</body>
\ No newline at end of file

Added: jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/enterprise/jbpm4-enterprise.iml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jbpm4-toplevel" />
+    <orderEntry type="module" module-name="jbpm4-pvm" />
+    <orderEntry type="module" module-name="jbpm4-api" />
+    <orderEntry type="module-library">
+      <library name="M2 Dep: cargo:cargo:jar:0.5:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cargo/cargo/0.5/cargo-0.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: junit:junit:jar:3.8.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:runtime">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: asm:asm:jar:1.5.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.springframework:spring:jar:2.5.4:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/springframework/spring/2.5.4/spring-2.5.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: xerces:xercesImpl:jar:2.6.2:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.3/livetribe-jsr223-2.0.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: juel:juel:jar:2.1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: rhino:js:jar:1.5R4.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: ant:ant:jar:1.5.4:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: httpunit:httpunit:jar:1.6:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: jbpm4/branches/hbraun/modules/enterprise/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/pom.xml	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/enterprise/pom.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -34,7 +34,7 @@
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-api</artifactId>
       <version>${version}</version>
-    </dependency>
+    </dependency>  
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-pvm</artifactId>

Modified: jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -16,9 +16,9 @@
         <include>aspectj:aspectjrt:jar</include>
         <include>cactus:cactus</include>
         <include>junit:junit</include>
-        <include>org.jbpm.jbpm4:jbpm-api</include>
+        <!--include>org.jbpm.jbpm4:jbpm-api</include>
         <include>org.jbpm.jbpm4:jbpm-pvm</include>
-        <include>org.jbpm.jbpm4:jbpm-log</include>
+        <include>org.jbpm.jbpm4:jbpm-log</include-->
       </includes>
       <unpack>false</unpack>
       <scope>test</scope>

Deleted: jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,6 +0,0 @@
-hibernate.connection.datasource java\:comp/env/jdbc/JbpmDataSource
-hibernate.transaction.factory_class    			org.hibernate.transaction.JTATransactionFactory
-hibernate.transaction.manager_lookup_class	org.hibernate.transaction.JBossTransactionManagerLookup
-hibernate.cache.provider_class     			    org.hibernate.cache.HashtableCacheProvider
-hibernate.format_sql                   			true
-hibernate.use_sql_comments             			true

Added: jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml
===================================================================
--- jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/examples/jbpm4-examples.iml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Deleted: jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/examples/src/test/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,11 +0,0 @@
-hibernate.dialect                      org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class      org.hsqldb.jdbcDriver
-hibernate.connection.url               jdbc:hsqldb:mem:.
-hibernate.connection.username          sa
-hibernate.connection.password
-hibernate.hbm2ddl.auto                 create-drop
-hibernate.cache.use_second_level_cache true
-hibernate.cache.provider_class         org.hibernate.cache.HashtableCacheProvider
-# hibernate.show_sql                     true
-# hibernate.format_sql                   true
-# hibernate.use_sql_comments             true

Modified: jbpm4/branches/hbraun/modules/jpdl/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/pom.xml	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/jpdl/pom.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-  <!-- ====================================================================== -->
-  <!--                                                                        -->
-  <!--  JBoss, the OpenSource J2EE webOS                                      -->
-  <!--                                                                        -->
-  <!--  Distributable under LGPL license.                                     -->
-  <!--  See terms of license at http://www.gnu.org.                           -->
-  <!--                                                                        -->
-  <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
 
-  <!-- $Id: pom.xml 1790 2008-07-31 12:13:06Z tom.baeyens at jboss.com $ -->
+<!-- $Id: pom.xml 1790 2008-07-31 12:13:06Z 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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -35,6 +35,8 @@
 
   <!-- Dependencies -->
   <dependencies>
+
+    <!-- JBPM4 -->
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-pvm</artifactId>
@@ -45,6 +47,8 @@
       <artifactId>jbpm-task</artifactId>
       <version>${version}</version>
     </dependency>
+
+    <!-- 3rd Party -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -61,16 +65,83 @@
 
   <!-- Plugins -->
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-db-scripts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+                <ant antfile="scripts/build.schema.xml" target="create-schema" />
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
             <!-- https://jira.jboss.org/jira/browse/JBPM-1759 -->
-            <exclude>**/*.java</exclude>
+            <exclude>org/jbpm/jpdl/controlflow/DecisionExpressionTest.java</exclude>
+            <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude>            
+            <exclude>org/jbpm/jpdl/parsing/JpdlSchemaTest.java</exclude>
+            <exclude>org/jbpm/jpdl/parsing/ProcessParsingTest.java</exclude>
+            <exclude>org/jbpm/jpdl/parsing/TransitionParsingTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.build.finalName}</finalName>
+              <appendAssemblyId>true</appendAssemblyId>
+              <descriptors>
+                <descriptor>scripts/assembly-config.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install.hibernate.database.properties</id>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy file="target/classes/db.properties/${database}.properties"
+                      tofile="target/classes/hibernate.properties"
+                      overwrite="true" />
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Added: jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/scripts/assembly-config.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,20 @@
+<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">
+  <id>config</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.outputDirectory}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>                
+        <include>jbpm.cfg.xml</include>
+        <include>logging.properties</include>
+        <include>hibernate.cfg.xml</include>
+        <include>db.properties/*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Added: jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/scripts/build.schema.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!--  JBoss, the OpenSource J2EE webOS                            -->
+<!--  Distributable under LGPL license.                           -->
+<!--  See terms of license at http://www.gnu.org.                 -->
+<!-- ============================================================ -->
+
+<!-- $Id: antrun-jbpmschema.xml 2999 2008-11-19 16:16:01Z thomas.diesler at jboss.com $ -->
+
+<project>
+
+  <!-- ================================================================== -->
+  <!-- jBPM Database schema                                               -->
+  <!-- ================================================================== -->
+
+  <target name="create-schema">
+    <echo message="${maven.runtime.classpath}"/>
+      
+    <taskdef name="schemaexport"
+        classname="org.hibernate.tool.hbm2ddl.SchemaExportTask">
+      <classpath path="${maven.runtime.classpath}"/>
+    </taskdef>
+    
+    <property name="cfg" value="target/classes/hibernate.cfg.xml" />
+
+    <mkdir dir="target/classes/create"/>
+    <mkdir dir="target/classes/drop"/>
+
+    <schemaexport properties="target/classes/db.properties/hsqldb.properties"
+                  output="target/classes/create/jbpm.hsqldb.create.sql" 
+                  create="yes" drop="no" config="${cfg}" text="yes" />
+    <schemaexport properties="target/classes/db.properties/hsqldb.properties"
+                  output="target/classes/drop/jbpm.hsqldb.drop.sql" 
+                  create="no" drop="yes" config="${cfg}" text="yes" />
+
+    <schemaexport properties="target/classes/db.properties/mysql.properties"
+                  output="target/classes/create/jbpm.mysql.create.sql"
+    	            delimiter=";"
+                  create="yes" drop="no" config="${cfg}" text="yes" />
+    <schemaexport properties="target/classes/db.properties/mysql.properties"
+                  output="target/classes/drop/jbpm.mysql.drop.sql" 
+                  delimiter=";"
+                  create="no" drop="yes" config="${cfg}" text="yes" />
+
+    <schemaexport properties="target/classes/db.properties/oracle.properties"
+                  output="target/classes/create/jbpm.oracle.create.sql" 
+                  create="yes" drop="no" config="${cfg}" text="yes" 
+                  delimiter=";" />
+    <schemaexport properties="target/classes/db.properties/oracle.properties"
+                  output="target/classes/drop/jbpm.oracle.drop.sql" 
+                  create="no" drop="yes" config="${cfg}" text="yes" 
+                  delimiter=";" />
+
+    <schemaexport properties="target/classes/db.properties/postgresql.properties"
+                  output="target/classes/create/jbpm.postgresql.create.sql" 
+                  create="yes" drop="no" config="${cfg}" text="yes" />
+    <schemaexport properties="target/classes/db.properties/postgresql.properties"
+                  output="target/classes/drop/jbpm.postgresql.drop.sql" 
+                  create="no" drop="yes" config="${cfg}" text="yes" />
+
+    <schemaexport properties="target/classes/db.properties/sybase.properties"
+                  output="target/classes/create/jbpm.sybase.create.sql" 
+                  create="yes" drop="no" config="${cfg}" text="yes" />
+    <schemaexport properties="target/classes/db.properties/sybase.properties"
+                  output="target/classes/drop/jbpm.sybase.drop.sql" 
+                  create="no" drop="yes" config="${cfg}" text="yes" />
+
+  </target>
+  
+</project>

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/db2.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=org.hibernate.dialect.DB2Dialect
+# fetch driver from http://www-128.ibm.com/developerworks/db2/downloads/jcc/
+hibernate.connection.driver_class=com.ibm.db2.jcc.DB2Driver
+hibernate.connection.url=jdbc:db2://${jdbc.server}:50000/${jdbc.dbname}
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/derby.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+# fetch driver from http://db.apache.org/derby
+hibernate.connection.driver_class=org.apache.derby.jdbc.EmbeddedDriver
+hibernate.connection.url=jdbc:derby:build/derby/jbpmtest;create=true 
+hibernate.connection.username=username
+hibernate.connection.password=password
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/firebird.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=org.hibernate.dialect.FirebirdDialect
+# fetch driver from http://firebird.sourceforge.net/
+hibernate.connection.driver_class=org.firebirdsql.jdbc.FBDriver
+hibernate.connection.url=jdbc:firebirdsql:${jdbc.server}:${jdbc.dbname}
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/frontbase.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=org.hibernate.dialect.FrontbaseDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/hsqldb.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,11 @@
+##
+## jbpm-db hsqldb config
+##
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=${jdbc.hsql.url}
+hibernate.connection.username=${jdbc.hsql.username}
+hibernate.connection.password=${jdbc.hsql.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/informix.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=	org.hibernate.dialect.InformixDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/ingres.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=org.hibernate.dialect.IngresDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/interbase.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=org.hibernate.dialect.InterbaseDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mckoi.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=	org.hibernate.dialect.MckoiDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mssql.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,10 @@
+hibernate.dialect=org.hibernate.dialect.SQLServerDialect
+# fetch driver from http://msdn.microsoft.com/data/jdbc
+hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver
+hibernate.connection.url=jdbc:jtds:sqlserver://${jdbc.server}:1433/${jdbc.dbname} 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+hibernate.query.substitutions=true 1, false 0
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/mysql.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,12 @@
+##
+## jbpm-db mysql config
+##
+hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
+hibernate.connection.driver_class=com.mysql.jdbc.Driver
+hibernate.connection.url=${jdbc.mysql.url}
+hibernate.connection.username=${jdbc.mysql.username}
+hibernate.connection.password=${jdbc.mysql.password}
+
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/oracle.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,14 @@
+hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
+# for Oracle 8 compatibility use
+#hibernate.dialect=org.hibernate.dialect.OracleDialect
+
+# fetch driver from http://www.oracle.com
+hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver
+hibernate.connection.url=jdbc:oracle:thin:@${jdbc.server}:1521:${jdbc.dbname}
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+hibernate.query.substitutions=true 1, false 0
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/pointbase.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,10 @@
+hibernate.dialect=org.hibernate.dialect.PointbaseDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/postgresql.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,10 @@
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+# fetch driver from http://jdbc.postgresql.org/
+hibernate.connection.driver_class=org.postgresql.Driver
+hibernate.connection.url=${jdbc.postgresql.url}
+hibernate.connection.username=${jdbc.postgresql.username}
+hibernate.connection.password=${jdbc.postgresql.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/progress.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,10 @@
+hibernate.dialect=org.hibernate.dialect.ProgressDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sapdb.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,10 @@
+hibernate.dialect=org.hibernate.dialect.SAPDBDialect
+# fetch driver from http://google.com
+hibernate.connection.driver_class=
+hibernate.connection.url= 
+hibernate.connection.username=${jdbc.username}
+hibernate.connection.password=${jdbc.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/db.properties/sybase.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,9 @@
+hibernate.dialect=org.hibernate.dialect.SybaseDialect
+hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver
+hibernate.connection.url=${jdbc.ybase.url}
+hibernate.connection.username=${jdbc.sybase.username}
+hibernate.connection.password=${jdbc.sybase.password}
+
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/hibernate.cfg.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE hibernate-configuration PUBLIC
+          "-//Hibernate/Hibernate Configuration DTD 2.0//EN"
+          "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd">
+
+<hibernate-configuration>
+
+    <session-factory>
+      <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
+      <mapping resource="jbpm.pvm.wire.hbm.xml" />
+      <mapping resource="jbpm.pvm.definition.hbm.xml" />
+      <mapping resource="jbpm.pvm.execution.hbm.xml" />
+      <mapping resource="jbpm.pvm.variable.hbm.xml" />
+      <mapping resource="jbpm.pvm.job.hbm.xml" />
+      <mapping resource="jbpm.task.hbm.xml" />
+      <mapping resource="jbpm.jpdl.hbm.xml" />
+    </session-factory>
+
+</hibernate-configuration>

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/jbpm.cfg.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+  <process-engine>
+  
+    <deployer-manager>
+      <assign-file-type>
+        <file extension=".jpdl.xml" type="jpdl" />
+      </assign-file-type>
+      <parse-jpdl />
+      <check-process />
+      <check-problems />
+      <save />
+    </deployer-manager>
+    
+    <process-service />
+    <execution-service />
+    <management-service />
+    <task-service />
+  
+    <command-service>
+      <retry-interceptor />
+      <environment-interceptor />
+      <standard-transaction-interceptor />
+    </command-service>
+    
+    <hibernate-configuration>       
+      <properties resource="hibernate.properties" />      
+      <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
+      <mapping resource="jbpm.pvm.wire.hbm.xml" />
+      <mapping resource="jbpm.pvm.definition.hbm.xml" />
+      <mapping resource="jbpm.pvm.execution.hbm.xml" />
+      <mapping resource="jbpm.pvm.variable.hbm.xml" />
+      <mapping resource="jbpm.pvm.job.hbm.xml" />
+      <mapping resource="jbpm.jpdl.hbm.xml" />
+      <mapping resource="jbpm.task.hbm.xml" />
+      <cache-configuration resource="jbpm.pvm.cache.xml" 
+                           usage="nonstrict-read-write" />
+    </hibernate-configuration>
+    
+    <hibernate-session-factory />
+    
+    <job-executor auto-start="false" />
+    <job-test-helper />
+
+    <id-generator />
+    <types resource="jbpm.pvm.types.xml" />
+
+    <business-calendar>
+      <monday    hours="9:00-12:00 and 12:30-17:00"/>
+      <tuesday   hours="9:00-12:00 and 12:30-17:00"/>
+      <wednesday hours="9:00-12:00 and 12:30-17:00"/>
+      <thursday  hours="9:00-12:00 and 12:30-17:00"/>
+      <friday    hours="9:00-12:00 and 12:30-17:00"/>
+      <holiday period="01/07/2008 - 31/08/2008"/>
+    </business-calendar>
+  
+  </process-engine>
+
+  <environment>
+    <hibernate-session />
+    <transaction />
+    <pvm-db-session />
+    <job-db-session />
+    <task-db-session />
+    <message-session />
+    <timer-session />
+  </environment>
+
+</jbpm-configuration>

Added: jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/jpdl/src/main/resources/logging.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,28 @@
+handlers= java.util.logging.ConsoleHandler
+# to add the error triggered file handler
+# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler
+
+redirect.commons.logging = enabled
+
+java.util.logging.ConsoleHandler.level = FINEST
+java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter
+
+# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
+# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
+# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log
+
+# For example, set the com.xyz.foo logger to only log SEVERE messages:
+# com.xyz.foo.level = SEVERE
+
+org.jbpm.level=FINEST
+org.jbpm.pvm.internal.tx.level=FINE
+org.jbpm.pvm.internal.wire.level=FINE
+org.jbpm.pvm.internal.util.level=FINE
+
+org.hibernate.level=FINEST
+org.hibernate.cfg.HbmBinder.level=SEVERE
+org.hibernate.cfg.SettingsFactory.level=SEVERE
+# org.hibernate.SQL.level=FINEST
+# org.hibernate.type.level=FINEST
+# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
+# org.hibernate.transaction.level=FINEST

Deleted: jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/jpdl/src/test/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,11 +0,0 @@
-hibernate.dialect                      org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class      org.hsqldb.jdbcDriver
-hibernate.connection.url               jdbc:hsqldb:mem:.
-hibernate.connection.username          sa
-hibernate.connection.password
-hibernate.hbm2ddl.auto                 create-drop
-hibernate.cache.use_second_level_cache true
-hibernate.cache.provider_class         org.hibernate.cache.HashtableCacheProvider
-# hibernate.show_sql                     true
-hibernate.format_sql                   true
-hibernate.use_sql_comments             true

Modified: jbpm4/branches/hbraun/modules/pvm/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/pvm/pom.xml	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/pvm/pom.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-  <!-- ====================================================================== -->
-  <!--                                                                        -->
-  <!--  JBoss, the OpenSource J2EE webOS                                      -->
-  <!--                                                                        -->
-  <!--  Distributable under LGPL license.                                     -->
-  <!--  See terms of license at http://www.gnu.org.                           -->
-  <!--                                                                        -->
-  <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
 
-  <!-- $Id$ -->
+<!-- $Id$ -->
 
 <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 - PVM</name>
@@ -31,7 +31,7 @@
   <!-- Properties -->
   <properties>
     <table.prefix>JBPM_</table.prefix>
-    <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
+    <!--test.resources.directory>${project.build.directory}/test-resources</test.resources.directory-->
   </properties>
 
   <!-- Dependencies -->
@@ -48,7 +48,7 @@
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-test-base</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -108,6 +108,7 @@
 
             <!-- https://jira.jboss.org/jira/browse/JBPM-1965 -->
             <exclude>**/NormalMessageTest.java</exclude>
+            <exclude>org/jbpm/pvm/internal/expr/JuelExpressionTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -117,7 +118,7 @@
   <!-- Profiles -->
   <profiles>
   </profiles>
-  
+
   <reporting>
     <plugins>
       <plugin>
@@ -126,11 +127,13 @@
         <configuration>
           <quiet>true</quiet>
           <source>1.5</source>
+          <target>1.5</target>
           <verbose>false</verbose>
-          <noqualifier>all</noqualifier> 
+          <noqualifier>all</noqualifier>
           <excludePackageNames>*.internal:*.test</excludePackageNames>
         </configuration>
       </plugin>
+
     </plugins>
   </reporting>
 

Added: jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/pvm/src/main/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,8 @@
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.connection.url=jdbc:hsqldb:mem:.
+hibernate.connection.username=sa
+hibernate.connection.password=
+hibernate.hbm2ddl.auto=create-drop
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider

Deleted: jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/pvm/src/test/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,11 +0,0 @@
-hibernate.dialect                      org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class      org.hsqldb.jdbcDriver
-hibernate.connection.url               jdbc:hsqldb:mem:.
-hibernate.connection.username          sa
-hibernate.connection.password
-hibernate.hbm2ddl.auto                 create-drop
-hibernate.cache.use_second_level_cache true
-hibernate.cache.provider_class         org.hibernate.cache.HashtableCacheProvider
-# hibernate.show_sql                     true
-# hibernate.format_sql                   true
-# hibernate.use_sql_comments             true

Deleted: jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/task/src/test/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,11 +0,0 @@
-hibernate.dialect                      org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class      org.hsqldb.jdbcDriver
-hibernate.connection.url               jdbc:hsqldb:mem:.
-hibernate.connection.username          sa
-hibernate.connection.password
-hibernate.hbm2ddl.auto                 create-drop
-hibernate.cache.use_second_level_cache true
-hibernate.cache.provider_class         org.hibernate.cache.HashtableCacheProvider
-# hibernate.show_sql                     true
-hibernate.format_sql                   true
-hibernate.use_sql_comments             true

Added: jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml
===================================================================
--- jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/test-db/jpm4-test-db.iml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Deleted: jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/test-db/src/main/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,11 +0,0 @@
-hibernate.dialect                      org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class      org.hsqldb.jdbcDriver
-hibernate.connection.url               jdbc:hsqldb:mem:.
-hibernate.connection.username          sa
-hibernate.connection.password
-hibernate.hbm2ddl.auto                 create-drop
-hibernate.cache.use_second_level_cache true
-hibernate.cache.provider_class         org.hibernate.cache.HashtableCacheProvider
-# hibernate.show_sql                     true
-# hibernate.format_sql                   true
-# hibernate.use_sql_comments             true

Deleted: jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties
===================================================================
--- jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/modules/test-load/src/test/resources/hibernate.properties	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,16 +0,0 @@
-hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class=org.hsqldb.jdbcDriver
-hibernate.connection.url=jdbc:hsqldb:mem:.
-hibernate.connection.username=sa
-hibernate.connection.password=
-
-hibernate.hbm2ddl.auto=create-drop
-
-hibernate.cache.use_second_level_cache=true
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-
-# hibernate.jdbc.batch_size=1
-
-# hibernate.show_sql                     true
-# hibernate.format_sql                   true
-# hibernate.use_sql_comments             true

Modified: jbpm4/branches/hbraun/pom.xml
===================================================================
--- jbpm4/branches/hbraun/pom.xml	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/pom.xml	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-  <!-- ====================================================================== -->
-  <!--                                                                        -->
-  <!--  JBoss, the OpenSource J2EE webOS                                      -->
-  <!--                                                                        -->
-  <!--  Distributable under LGPL license.                                     -->
-  <!--  See terms of license at http://www.gnu.org.                           -->
-  <!--                                                                        -->
-  <!-- ====================================================================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
 
-  <!-- $Id$ -->
+<!-- $Id$ -->
 
 <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>
 
@@ -29,24 +29,27 @@
   </organization>
 
   <!-- Modules -->
-  <modules>
+  <modules>    
     <module>modules/api</module>
-    <module>modules/examples</module>
-    <module>modules/enterprise</module>
+    <!--module>modules/examples</module>
+    <module>modules/enterprise</module-->
     <module>modules/jpdl</module>
     <module>modules/log</module>
     <module>modules/pvm</module>
-    <module>modules/task</module>
+    <!--module>modules/task</module>
     <module>modules/test-base</module>
     <module>modules/test-db</module>
-    <module>modules/test-pojo</module>
+    <module>modules/test-pojo</module-->
   </modules>
 
   <!-- Properties -->
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>   
+    <apache.ant.version>1.7.0</apache.ant.version>
     <cactus.version>13-1.7.1</cactus.version>
     <hibernate.version>3.2.6.ga</hibernate.version>
     <hsqldb.version>1.8.0.7</hsqldb.version>
+    <izpack.version>4.1.0</izpack.version>
     <jboss.j2ee.version>4.2.2.GA</jboss.j2ee.version>
     <jbossesb.version>4.4.0.GA</jbossesb.version>
     <jboss.client.version>4.2.2.GA</jboss.client.version>
@@ -66,7 +69,7 @@
         <groupId>org.jbpm.jbpm4</groupId>
         <artifactId>jbpm-api</artifactId>
         <version>${version}</version>
-      </dependency>
+      </dependency>       
       <dependency>
         <groupId>org.jbpm.jbpm4</groupId>
         <artifactId>jbpm-log</artifactId>
@@ -82,9 +85,26 @@
         <artifactId>jbpm-pvm</artifactId>
         <version>${version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jbpm.jbpm4</groupId>
+        <artifactId>jbpm-db</artifactId>
+        <version>${version}</version>
+      </dependency>
 
+      <dependency>
+        <groupId>org.jbpm.jbpm4</groupId>
+        <artifactId>jbpm-gpd</artifactId>
+        <type>zip</type>
+        <version>${version}</version>
+      </dependency>
+
       <!-- Please sort by groupid -->
       <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${apache.ant.version}</version>
+      </dependency>
+      <dependency>
         <groupId>cactus</groupId>
         <artifactId>cactus</artifactId>
         <version>${cactus.version}</version>
@@ -100,6 +120,11 @@
         <version>${hsqldb.version}</version>
       </dependency>
       <dependency>
+        <groupId>izpack</groupId>
+        <artifactId>standalone-compiler</artifactId>
+        <version>${izpack.version}</version>
+      </dependency>
+      <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-j2ee</artifactId>
         <version>${jboss.j2ee.version}</version>
@@ -184,6 +209,12 @@
 
   <!-- Plugins -->
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -229,6 +260,17 @@
           </systemProperties>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
     <!-- PluginManagement -->
@@ -316,134 +358,51 @@
       </build>
     </profile>
 
+    <!--
+       Name:  no-database
+       Descr: Setup the default database
+       -->
     <profile>
-      <id>database</id>
+      <id>no-database</id>
       <activation>
         <property>
-          <name>database</name>
+          <name>!database</name>
         </property>
       </activation>
+      <properties>
+        <database>hsqldb</database>
+      </properties>
       <dependencies>
         <dependency>
-          <groupId>org.jbpm.jbpm4</groupId>
-          <artifactId>jbpm-db</artifactId>
-          <version>${version}</version>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+          <scope>test</scope>
         </dependency>
       </dependencies>
-      <build>
-        <plugins>
+    </profile>
 
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack.jbpm.db</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>unpack-dependencies</goal>
-                </goals>
-                <configuration>
-                  <includeArtifactIds>jbpm-db</includeArtifactIds>
-                  <excludeTransitive>true</excludeTransitive>
-                  <outputDirectory>target/jbpm-db</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>resolve props</id>
-                <phase>compile</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>target/resolved.properties</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>target/jbpm-db/db.properties</directory>
-                      <filtering>true</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>install.hibernate.database.properties</id>
-                <phase>compile</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <mkdir dir="target/test-classes" />
-                    <copy file="target/resolved.properties/${database}.properties"
-                      tofile="target/test-classes/hibernate.properties"
-                      overwrite="true" />
-                  </tasks>
-                </configuration>
-              </execution>
-              <execution>
-                <id>create.schema</id>
-                <phase>test-compile</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <property file="target/test-classes/hibernate.properties" />
-                    <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql"
-                      driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}"
-                      userid="${hibernate.connection.username}" password="${hibernate.connection.password}"
-                      onerror="continue">
-                      <classpath>
-                        <path refid="maven.test.classpath" />
-                      </classpath>
-                    </sql>
-                    <sql src="target/jbpm-db/create/jbpm.${database}.create.sql"
-                      driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}"
-                      userid="${hibernate.connection.username}" password="${hibernate.connection.password}"
-                      onerror="continue">
-                      <classpath>
-                        <path refid="maven.test.classpath" />
-                      </classpath>
-                    </sql>
-                  </tasks>
-                </configuration>
-              </execution>
-              <execution>
-                <id>drop.schema</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <property file="target/test-classes/hibernate.properties" />
-                    <sql src="target/jbpm-db/drop/jbpm.${database}.drop.sql"
-                      driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}"
-                      userid="${hibernate.connection.username}" password="${hibernate.connection.password}">
-                      <classpath>
-                        <path refid="maven.test.classpath" />
-                      </classpath>
-                    </sql>
-                  </tasks>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+    <!--
+        Name:  hsqldb
+        Descr: Hypersonic Database Setup
+        -->
+    <profile>
+      <id>hsqldb</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>hsqldb</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
     </profile>
 
+
     <!-- -Ddatabase=oracle -->
     <profile>
       <id>oracle</id>

Modified: jbpm4/branches/hbraun/profiles.xml.example
===================================================================
--- jbpm4/branches/hbraun/profiles.xml.example	2009-01-23 10:04:27 UTC (rev 3711)
+++ jbpm4/branches/hbraun/profiles.xml.example	2009-01-23 10:07:54 UTC (rev 3712)
@@ -1,43 +1,90 @@
-<profilesXml 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/profiles-1.0.0.xsd">
+       <profilesXml 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/profiles-1.0.0.xsd">
 
-  <profiles>
-    
-    <!-- This profile can also be defined in ~/.m2/settings.xml -->
-    
-    <profile>
-      <id>oracle-private-properties</id>
-      <activation>
-        <property>
-          <name>database</name>
-          <value>oracle</value>
-        </property>
-      </activation>
-      <properties>
-        <jdbc.username>xxxx</jdbc.username>
-        <jdbc.password>xxxx</jdbc.password>
-        <jdbc.server>localhost</jdbc.server>
-        <jdbc.dbname>XE</jdbc.dbname>
-      </properties>
-    </profile>
+         <profiles>
 
-    <profile>
-      <id>mysql-private-properties</id>
-      <activation>
-        <property>
-          <name>database</name>
-          <value>mysql</value>
-        </property>
-      </activation>
-      <properties>
-        <jdbc.username>xxxx</jdbc.username>
-        <jdbc.password>xxxx</jdbc.password>
-        <jdbc.server>localhost</jdbc.server>
-        <jdbc.dbname>JBPM</jdbc.dbname>
-      </properties>
-    </profile>
-    
-  </profiles>
+           <!-- This profile can also be defined in ~/.m2/settings.xml -->
 
-</profilesXml>
+           <profile>
+             <id>jboss-home-profile</id>
+             <activation>
+               <property>
+                 <name>user.name</name>
+               </property>
+             </activation>
+             <properties>
+               <jboss422.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+               <jboss423.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
+               <jboss500.home>/home/hbraun/dev/prj/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
+
+               <jdbc.hsql.server>localhost</jdbc.hsql.server>
+               <jdbc.hsql.port>3306</jdbc.hsql.port>
+               <jdbc.hsql.database>jbpmtest</jdbc.hsql.database>
+               <!--jdbc.hsql.url>jdbc:hsqldb:hsql://${jdbc.hsql.server}:${jdbc.hsql.port}/${jdbc.hsql.database}</jdbc.hsql.url-->
+               <jdbc.hsql.url>jdbc:hsqldb:mem:.</jdbc.hsql.url>
+               <jdbc.hsql.username>sa</jdbc.hsql.username>
+               <jdbc.hsql.password></jdbc.hsql.password>
+
+               <!--
+               <jdbc.mysql.server>localhost</jdbc.mysql.server>
+               <jdbc.mysql.port>3306</jdbc.mysql.port>
+               <jdbc.mysql.database>jbpmtest</jdbc.mysql.database>
+               <jdbc.mysql.url>jdbc:mysql://${jdbc.mysql.server}:${jdbc.mysql.port}/${jdbc.mysql.database}</jdbc.mysql.url>
+               <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
+               <jdbc.mysql.password></jdbc.mysql.password>
+
+               <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+               <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+               <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
+               <jdbc.postgresql.url>jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/${jdbc.postgresql.database}</jdbc.postgresql.url>
+               <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
+               <jdbc.postgresql.password></jdbc.postgresql.password>
+
+               <jdbc.sybase.server>localhost</jdbc.sybase.server>
+               <jdbc.sybase.port>5000</jdbc.sybase.port>
+               <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>
+               <jdbc.sybase.url>jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/${jdbc.sybase.database}</jdbc.sybase.url>
+               <jdbc.sybase.username>jbpmtest</jdbc.sybase.username>
+               <jdbc.sybase.password>jbpmtest</jdbc.sybase.password>
+               <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver>
+               <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource>
+               -->
+             </properties>
+           </profile>
+
+           <profile>
+             <id>oracle-private-properties</id>
+             <activation>
+               <property>
+                 <name>database</name>
+                 <value>oracle</value>
+               </property>
+             </activation>
+             <properties>
+               <jdbc.username>xxxx</jdbc.username>
+               <jdbc.password>xxxx</jdbc.password>
+               <jdbc.server>localhost</jdbc.server>
+               <jdbc.dbname>XE</jdbc.dbname>
+             </properties>
+           </profile>
+
+           <profile>
+             <id>mysql-private-properties</id>
+             <activation>
+               <property>
+                 <name>database</name>
+                 <value>mysql</value>
+               </property>
+             </activation>
+             <properties>
+               <jdbc.username>xxxx</jdbc.username>
+               <jdbc.password>xxxx</jdbc.password>
+               <jdbc.server>localhost</jdbc.server>
+               <jdbc.dbname>JBPM</jdbc.dbname>
+             </properties>
+           </profile>
+
+         </profiles>
+
+       </profilesXml>




More information about the jbpm-commits mailing list