[jbpm-commits] JBoss JBPM SVN: r3903 - in jbpm4/trunk/modules/enterprise/src: main/resources/META-INF and 1 other directories.
Author: heiko.braun(a)jboss.com
Date: 2009-02-17 09:38:46 -0500 (Tue, 17 Feb 2009)
New Revision: 3903
Removed:
jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml
Modified:
jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml
jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
Log:
Reference java:/JbpmDS instead of java:/DefaultDS
Modified: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml 2009-02-17
14:34:54 UTC (rev 3902)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml 2009-02-17
14:38:46 UTC (rev 3903)
@@ -12,7 +12,7 @@
<local-jndi-name>java:jbpm/CommandExecutor</local-jndi-name>
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
- <jndi-name>java:DefaultDS</jndi-name>
+ <jndi-name>java:JbpmDS</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
Modified: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-17 14:34:54 UTC
(rev 3902)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2009-02-17 14:38:46 UTC
(rev 3903)
@@ -3,13 +3,12 @@
<!--
jBPM4 enterprise configuration.
Uses different command service and environment config.
- (i.e. skips the TX interceptor)
-
+ (i.e. skips the TX interceptor)
-->
<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
- <process-engine-context>
+ <process-engine>
<deployer-manager>
<check-process />
@@ -41,13 +40,13 @@
<holiday period="01/07/2008 - 31/08/2008"/>
</business-calendar>
- </process-engine-context>
+ </process-engine>
- <transaction-context>
+ <environment>
<hibernate-session current="true" />
<pvm-db-session />
<job-db-session />
<ejb-timer-session />
- </transaction-context>
+ </environment>
</jbpm-configuration>
Deleted: jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-17
14:34:54 UTC (rev 3902)
+++ jbpm4/trunk/modules/enterprise/src/test/resources/environment.cfg.xml 2009-02-17
14:38:46 UTC (rev 3903)
@@ -1,41 +0,0 @@
-<jbpm-configuration>
-
- <process-engine-context>
-
- <deployer-manager>
- <check-process />
- <check-problems />
- <save />
- </deployer-manager>
-
- <process-service />
- <execution-service />
- <management-service />
- <ejb-local-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>