[jbpm-commits] JBoss JBPM SVN: r4180 - in jbpm4/branches/hbraun/modules: enterprise/src/main/resources and 3 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-03-06 14:20:14 -0500 (Fri, 06 Mar 2009)
New Revision: 4180

Added:
   jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm.deployer.cfg.xml
Modified:
   jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml
   jbpm4/branches/hbraun/modules/enterprise/src/main/resources/jbpm.cfg.xml
   jbpm4/branches/hbraun/modules/integration/jboss5/pom.xml
   jbpm4/branches/hbraun/modules/integration/jboss5/scripts/assembly-config.xml
Log:
Tweak the enterprise config: No implivit TX management, default command service ooposed to EJB

Modified: jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml	2009-03-06 19:00:04 UTC (rev 4179)
+++ jbpm4/branches/hbraun/modules/distro/src/main/resources/installer/install-definition.xml	2009-03-06 19:20:14 UTC (rev 4180)
@@ -271,6 +271,7 @@
                override="true"
                condition="isJBoss500">
         <include name="jbpm-service-jboss-beans.xml"/>
+        <!--include name="jbpm.deployer.cfg.xml"/-->
       </fileset>
 
 

Modified: jbpm4/branches/hbraun/modules/enterprise/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/src/main/resources/jbpm.cfg.xml	2009-03-06 19:00:04 UTC (rev 4179)
+++ jbpm4/branches/hbraun/modules/enterprise/src/main/resources/jbpm.cfg.xml	2009-03-06 19:20:14 UTC (rev 4180)
@@ -15,7 +15,7 @@
         <file extension=".jpdl.xml" type="jpdl" />
       </assign-file-type>
       <parse-jpdl />
-      <!--check-process / Covered by VersionTimestampPolicy -->
+      <check-process /> <!--Covered by VersionTimestampPolicy -->
       <check-problems />
       <save policy="org.jbpm.pvm.internal.wire.binding.VersionTimestampPolicy"/>
     </deployer-manager>
@@ -24,14 +24,9 @@
     <execution-service />
     <management-service />
 
-    <!--ejb-local-command-service>
-      <home jndi-name="java:jbpm/CommandExecutor"/>
-    </ejb-local-command-service-->
-
     <command-service>
       <retry-interceptor />
       <environment-interceptor />
-      <standard-transaction-interceptor />
     </command-service>
 
     <hibernate-configuration resource="hibernate.cfg.xml"/>
@@ -53,8 +48,7 @@
   </process-engine-context>
 
   <transaction-context>
-    <hibernate-session />
-    <transaction />
+    <hibernate-session current="true"/>
     <pvm-db-session />
     <job-db-session />
     <ejb-timer-session />

Modified: jbpm4/branches/hbraun/modules/integration/jboss5/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/integration/jboss5/pom.xml	2009-03-06 19:00:04 UTC (rev 4179)
+++ jbpm4/branches/hbraun/modules/integration/jboss5/pom.xml	2009-03-06 19:20:14 UTC (rev 4180)
@@ -60,6 +60,7 @@
           <excludes>
             <exclude>META-INF/jbpm-service-jboss-beans.xml</exclude>
             <exclude>META-INF/jbpm-deployers-jboss-beans.xml</exclude>
+            <exclude>META-INF/jbpm.deployer.cfg.xml</exclude>            
           </excludes>
         </configuration>
       </plugin>

Modified: jbpm4/branches/hbraun/modules/integration/jboss5/scripts/assembly-config.xml
===================================================================
--- jbpm4/branches/hbraun/modules/integration/jboss5/scripts/assembly-config.xml	2009-03-06 19:00:04 UTC (rev 4179)
+++ jbpm4/branches/hbraun/modules/integration/jboss5/scripts/assembly-config.xml	2009-03-06 19:20:14 UTC (rev 4180)
@@ -11,6 +11,7 @@
       <outputDirectory>/</outputDirectory>
       <includes>
         <include>**/*beans.xml</include>
+        <exclude>**/jbpm.deployer.cfg.xml</exclude>
       </includes>
     </fileSet>
   </fileSets>

Added: jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm.deployer.cfg.xml
===================================================================
--- jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm.deployer.cfg.xml	                        (rev 0)
+++ jbpm4/branches/hbraun/modules/integration/jboss5/src/main/resources/META-INF/jbpm.deployer.cfg.xml	2009-03-06 19:20:14 UTC (rev 4180)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  jBPM4 deployer configuration.
+  The deployer deals with the transaction management on it's own.
+  (UserTransaction)
+-->
+
+<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 /> <!--Covered by VersionTimestampPolicy -->
+      <check-problems />
+      <save policy="org.jbpm.pvm.internal.wire.binding.VersionTimestampPolicy"/>
+    </deployer-manager>
+
+    <process-service />
+    <execution-service />
+    <management-service />
+
+    <command-service>
+      <retry-interceptor />
+      <environment-interceptor />
+    </command-service>
+
+    <hibernate-configuration resource="hibernate.cfg.xml"/>
+
+    <hibernate-session-factory />
+
+    <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 current="true"/>    
+    <pvm-db-session />
+    <job-db-session />
+    <ejb-timer-session />
+  </transaction-context>
+
+</jbpm-configuration>