[jbpm-commits] JBoss JBPM SVN: r4136 - in jbpm4/branches/tbaeyens: modules/api and 30 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Mar 4 09:35:53 EST 2009


Author: tom.baeyens at jboss.com
Date: 2009-03-04 09:35:52 -0500 (Wed, 04 Mar 2009)
New Revision: 4136

Added:
   jbpm4/branches/tbaeyens/modules/config/.project
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.include.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.include.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part1.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part2.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part3.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part4.jbpm.cfg.xml
Removed:
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.common.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.db2.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.derby.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
   jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml
   jbpm4/branches/tbaeyens/modules/pvm/build.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java
   jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.hbm.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/
Modified:
   jbpm4/branches/tbaeyens/build.xml
   jbpm4/branches/tbaeyens/modules/api/
   jbpm4/branches/tbaeyens/modules/api/pom.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/build.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/cache/hashtable.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/db2.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/mysql.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/oracle.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/postgresql.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/sybase.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/db2.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/hsqldb.inmemory.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/mysql.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/oracle.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/postgresql.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/sybase.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.definition.hbm.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.execution.hbm.xml
   jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/other/format.sql.include.xml
   jbpm4/branches/tbaeyens/modules/db/
   jbpm4/branches/tbaeyens/modules/distro/
   jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
   jbpm4/branches/tbaeyens/modules/enterprise/
   jbpm4/branches/tbaeyens/modules/examples/
   jbpm4/branches/tbaeyens/modules/jpdl/
   jbpm4/branches/tbaeyens/modules/log/
   jbpm4/branches/tbaeyens/modules/pvm/
   jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
   jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
   jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.definition.hbm.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties
   jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml
   jbpm4/branches/tbaeyens/modules/test-base/
   jbpm4/branches/tbaeyens/modules/test-db/
   jbpm4/branches/tbaeyens/modules/test-load/
   jbpm4/branches/tbaeyens/modules/test-pojo/
   jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
   jbpm4/branches/tbaeyens/pom.xml
Log:
updates :-)

Modified: jbpm4/branches/tbaeyens/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/build.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/build.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -115,8 +115,18 @@
       <param name="page" value="modules/userguide/target/docbook/publish/en/html_single/index.html"/>
     </antcall>
   </target>
+	
+  <target name="update.pvm.configuration" description="update the pvm test resources by running the config tool">
+    <update-config module="pvm"/>
+  </target>
 
+  <target name="update.jpdl.configuration" description="update the jpdl test resources by running the config tool">
+    <update-config module="jpdl"/>
+  </target>
 
+
+
+
   <!-- HTML -->
   <target name="show.html">
     <fail message="property page has to be specified to use this target" unless="page" />
@@ -131,4 +141,22 @@
     </exec>
   </target>
 
+  <macrodef name="update-config">
+    <attribute name="module"/>
+    <sequential>
+      <delete dir="modules/@{module}/target/config" />
+      <mkdir dir="modules/@{module}/target/config" />
+      <copy todir="modules/@{module}/target/config">
+        <fileset dir="modules/config/src/main/files" />
+      </copy>
+      <copy todir="modules/@{module}/target/config" overwrite="true">
+        <fileset dir="modules/@{module}/src/main/config" />
+      </copy>
+      <ant antfile="modules/@{module}/target/config/build.xml" target="generate" inheritall="false" />
+      <copy todir="modules/@{module}/src/test/resources" overwrite="true">
+        <fileset dir="modules/@{module}/target/config/target/configfiles" />
+      </copy>
+    </sequential>
+  </macrodef>
+
 </project>
\ No newline at end of file


Property changes on: jbpm4/branches/tbaeyens/modules/api
___________________________________________________________________
Name: svn:ignore
   + target


Modified: jbpm4/branches/tbaeyens/modules/api/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/pom.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/api/pom.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -78,21 +78,6 @@
               <show>public</show>
             </configuration>
           </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>xsddocs</id>
-      <activation>
-        <os>
-          <family>Windows</family>
-        </os>
-        <property>
-          <name>xsddocs</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>

Added: jbpm4/branches/tbaeyens/modules/config/.project
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/.project	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/.project	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>config</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/build.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/build.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -7,7 +7,11 @@
   <target name="generate" description="generates a full jbpm configuration">
     <delete dir="${jbpm.config.dest.dir}" />
     <antcall target="jbpm.hibernate.cfg.xml" />
-    <antcall target="hibernate.mapping.files" />
+    <antcall target="base.hibernate.mapping.files" />
+    <condition property="is.jpdl.included">
+      <equals arg1="${jbpm.config.hibernate.jpdl}" arg2="include" />
+    </condition>
+    <antcall target="jpdl.hibernate.mapping.files" />
   	<condition property="is.identity.included">
   		<equals arg1="${jbpm.config.identity}" arg2="include" />
   	</condition>
@@ -29,6 +33,7 @@
 				<file name="${jbpm.config.tmp.dir}/hibernate/cfg/part1.jbpm.hibernate.cfg.xml" />
 			  <file name="${jbpm.config.tmp.dir}/hibernate/${jbpm.config.hibernate.connection.type}/${jbpm.config.hibernate.database}.xml"/>
         <file name="${jbpm.config.tmp.dir}/hibernate/other/format.sql.${jbpm.config.hibernate.format.sql}.xml"/>
+        <file name="${jbpm.config.tmp.dir}/hibernate/cache/${jbpm.config.hibernate.cache}.xml"/>
         <file name="${jbpm.config.tmp.dir}/hibernate/mapping.references/pvm.xml"/>
         <file name="${jbpm.config.tmp.dir}/hibernate/mapping.references/jpdl.${jbpm.config.hibernate.jpdl}.xml"/>
         <file name="${jbpm.config.tmp.dir}/hibernate/cfg/part2.jbpm.hibernate.cfg.xml" />
@@ -40,21 +45,39 @@
   	      if="is.identity.included">
 	  <copy file="identity/jbpm.identity.cfg.xml" todir="${jbpm.config.dest.dir}" overwrite="true" />
   	<mkdir dir="${jbpm.config.dest.dir}/META-INF" />
+    <copy file="${jbpm.config.tmp.dir}/hibernate/${jbpm.config.hibernate.connection.type}/${jbpm.config.hibernate.database}.xml"
+          tofile="${jbpm.config.tmp.dir}/persistence.properties.xml"/>
+  	<replace file="${jbpm.config.tmp.dir}/persistence.properties.xml"
+  	         token="&quot;&gt;"
+  	         value="&quot; value=&quot;" />
+    <replace file="${jbpm.config.tmp.dir}/persistence.properties.xml"
+             token="&lt;/property&gt;"
+             value="&quot; /&gt;" />
     <concat destfile="${jbpm.config.dest.dir}/META-INF/persistence.xml">
       <filelist dir=".">
         <file name="${jbpm.config.tmp.dir}/identity/META-INF/part1.persistence.xml" />
-        <file name="${jbpm.config.tmp.dir}/hibernate/${jbpm.config.hibernate.connection.type}/${jbpm.config.hibernate.database}.xml"/>
+        <file name="${jbpm.config.tmp.dir}/persistence.properties.xml"/>
         <file name="${jbpm.config.tmp.dir}/identity/META-INF/part2.persistence.xml"/>
       </filelist>
     </concat>
   </target>
 
-  <target name="hibernate.mapping.files">
+  <target name="base.hibernate.mapping.files">
   	<copy todir="${jbpm.config.dest.dir}">
-  		<fileset dir="${jbpm.config.tmp.dir}/hibernate/mapping.files" />
+  		<fileset dir="${jbpm.config.tmp.dir}/hibernate/mapping.files">
+  			<exclude name="jbpm.jpdl.hbm.xml" />
+  	  </fileset>
   	</copy>
 	</target>
 
+  <target name="jpdl.hibernate.mapping.files" if="is.jpdl.included">
+    <copy todir="${jbpm.config.dest.dir}">
+      <fileset dir="${jbpm.config.tmp.dir}/hibernate/mapping.files">
+        <include name="jbpm.jpdl.hbm.xml" />
+      </fileset>
+    </copy>
+  </target>
+
   <target name="jbpm.configuration.files">
     <copy todir="${jbpm.config.dest.dir}">
       <fileset dir="jbpm">
@@ -68,6 +91,18 @@
         <file name="${jbpm.config.tmp.dir}/jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" />
       </filelist>
     </concat>
+    <concat destfile="${jbpm.config.dest.dir}/jbpm.cfg.xml">
+      <filelist dir=".">
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part1.jbpm.cfg.xml" />
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/identity.service.${jbpm.config.identity}.jbpm.cfg.xml" />
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part2.jbpm.cfg.xml" />
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/identity.session.factory.${jbpm.config.identity}.jbpm.cfg.xml" />
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/jpdl.deployers.${jbpm.config.hibernate.jpdl}.jbpm.cfg.xml" />
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part3.jbpm.cfg.xml" />
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/identity.session.${jbpm.config.identity}.jbpm.cfg.xml" />
+        <file name="${jbpm.config.tmp.dir}/jbpm/cfg/part4.jbpm.cfg.xml" />
+      </filelist>
+    </concat>
   </target>
 	
   <target name="clean">

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/cache/hashtable.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/cache/hashtable.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/cache/hashtable.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,2 +1,2 @@
-      <property name="hibernate.cache.use_second_level_cache" value="true" />
-      <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider" />
+      <property name="hibernate.cache.use_second_level_cache">true</property>
+      <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/db2.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/db2.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/db2.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,4 +1,4 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect" />
+      <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property>
       <property name="hibernate.connection.datasource">java:JbpmDS</property>
       <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
       <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/mysql.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/mysql.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/mysql.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,4 +1,4 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" />
+      <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
       <property name="hibernate.connection.datasource">java:JbpmDS</property>
       <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
       <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/oracle.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/oracle.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/oracle.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,4 +1,4 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.Oracle9Dialect" />
+      <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
       <property name="hibernate.connection.datasource">java:JbpmDS</property>
       <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
       <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/postgresql.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/postgresql.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/postgresql.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,4 +1,4 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
+      <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
       <property name="hibernate.connection.datasource">java:JbpmDS</property>
       <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
       <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/sybase.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/sybase.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/datasource/sybase.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,4 +1,4 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.SybaseDialect" />
+      <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>
       <property name="hibernate.connection.datasource">java:JbpmDS</property>
       <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
       <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/db2.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/db2.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/db2.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,5 +1,5 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect" />
-      <property name="hibernate.connection.driver_class" value="com.ibm.db2.jcc.DB2Driver" />
-      <property name="hibernate.connection.url" value="@jdbc.db2.url@" />
-      <property name="hibernate.connection.username" value="@jdbc.db2.username@" />
-      <property name="hibernate.connection.password" value="@jdbc.db2.password@" />
+      <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property>
+      <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property>
+      <property name="hibernate.connection.url">@jdbc.db2.url@</property>
+      <property name="hibernate.connection.username">@jdbc.db2.username@</property>
+      <property name="hibernate.connection.password">@jdbc.db2.password@</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/hsqldb.inmemory.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/hsqldb.inmemory.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/hsqldb.inmemory.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,6 +1,6 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
-      <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
-      <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:." />
-      <property name="hibernate.connection.username" value="sa" />
-      <property name="hibernate.connection.password" value="" />
-      <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+      <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
+      <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+      <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property>
+      <property name="hibernate.connection.username">sa</property>
+      <property name="hibernate.connection.password"></property>
+      <property name="hibernate.hbm2ddl.auto">create-drop</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/mysql.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/mysql.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/mysql.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,5 +1,5 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" />
-      <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
-      <property name="hibernate.connection.url" value="@jdbc.mysql.url@" />
-      <property name="hibernate.connection.username" value="@jdbc.mysql.username@" />
-      <property name="hibernate.connection.password" value="@jdbc.mysql.password@" />
\ No newline at end of file
+      <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
+      <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
+      <property name="hibernate.connection.url">@jdbc.mysql.url@</property>
+      <property name="hibernate.connection.username">@jdbc.mysql.username@</property>
+      <property name="hibernate.connection.password">@jdbc.mysql.password@</property>
\ No newline at end of file

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/oracle.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/oracle.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/oracle.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,6 +1,6 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.Oracle9Dialect" />
-      <property name="hibernate.connection.driver_class" value="oracle.jdbc.driver.OracleDriver" />
-      <property name="hibernate.connection.url" value="@jdbc.oracle.url@" />
-      <property name="hibernate.connection.username" value="@jdbc.oracle.username@" />
-      <property name="hibernate.connection.password" value="@jdbc.oracle.password@" />
-      <property name="hibernate.query.substitutions" value="true 1, false 0" />
+      <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
+      <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
+      <property name="hibernate.connection.url">@jdbc.oracle.url@</property>
+      <property name="hibernate.connection.username">@jdbc.oracle.username@</property>
+      <property name="hibernate.connection.password">@jdbc.oracle.password@</property>
+      <property name="hibernate.query.substitutions">true 1, false 0</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/postgresql.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/postgresql.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/postgresql.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,5 +1,5 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
-      <property name="hibernate.connection.driver_class" value="org.postgresql.Driver" />
-      <property name="hibernate.connection.url" value="@jdbc.postgresql.url@" />
-      <property name="hibernate.connection.username" value="@jdbc.postgresql.username@" />
-      <property name="hibernate.connection.password" value="@jdbc.postgresql.password@" />
+      <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+      <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
+      <property name="hibernate.connection.url">@jdbc.postgresql.url@</property>
+      <property name="hibernate.connection.username">@jdbc.postgresql.username@</property>
+      <property name="hibernate.connection.password">@jdbc.postgresql.password@</property>

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/sybase.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/sybase.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/jdbc/sybase.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,5 +1,5 @@
-      <property name="hibernate.dialect" value="org.hibernate.dialect.SybaseDialect" />
-      <property name="hibernate.connection.driver_class" value="net.sourceforge.jtds.jdbc.Driver" />
-      <property name="hibernate.connection.url" value="@jdbc.sybase.url@" />
-      <property name="hibernate.connection.username="@jdbc.sybase.username@" />
-      <property name="hibernate.connection.password" value="@jdbc.sybase.password@" />
\ No newline at end of file
+      <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>
+      <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property>
+      <property name="hibernate.connection.url">@jdbc.sybase.url@</property>
+      <property name="hibernate.connection.username="@jdbc.sybase.username@</property>
+      <property name="hibernate.connection.password">@jdbc.sybase.password@</property>
\ No newline at end of file

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.definition.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.definition.hbm.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.definition.hbm.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -486,7 +486,7 @@
       <property name="isAutoWireEnabled" column="BOOLVAL_" />
       <property name="factoryObjectName" column="FACTORYNAME_" />
 
-      <many-to-one name="factoryDescriptor" class="AbstractDescriptor" column="FACTORYDESCR_"
+      <many-to-one name="factoryDescriptor" class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" column="FACTORYDESCR_"
         foreign-key="FK_DESCR_ARG_REF" index="IDX_DESCR_ARG_REF" cascade="all" />
 
       <list name="argDescriptors" cascade="all-delete-orphan">

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.execution.hbm.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/mapping.files/jbpm.execution.hbm.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -3,6 +3,21 @@
 
 <hibernate-mapping package="org.jbpm.pvm.internal.model" default-access="field">
 
+  <!-- ### TYPEDEFS ####################################################### -->
+  <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType">
+    <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter"    >bool-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter"         >byte-long</param>
+    <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter"  >char-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter"         >date-long</param>
+    <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter"       >date-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter"     >double-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter"      >float-double</param>
+    <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter"      >float-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter"      >int-long</param>
+    <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param>
+    <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter"        >short-long</param>
+  </typedef>
+
   <!-- ### PROCESS DEFINITION ############################################# -->
   <class name="ExecutionImpl" table="JBPM_EXECUTION">
     <id name="dbid" column="DBID_">
@@ -109,22 +124,6 @@
   </class>
   
   <!-- ### VARIABLE ####################################################### -->
-  
-  <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType">
-    <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter"    >bool-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter"         >byte-long</param>
-    <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter"  >char-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter"         >date-long</param>
-    <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter"       >date-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter"     >double-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter"      >float-double</param>
-    <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter"      >float-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter"      >int-long</param>
-    <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param>
-    <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter"        >short-long</param>
-  </typedef>
-  
-  
   <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE">
     <!-- discriminator values:
     date   : org.jbpm.pvm.internal.type.variable.DateVariable
@@ -294,7 +293,6 @@
   </query>
 
   <!-- ### HibernateJobDbSession QUERIES ################################## -->
-
   <query name="findFirstAcquirableJob">
     <![CDATA[
      select job
@@ -338,9 +336,7 @@
     ]]>
   </query>
   
-
   <!-- ### HibernatePvmDbSession QUERIES ############################################# -->
-
   <query name="findExecutionById">
     <![CDATA[
      select execution

Modified: jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/other/format.sql.include.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/other/format.sql.include.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/hibernate/other/format.sql.include.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1 +1 @@
-      <property name="hibernate.format_sql" value="true" />
+      <property name="hibernate.format_sql">true</property>

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml
===================================================================


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.include.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.include.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1 @@
+    <identity-service />


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.service.include.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml
===================================================================


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml
===================================================================


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1,2 @@
+    <identity-session-factory resource="jbpm.identity.cfg.xml" />
+


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.include.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.include.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1 @@
+    <identity-session realm="realm://jbpm-identity" />


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/identity.session.include.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1 @@
+    <deployer-manager>


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1,5 @@
+    <deployer-manager>
+      <assign-file-type>
+        <file extension=".jpdl.xml" type="jpdl" />
+      </assign-file-type>
+      <parse-jpdl />


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part1.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part1.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part1.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+  <process-engine-context>
+  
+    <process-service />
+    <execution-service />
+    <history-service />
+    <management-service />
+    <task-service />


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part1.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part2.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part2.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part2.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1,15 @@
+
+    <command-service>
+      <retry-interceptor />
+      <environment-interceptor />
+      <standard-transaction-interceptor />
+    </command-service>
+    
+    <hibernate-configuration>
+      <cfg resource="jbpm.hibernate.cfg.xml" />     
+      <cache-configuration resource="jbpm.cache.xml" 
+                           usage="nonstrict-read-write" />
+    </hibernate-configuration>
+
+    <hibernate-session-factory />
+


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part2.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part3.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part3.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part3.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1,37 @@
+      <check-process />
+      <check-problems />
+      <save />
+    </deployer-manager>
+
+    <script-manager default-expression-language="juel"
+                    default-script-language="juel"
+                    read-contexts="execution, environment, process-engine"
+                    write-context="">
+        <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" />
+    </script-manager>
+
+    <job-executor auto-start="false" />
+
+    <id-generator />
+    <types resource="jbpm.variable.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-context>
+
+  <transaction-context>
+    <hibernate-session />
+    <transaction />
+    <pvm-db-session />
+    <job-db-session />
+    <task-db-session />
+    <message-session />
+    <timer-session />
+    <history-session />


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part3.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part4.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part4.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part4.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -0,0 +1,3 @@
+  </transaction-context>
+
+</jbpm-configuration>


Property changes on: jbpm4/branches/tbaeyens/modules/config/src/main/files/jbpm/cfg/part4.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF


Property changes on: jbpm4/branches/tbaeyens/modules/db
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbpm4/branches/tbaeyens/modules/distro
___________________________________________________________________
Name: svn:ignore
   + target


Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,2 +1,2 @@
 ## index of importer -> set(imports)
-#Wed Mar 04 10:44:26 CET 2009
+#Wed Mar 04 15:20:39 CET 2009


Property changes on: jbpm4/branches/tbaeyens/modules/enterprise
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbpm4/branches/tbaeyens/modules/examples
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbpm4/branches/tbaeyens/modules/jpdl
___________________________________________________________________
Name: svn:ignore
   + target


Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.common.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.common.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,38 +0,0 @@
-
-    <!-- DataSource properties (begin) ===
-    <property name="hibernate.connection.datasource">java:JbpmDS</property>
-    ==== DataSource properties (end) -->
-
-    <!-- JTA transaction properties (begin) ===
-    <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
-    <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-    <property name="jta.UserTransaction">UserTransaction</property>
-    ==== JTA transaction properties (end) -->
-
-    <!-- CMT transaction properties (begin) ===
-    <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
-    <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-    ==== CMT transaction properties (end) -->
-
-    <!-- ################################### -->
-    <!-- # common settings                 # -->
-    <!-- ################################### -->
-
-    <!-- Simple memory-only cache -->
-    <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
-    <!-- logging properties -->
-    <property name="hibernate.format_sql">true</property>
-    <property name="hibernate.use_sql_comments">true</property>
-
-    <!-- Common hibernate mapping used with jpdl -->
-
-    <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.pvm.history.hbm.xml" />
-    <mapping resource="jbpm.task.hbm.xml" />
-    <mapping resource="jbpm.jpdl.hbm.xml" />

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.db2.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.db2.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.db2.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.DB2Dialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://www-128.ibm.com/developerworks/db2/downloads/jcc -->
-    <property name="hibernate.connection.driver_class">com.ibm.db2.jcc.DB2Driver</property>
-    <property name="hibernate.connection.url">jdbc:db2://localhost:50000/testing</property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.derby.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.derby.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.derby.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.DerbyDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://db.apache.org/derby -->
-    <property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property>
-    <property name="hibernate.connection.url">jdbc:derby:build/derby/jbpmtest;create=true</property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.firebird.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.FirebirdDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://firebird.sourceforge.net/ -->
-    <property name="hibernate.connection.driver_class">org.firebirdsql.jdbc.FBDriver</property>
-    <property name="hibernate.connection.url">jdbc:firebirdsql:localhost:jbpmtest</property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.hsqldb.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,15 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>    
-    <property name="hibernate.connection.url">jdbc:hsqldb:file:@project.build.directory@/hypersonic/jbpm4DB</property>
-    <property name="hibernate.connection.username">sa</property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-
-    <!-- Automatic schema creation (begin) -->
-    <property name="hibernate.hbm2ddl.auto">create</property>
-    <!-- Automatic schema creation (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.ingres.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.IngresDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://google.com -->
-    <property name="hibernate.connection.driver_class"></property>
-    <property name="hibernate.connection.url"></property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.interbase.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.InterbaseDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://google.com -->
-    <property name="hibernate.connection.driver_class"></property>
-    <property name="hibernate.connection.url"></property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mckoi.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.MckoiDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://google.com -->
-    <property name="hibernate.connection.driver_class"></property>
-    <property name="hibernate.connection.url"></property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mssql.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://msdn.microsoft.com/data/jdbc -->
-    <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property>
-    <property name="hibernate.connection.url">jdbc:jtds:sqlserver://localhost:1433/jbpmtest</property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.mysql.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,11 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-    <property name="hibernate.connection.url">${jdbc.mysql.url}</property>
-    <property name="hibernate.connection.username">${jdbc.mysql.username}</property>
-    <property name="hibernate.connection.password">${jdbc.mysql.password}</property>
-    <property name="hibernate.query.substitutions">true 1, false 0</property>
-    <!-- JDBC connection properties (end) -->

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.oracle.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,10 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property>
-                                       
-    <!-- JDBC connection properties (begin) -->
-    <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
-    <property name="hibernate.connection.url">${jdbc.oracle.url}</property>
-    <property name="hibernate.connection.username">${jdbc.oracle.username}</property>
-    <property name="hibernate.connection.password">${jdbc.oracle.password}</property>
-    <!-- JDBC connection properties (end) -->

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.postgresql.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,11 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
-    <property name="hibernate.connection.url">${jdbc.postgresql.url}</property>
-    <property name="hibernate.connection.username">${jdbc.postgresql.username}</property>
-    <property name="hibernate.connection.password">${jdbc.postgresql.password}</property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sapdb.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,12 +0,0 @@
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.SAPDBDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <!-- fetch driver from http://google.com -->
-    <property name="hibernate.connection.driver_class"></property>
-    <property name="hibernate.connection.url"></property>
-    <property name="hibernate.connection.username"></property>
-    <property name="hibernate.connection.password"></property>
-    <!-- JDBC connection properties (end) -->
-

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/hibernate.properties.sybase.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,23 +0,0 @@
-    <!-- 
-       Out-of-the-box compatibility with Sybase
-       https://jira.jboss.org/jira/browse/JBPM-700
-       
-       System Service QA Database Sybase
-       https://wiki.corp.jboss.com/bin/composite/IT/SystemServiceQaDatabaseSybase
-       
-       Install Sybase ASE 15.0.2 on Fedora9
-       https://www.jboss.org/community/docs/DOC-12932
-    -->
-
-    <!-- hibernate dialect -->
-    <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property>
-
-    <!-- JDBC connection properties (begin) -->
-    <property name="hibernate.connection.driver_class">${jdbc.sybase.driver}</property>
-    <property name="hibernate.connection.url">${jdbc.sybase.url}</property>
-    <property name="hibernate.connection.username">${jdbc.sybase.username}</property>
-    <property name="hibernate.connection.password">${jdbc.sybase.password}</property>
-    <!-- JDBC connection properties (end) -->
-
-    <!-- jConnect does not support retrieving natively generated keys after insert -->
-    <property name="hibernate.jdbc.use_get_generated_keys">false</property>

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-hsqldb-ds.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-
-  <local-tx-datasource>
-    <jndi-name>JbpmDS</jndi-name>
-
-    <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}jbpm4DB</connection-url>    
-    <driver-class>org.hsqldb.jdbcDriver</driver-class>
-    <user-name>sa</user-name>
-    <password></password>
-
-    <!-- connection pool parameters -->
-    <min-pool-size>1</min-pool-size>
-    <max-pool-size>5</max-pool-size>
-
-    <!-- disable idle connection removal, hsqldb does not reap threads on closed connections -->
-    <idle-timeout-minutes>0</idle-timeout-minutes>
-    <!-- check all statements are closed when the connection is returned to the pool -->
-    <track-statements />
-    <!-- hsqldb benefits from prepared statement caching -->
-    <prepared-statement-cache-size>32</prepared-statement-cache-size>
-
-    <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml -->
-    <metadata>
-      <type-mapping>Hypersonic SQL</type-mapping>
-    </metadata>
-
-    <!-- ensure the datasource is not initialized before the database itself -->
-    <depends>jboss:service=Hypersonic,database=jbpm4DB</depends>
-  </local-tx-datasource>
-
-  <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpm4DB">
-    <attribute name="Database">jbpm4DB</attribute>
-    <attribute name="InProcessMode">true</attribute>
-  </mbean>
-
-</datasources>

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-mysql-ds.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-
-  <xa-datasource>
-    <jndi-name>JbpmDS</jndi-name>
-
-    <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
-    <xa-datasource-property name="ServerName">${jdbc.mysql.server}</xa-datasource-property>
-    <xa-datasource-property name="PortNumber">${jdbc.mysql.port}</xa-datasource-property>
-    <xa-datasource-property name="DatabaseName">${jdbc.mysql.database}</xa-datasource-property>
-    <user-name>${jdbc.mysql.username}</user-name>
-    <password>${jdbc.mysql.password}</password>
-
-    <!-- reduce isolation from the default level (repeatable read) -->
-    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-    <!-- separate connections used with and without JTA transaction -->
-    <no-tx-separate-pools />
-    <!-- disable transaction interleaving -->
-    <track-connection-by-tx />
-
-    <!-- leverage mysql integration features -->
-    <exception-sorter-class-name>
-      com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter
-    </exception-sorter-class-name>
-    <valid-connection-checker-class-name>
-      com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker
-    </valid-connection-checker-class-name>
-
-    <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml -->
-    <metadata>
-      <type-mapping>mySQL</type-mapping>
-    </metadata>
-  </xa-datasource>
-
-</datasources>
\ No newline at end of file

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  JBoss Server Configuration                                           -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<!-- $Id: oracle-xa-ds.xml 77479 2008-08-26 10:33:09Z alex.loubyansky at jboss.com $ -->
-
-<!-- ===================================================================== -->
-<!-- ATTENTION:  DO NOT FORGET TO SET Pad=true IN transaction-service.xml  -->
-<!-- ===================================================================== -->
-
-<datasources>
-  <xa-datasource>
-    <jndi-name>JbpmDS</jndi-name>
-    <!-- uncomment to enable interleaving <interleaving/> -->
-    <isSameRM-override-value>false</isSameRM-override-value>
-    <track-connection-by-tx/>
-    <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
-    <xa-datasource-property name="URL">${jdbc.oracle.url}</xa-datasource-property>
-    <xa-datasource-property name="User">${jdbc.oracle.username}</xa-datasource-property>
-    <xa-datasource-property name="Password">${jdbc.oracle.password}</xa-datasource-property>
-    <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
-    <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
-    <!-- Checks the Oracle error codes and messages for fatal errors -->
-    <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
-    <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
-    <no-tx-separate-pools/>
-
-      <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
-      <metadata>
-         <type-mapping>Oracle9i</type-mapping>
-      </metadata>
-  </xa-datasource>
-
-  <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" 
-         name="jboss.jca:service=OracleXAExceptionFormatter">
-    <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
-  </mbean>
-
-</datasources>

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-postgresql-ds.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-
-  <xa-datasource>
-    <jndi-name>JbpmDS</jndi-name>
-
-    <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
-    <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property>
-    <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property>
-    <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property>
-    <user-name>${jdbc.postgresql.username}</user-name>
-    <password>${jdbc.postgresql.password}</password>
-
-    <!-- disable transaction interleaving -->
-    <track-connection-by-tx />
-
-    <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml -->
-    <metadata>
-      <type-mapping>PostgreSQL 8.0</type-mapping>
-    </metadata>
-  </xa-datasource>
-
-</datasources>

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm-sybase-ds.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<datasources>
-
-  <xa-datasource>
-    <jndi-name>JbpmDS</jndi-name>
-    
-    <xa-datasource-class>${jdbc.sybase.datasource}</xa-datasource-class>
-    <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property>
-    <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property>
-    <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property>
-    <user-name>${jdbc.sybase.username}</user-name>
-    <password>${jdbc.sybase.password}</password>
-
-    <!-- disable transaction interleaving -->
-    <track-connection-by-tx />
-
-    <exception-sorter-class-name>
-      org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter
-    </exception-sorter-class-name>
-
-    <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml -->
-    <metadata>
-      <type-mapping>Sybase</type-mapping>
-    </metadata>
-  </xa-datasource>
-
-</datasources>

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.cfg.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
-
-  <process-engine-context>
-  
-    <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 resource="hibernate.cfg.xml"/>    
-    
-    <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-context>
-
-  <transaction-context>
-    <hibernate-session />
-    <transaction />
-    <pvm-db-session />
-    <job-db-session />
-    <task-db-session />
-    <message-session />
-    <timer-session />
-  </transaction-context>
-
-</jbpm-configuration>

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,17 +0,0 @@
-<activities>
-  <schema resource="jpdl.xsd" />
-  <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.ExclusiveBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" />
-  <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" />
-</activities>

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-
-  <joined-subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition" table="JBPM_JPDL_PROCDEF"  extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl">
-    <key column="DBID_"/>
-  </joined-subclass>
-
-  <joined-subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" table="JBPM_JPDL_EXECUTION" extends="org.jbpm.pvm.internal.model.ExecutionImpl">
-    <key column="DBID_"/>
-  </joined-subclass>
-
-  <class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY"  abstract="true" discriminator-value="X">
-    <id name="dbid" column="DBID_">
-      <generator class="native" />
-    </id>
-    <discriminator column="CLASS_" />
-    <subclass name="org.jbpm.jpdl.internal.activity.StartActivity" discriminator-value="start" />
-    <subclass name="org.jbpm.jpdl.internal.activity.ExclusiveConditionActivity" discriminator-value="excl-cond" />
-    <subclass name="org.jbpm.jpdl.internal.activity.ExclusiveExpressionActivity" discriminator-value="excl-expr">
-      <property name="expr" column="TEXT_" />
-      <property name="lang" column="TEXT2_" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.ExclusiveHandlerActivity" discriminator-value="excl-handler">
-      <property name="exclusiveHandlerName" column="TEXT_" />
-      <many-to-one name="exclusiveHandlerDescriptor"
-                   column="EXCLDESCR_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
-                   foreign-key="FK_ACT_EXCLDESCR"
-                   index="IDX_ACT_EXCLDESCR" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.StateActivity" discriminator-value="state" />
-    <subclass name="org.jbpm.jpdl.internal.activity.EndActivity" discriminator-value="end">
-      <property name="endProcessInstance" column="ENDPI_" />
-      <property name="state" column="TEXT_" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.ForkActivity" discriminator-value="fork" />
-    <subclass name="org.jbpm.jpdl.internal.activity.JoinActivity" discriminator-value="join" />
-    <subclass name="org.jbpm.jpdl.internal.activity.HqlActivity" discriminator-value="hql">
-      <property name="query" column="TEXT_" />
-      <property name="resultVariableName" column="TEXT2_" />
-      <property name="isResultUnique" column="ISUNIQ_" />
-      <many-to-one name="parametersDescriptor"
-                   column="PARAMDESCR_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor"
-                   foreign-key="FK_ACT_PARAMDESCR"
-                   index="IDX_ACT_PARAMDESCR" />
-      
-      <subclass name="org.jbpm.jpdl.internal.activity.SqlActivity" discriminator-value="sql" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.JavaActivity" discriminator-value="java">
-      <property name="methodName" column="TEXT_" />
-      <property name="variableName" column="TEXT2_" />
-      <many-to-one name="descriptor"
-                   column="JAVADESCR_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
-                   foreign-key="FK_ACT_JAVADESCR"
-                   index="IDX_ACT_JAVADESCR" />
-      <many-to-one name="invokeOperation"
-                   column="INVOPER_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.operation.InvokeOperation"
-                   foreign-key="FK_ACT_INVKOPER"
-                   index="IDX_ACT_INVKOPER" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.ScriptActivity" discriminator-value="script">
-      <property name="script" column="TEXT_" />
-      <property name="language" column="TEXT2_" />
-      <property name="variableName" column="TEXT3_" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.EsbActivity" discriminator-value="esb">
-      <property name="service" column="TEXT_" />
-      <property name="category" column="TEXT2_" />
-      <many-to-one name="partsListDescriptor"
-               column="PARTSDESCR_" 
-               cascade="all"
-               class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor"
-               foreign-key="FK_ACT_PARTSDESCR"
-               index="IDX_ACT_PARTSDESCR" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.TaskActivity" discriminator-value="task">
-      <property name="assignee" column="TEXT_" />
-    </subclass>
-  </class>
-
-</hibernate-mapping>
\ No newline at end of file

Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,3 +0,0 @@
-<wire-bindings>
-  <binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
-</wire-bindings>


Property changes on: jbpm4/branches/tbaeyens/modules/log
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbpm4/branches/tbaeyens/modules/pvm
___________________________________________________________________
Name: svn:ignore
   + target


Deleted: jbpm4/branches/tbaeyens/modules/pvm/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/build.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/build.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="update.pvm.configuration" basedir=".">
-	
-  <target name="update.configuration" description="update the test resources by running the config tool">
-    <delete dir="target/config" />
-    <mkdir dir="target/config" />
-    <copy todir="target/config">
-      <fileset dir="../config-tool/src/main/tool" />
-    </copy>
-    <copy todir="target/config" overwrite="true">
-      <fileset dir="src/main/config" />
-    </copy>
-  	<ant antfile="target/config/build.xml" target="generate" inheritall="false" />
-    <copy todir="src/test/resources" overwrite="true">
-      <fileset dir="target/config/target/configfiles" />
-    </copy>
-  </target>
-
-</project>

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/HibernateConfigurationBinding.java	2009-03-04 14:35:52 UTC (rev 4136)
@@ -89,43 +89,43 @@
     for (Element configElement: configElements) {
 
       if ("cfg".equals(XmlUtil.getTagLocalName(configElement))) {
-        if (element.hasAttribute("resource")) {
-          String resource = element.getAttribute("resource");
+        if (configElement.hasAttribute("resource")) {
+          String resource = configElement.getAttribute("resource");
           log.trace("adding hibernate configuration resource "+resource);
           descriptor.addCfgResource(resource);
 
-        } else if (element.hasAttribute("file")) {
-          String fileName = element.getAttribute("file");
+        } else if (configElement.hasAttribute("file")) {
+          String fileName = configElement.getAttribute("file");
           log.trace("adding hibernate configuration file "+fileName);
           descriptor.addCfgFile(fileName);
 
-        } else if (element.hasAttribute("url")) {
-          String urlText = element.getAttribute("url");
+        } else if (configElement.hasAttribute("url")) {
+          String urlText = configElement.getAttribute("url");
           log.trace("adding hibernate configuration url "+urlText);
           descriptor.addCfgUrl(urlText);
           
         } else {
-          parse.addProblem("exactly 1 attribute in {resource, file, url} was expected in cfg: "+XmlUtil.toString(element));
+          parse.addProblem("exactly 1 attribute in {resource, file, url} was expected in cfg: "+XmlUtil.toString(configElement));
         }
 
       } else if ("mapping".equals(XmlUtil.getTagLocalName(configElement))) {
-        if (element.hasAttribute("resource")) {
-          String resource = element.getAttribute("resource");
+        if (configElement.hasAttribute("resource")) {
+          String resource = configElement.getAttribute("resource");
           log.trace("adding hibernate mapping resource "+resource);
           descriptor.addMappingResource(resource);
 
-        } else if (element.hasAttribute("file")) {
-          String fileName = element.getAttribute("file");
+        } else if (configElement.hasAttribute("file")) {
+          String fileName = configElement.getAttribute("file");
           log.trace("adding hibernate mapping file "+fileName);
           descriptor.addMappingFile(fileName);
 
-        } else if (element.hasAttribute("class")) {
-          String className = element.getAttribute("class");
+        } else if (configElement.hasAttribute("class")) {
+          String className = configElement.getAttribute("class");
           log.trace("adding hibernate mapping class "+className);
           descriptor.addMappingClass(className);
           
-        } else if (element.hasAttribute("url")) {
-          String urlText = element.getAttribute("url");
+        } else if (configElement.hasAttribute("url")) {
+          String urlText = configElement.getAttribute("url");
           log.trace("adding hibernate mapping url "+urlText);
           descriptor.addMappingUrl(urlText);
           

Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.env;
-
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.test.BaseJbpmTestCase;
-
-/**
- * @author Tom Baeyens
- */
-public class EnvironmentClassLoaderTest extends BaseJbpmTestCase {
-  
-  public static class TestClassLoader extends ClassLoader {
-  }
-
-  public void testDefaultClassLoader() {
-    EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
-      "<environment />"
-    );
-
-    ClassLoader original = Thread.currentThread().getContextClassLoader();
-    ClassLoader testClassLoader = new TestClassLoader();
-    Thread.currentThread().setContextClassLoader(testClassLoader);
-    try {
-
-      Environment environment = environmentFactory.openEnvironment();
-      try {
-        assertSame(testClassLoader, environment.getClassLoader());
-      } finally {
-        environment.close();
-      }
-
-    } finally {
-      Thread.currentThread().setContextClassLoader(original);
-    }
-  }
-
-}

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java	2009-03-04 14:35:52 UTC (rev 4136)
@@ -34,8 +34,7 @@
  */
 public class CommentDbTest extends EnvironmentDbTestCase {
 
-  public void testComment()
-  {
+  public void testComment() {
     Date now = new Date();
 
     CommentImpl comment = new CommentImpl();
@@ -50,8 +49,7 @@
     assertEquals("hi", comment.getMessage());
   }
 
-  public void testCommentDelete()
-  {
+  public void testCommentDelete() {
     CommentImpl comment = new CommentImpl();
     comment.setUserId("me");
     comment.setMessage("hi");
@@ -67,8 +65,7 @@
     assertNull(dbSession.get(CommentImpl.class, comment.getDbid()));
   }
 
-  public void testCommentReplies()
-  {
+  public void testCommentReplies() {
     CommentImpl comment = new CommentImpl();
     comment.setMessage("how are you");
     Comment reply = comment.createComment("good, thank you");
@@ -99,8 +96,7 @@
     assertEquals("i'm also fine", reply10.getMessage());
   }
 
-  public void testCommentDeleteReplies()
-  {
+  public void testCommentDeleteReplies() {
     CommentImpl comment = new CommentImpl();
     comment.setMessage("how are you");
     comment.createComment("good, thank you");

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java	2009-03-04 14:35:52 UTC (rev 4136)
@@ -44,10 +44,6 @@
  */
 public class VariableAutoTypeResolutionTest extends EnvironmentTestCase {
 
-  public VariableAutoTypeResolutionTest() {
-    super("org/jbpm/pvm/internal/type/environment.cfg.xml");
-  }
-
   public static ExecutionImpl startProcessInstance() {
     return (ExecutionImpl) ProcessDefinitionBuilder
     .startProcess()

Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.spring;
-
-import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.test.BaseJbpmTestCase;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
-/**
- * @author Tom Baeyens
- */
-public class SpringTest extends BaseJbpmTestCase {
-
-  public void testSpringTransactions() {
-    ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/jbpm/pvm/spring/spring.beans.xml");
-    EnvironmentFactory environmentFactory = (EnvironmentFactory) applicationContext.getBean("environmentFactory");
-    
-    CommandService commandService = environmentFactory.get(CommandService.class);
-    
-    assertNull(Environment.getCurrent());
-
-    Session session = (Session) commandService.execute(new Command<Object>() {
-      public Object execute(Environment environment) throws Exception {
-        assertNotNull(environment);
-        Session session = environment.get(Session.class);
-        assertNotNull(session);
-        assertTrue(session.isOpen());
-        assertSame(session, environment.get(Session.class));
-        return session;
-      }
-    });
-
-    assertFalse(session.isOpen());
-
-    assertNull(Environment.getCurrent());
-
-    /* TODO translate the DeployerManager to a data structure that is 
-     * easy to wire up with spring
-    ProcessService processService = environmentFactory.get(ProcessService.class);
-
-    ProcessDefinition processDefinition = ProcessFactory.build("basic")
-      .activity("a").initial().behaviour(WaitState.class)
-        .transition().to("b")
-      .activity("b").behaviour(WaitState.class)
-        .transition().to("c")
-      .activity("c").behaviour(AutomaticActivity.class)
-        .transition().to("d")
-      .activity("d").behaviour(AutomaticActivity.class)
-        .transition().to("e")
-      .activity("e").behaviour(WaitState.class)
-    .done();
-  
-    processService.deploy(processDefinition);
-  
-    Execution execution = processService.startExecution("basic", "one");
-  
-    assertEquals("a", execution.getActivity().getName());
-  
-    execution = processService.signalExecution("basic", "one");
-  
-    assertEquals("b", execution.getActivity().getName());
-  
-    execution = processService.signalExecution("basic", "one");
-  
-    assertEquals("e", execution.getActivity().getName());
-     */ 
-  }
-
-}

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -8,27 +8,26 @@
     <execution-service />
     <history-service />
     <management-service />
-    <identity-service />
     <task-service />
-  
+    <identity-service />
+
     <command-service>
       <retry-interceptor />
       <environment-interceptor />
       <standard-transaction-interceptor />
     </command-service>
     
-    <hibernate-configuration cfg="jbpm.hibernate.cfg.xml">     
+    <hibernate-configuration>
+      <cfg resource="jbpm.hibernate.cfg.xml" />     
       <cache-configuration resource="jbpm.cache.xml" 
                            usage="nonstrict-read-write" />
     </hibernate-configuration>
 
     <hibernate-session-factory />
 
+    <identity-session-factory resource="jbpm.identity.cfg.xml" />
+
     <deployer-manager>
-      <assign-file-type>
-        <file extension=".jpdl.xml" type="jpdl" />
-      </assign-file-type>
-      <parse-jpdl />
       <check-process />
       <check-problems />
       <save />

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.definition.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.definition.hbm.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.definition.hbm.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -486,7 +486,7 @@
       <property name="isAutoWireEnabled" column="BOOLVAL_" />
       <property name="factoryObjectName" column="FACTORYNAME_" />
 
-      <many-to-one name="factoryDescriptor" class="AbstractDescriptor" column="FACTORYDESCR_"
+      <many-to-one name="factoryDescriptor" class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" column="FACTORYDESCR_"
         foreign-key="FK_DESCR_ARG_REF" index="IDX_DESCR_ARG_REF" cascade="all" />
 
       <list name="argDescriptors" cascade="all-delete-orphan">

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -3,6 +3,21 @@
 
 <hibernate-mapping package="org.jbpm.pvm.internal.model" default-access="field">
 
+  <!-- ### TYPEDEFS ####################################################### -->
+  <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType">
+    <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter"    >bool-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter"         >byte-long</param>
+    <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter"  >char-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter"         >date-long</param>
+    <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter"       >date-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter"     >double-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter"      >float-double</param>
+    <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter"      >float-str</param>
+    <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter"      >int-long</param>
+    <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param>
+    <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter"        >short-long</param>
+  </typedef>
+
   <!-- ### PROCESS DEFINITION ############################################# -->
   <class name="ExecutionImpl" table="JBPM_EXECUTION">
     <id name="dbid" column="DBID_">
@@ -109,22 +124,6 @@
   </class>
   
   <!-- ### VARIABLE ####################################################### -->
-  
-  <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType">
-    <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter"    >bool-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter"         >byte-long</param>
-    <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter"  >char-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter"         >date-long</param>
-    <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter"       >date-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter"     >double-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter"      >float-double</param>
-    <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter"      >float-str</param>
-    <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter"      >int-long</param>
-    <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param>
-    <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter"        >short-long</param>
-  </typedef>
-  
-  
   <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE">
     <!-- discriminator values:
     date   : org.jbpm.pvm.internal.type.variable.DateVariable
@@ -294,7 +293,6 @@
   </query>
 
   <!-- ### HibernateJobDbSession QUERIES ################################## -->
-
   <query name="findFirstAcquirableJob">
     <![CDATA[
      select job
@@ -338,9 +336,7 @@
     ]]>
   </query>
   
-
   <!-- ### HibernatePvmDbSession QUERIES ############################################# -->
-
   <query name="findExecutionById">
     <![CDATA[
      select execution

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -6,13 +6,15 @@
 
 <hibernate-configuration>
   <session-factory>
-      <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
-      <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
-      <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:." />
-      <property name="hibernate.connection.username" value="sa" />
-      <property name="hibernate.connection.password" value="" />
-      <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-      <property name="hibernate.format_sql" value="true" />
+      <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
+      <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+      <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property>
+      <property name="hibernate.connection.username">sa</property>
+      <property name="hibernate.connection.password"></property>
+      <property name="hibernate.hbm2ddl.auto">create-drop</property>
+      <property name="hibernate.format_sql">true</property>
+      <property name="hibernate.cache.use_second_level_cache">true</property>
+      <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
       <mapping resource="jbpm.definition.hbm.xml" />
       <mapping resource="jbpm.execution.hbm.xml" />
       <mapping resource="jbpm.history.hbm.xml" />

Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.hbm.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.hbm.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping default-access="field">
-
-  <joined-subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition" table="JBPM_JPDL_PROCDEF"  extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl">
-    <key column="DBID_"/>
-  </joined-subclass>
-
-  <joined-subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" table="JBPM_JPDL_EXECUTION" extends="org.jbpm.pvm.internal.model.ExecutionImpl">
-    <key column="DBID_"/>
-  </joined-subclass>
-
-  <class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY"  abstract="true" discriminator-value="X">
-    <id name="dbid" column="DBID_">
-      <generator class="native" />
-    </id>
-    <discriminator column="CLASS_" />
-    <subclass name="org.jbpm.jpdl.internal.activity.StartActivity" discriminator-value="start" />
-    <subclass name="org.jbpm.jpdl.internal.activity.ExclusiveConditionActivity" discriminator-value="excl-cond" />
-    <subclass name="org.jbpm.jpdl.internal.activity.ExclusiveExpressionActivity" discriminator-value="excl-expr">
-      <property name="expr" column="TEXT_" />
-      <property name="lang" column="TEXT2_" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.ExclusiveHandlerActivity" discriminator-value="excl-handler">
-      <property name="exclusiveHandlerName" column="TEXT_" />
-      <many-to-one name="exclusiveHandlerDescriptor"
-                   column="EXCLDESCR_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
-                   foreign-key="FK_ACT_EXCLDESCR"
-                   index="IDX_ACT_EXCLDESCR" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.StateActivity" discriminator-value="state" />
-    <subclass name="org.jbpm.jpdl.internal.activity.EndActivity" discriminator-value="end">
-      <property name="endProcessInstance" column="ENDPI_" />
-      <property name="state" column="TEXT_" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.ForkActivity" discriminator-value="fork" />
-    <subclass name="org.jbpm.jpdl.internal.activity.JoinActivity" discriminator-value="join" />
-    <subclass name="org.jbpm.jpdl.internal.activity.HqlActivity" discriminator-value="hql">
-      <property name="query" column="TEXT_" />
-      <property name="resultVariableName" column="TEXT2_" />
-      <property name="isResultUnique" column="ISUNIQ_" />
-      <many-to-one name="parametersDescriptor"
-                   column="PARAMDESCR_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor"
-                   foreign-key="FK_ACT_PARAMDESCR"
-                   index="IDX_ACT_PARAMDESCR" />
-      
-      <subclass name="org.jbpm.jpdl.internal.activity.SqlActivity" discriminator-value="sql" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.JavaActivity" discriminator-value="java">
-      <property name="methodName" column="TEXT_" />
-      <property name="variableName" column="TEXT2_" />
-      <many-to-one name="descriptor"
-                   column="JAVADESCR_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
-                   foreign-key="FK_ACT_JAVADESCR"
-                   index="IDX_ACT_JAVADESCR" />
-      <many-to-one name="invokeOperation"
-                   column="INVOPER_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.operation.InvokeOperation"
-                   foreign-key="FK_ACT_INVKOPER"
-                   index="IDX_ACT_INVKOPER" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.ScriptActivity" discriminator-value="script">
-      <property name="script" column="TEXT_" />
-      <property name="language" column="TEXT2_" />
-      <property name="variableName" column="TEXT3_" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.EsbActivity" discriminator-value="esb">
-      <property name="service" column="TEXT_" />
-      <property name="category" column="TEXT2_" />
-      <many-to-one name="partsListDescriptor"
-               column="PARTSDESCR_" 
-               cascade="all"
-               class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor"
-               foreign-key="FK_ACT_PARTSDESCR"
-               index="IDX_ACT_PARTSDESCR" />
-    </subclass>
-    <subclass name="org.jbpm.jpdl.internal.activity.TaskActivity" discriminator-value="task">
-      <property name="assignee" column="TEXT_" />
-    </subclass>
-  </class>
-
-</hibernate-mapping>
\ No newline at end of file

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/logging.properties	2009-03-04 14:35:52 UTC (rev 4136)
@@ -21,7 +21,7 @@
 
 org.hibernate.level=INFO
 org.hibernate.cfg.SettingsFactory.level=SEVERE
-# org.hibernate.level=FINE
+org.hibernate.cfg.HbmBinder.level=SEVERE
 # org.hibernate.SQL.level=FINEST
 # org.hibernate.type.level=FINEST
 # org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST

Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/org/jbpm/pvm/variables/custom.types.jbpm.cfg.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -3,21 +3,17 @@
   <process-engine-context>
   
     <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" />
-      <cache-configuration resource="jbpm.pvm.cache.xml" 
+      <cfg resource="jbpm.hibernate.cfg.xml" />     
+      <cache-configuration resource="jbpm.cache.xml" 
                            usage="nonstrict-read-write" />
     </hibernate-configuration>
     
     <hibernate-session-factory />
+    
     <types>
       <type name="date" class="java.util.Date" variable-class="org.jbpm.pvm.internal.type.variable.DateVariable" />
     </types>
+
   </process-engine-context>
 
   <transaction-context>


Property changes on: jbpm4/branches/tbaeyens/modules/test-base
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbpm4/branches/tbaeyens/modules/test-db
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbpm4/branches/tbaeyens/modules/test-load
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: jbpm4/branches/tbaeyens/modules/test-pojo
___________________________________________________________________
Name: svn:ignore
   + target


Modified: jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties	2009-03-04 14:35:52 UTC (rev 4136)
@@ -1,2 +1,2 @@
 ## index of importer -> set(imports)
-#Wed Mar 04 10:44:26 CET 2009
+#Wed Mar 04 15:20:40 CET 2009

Modified: jbpm4/branches/tbaeyens/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/pom.xml	2009-03-04 14:08:34 UTC (rev 4135)
+++ jbpm4/branches/tbaeyens/pom.xml	2009-03-04 14:35:52 UTC (rev 4136)
@@ -33,14 +33,14 @@
     <module>modules/log</module>
     <module>modules/api</module>
     <module>modules/pvm</module>
+    <module>modules/jpdl</module>
+    <!-- 
     <module>modules/examples</module>
-    <module>modules/jpdl</module>
     <module>modules/enterprise</module>     
     <module>modules/test-base</module>
     <module>modules/test-db</module>
     <module>modules/test-pojo</module>
     <module>modules/db</module>
-    <!-- 
      -->
   </modules>
 




More information about the jbpm-commits mailing list