[jbpm-commits] JBoss JBPM SVN: r5980 - in jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test: hibernatelongid and 1 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-12-17 14:45:24 -0500 (Thu, 17 Dec 2009) New Revision: 5980 Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/customtype/jbpm.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/idgenerator/jbpm.cfg.xml Log: fixing jbpm-cfg: updating configuration changes Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/customtype/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/customtype/jbpm.cfg.xml 2009-12-17 17:09:15 UTC (rev 5979) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/customtype/jbpm.cfg.xml 2009-12-17 19:45:24 UTC (rev 5980) @@ -3,9 +3,9 @@ <jbpm-configuration> <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> + <import resource="jbpm.default.scriptmanager.xml" /> <process-engine-context> @@ -14,9 +14,29 @@ <hibernate-configuration> <cfg resource="org/jbpm/test/customtype/jbpm.hibernate.cfg.xml" /> </hibernate-configuration> + + + <!-- + Above are the customized parts. The rest is just duplication + of the default and hibernate tx config files + --> + + <hibernate-session-factory /> - + <command-service name="txRequiredCommandService"> + <skip-interceptor /> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <command-service name="newTxRequiredCommandService"> + <retry-interceptor /> + <environment-interceptor policy="requiresNew" /> + <standard-transaction-interceptor /> + </command-service> + <repository-service /> <repository-cache /> <execution-service /> @@ -25,20 +45,14 @@ <identity-service /> <task-service /> - <hibernate-session-factory /> - - <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator" init="eager"> + <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator"> <field name="commandService"><ref object="newTxRequiredCommandService" /></field> - <invoke method="initialize" /> </object> <object class="org.jbpm.pvm.internal.id.DatabaseIdComposer" init="eager" /> - <script-manager default-expression-language="juel" - default-script-language="juel"> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - + <types resource="jbpm.variable.types.xml" /> + <address-resolver /> <mail-template name='task-notification'> @@ -66,17 +80,24 @@ </process-engine-context> <transaction-context> + <transaction /> + + <hibernate-session /> <repository-session /> <db-session /> - <message-session /> <timer-session /> - <history-session /> + + <history-sessions> + <object class="org.jbpm.pvm.internal.history.HistorySessionImpl" /> + </history-sessions> + <mail-session> <mail-server> <session-properties resource="jbpm.mail.properties" /> </mail-server> </mail-session> + </transaction-context> </jbpm-configuration> Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml 2009-12-17 17:09:15 UTC (rev 5979) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml 2009-12-17 19:45:24 UTC (rev 5980) @@ -3,12 +3,38 @@ <jbpm-configuration> <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> + <import resource="jbpm.default.scriptmanager.xml" /> <process-engine-context> - + + <hibernate-configuration> + <cfg resource="org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml" /> + </hibernate-configuration> + + + <!-- + Above are the customized parts. The rest is just duplication + of the default and hibernate tx config files + --> + + + <command-service name="txRequiredCommandService"> + <skip-interceptor /> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <command-service name="newTxRequiredCommandService"> + <retry-interceptor /> + <environment-interceptor policy="requiresNew" /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-session-factory /> + <repository-service /> <repository-cache /> <execution-service /> @@ -17,24 +43,12 @@ <identity-service /> <task-service /> - <hibernate-configuration> - <cfg resource="org/jbpm/test/hibernatelongid/jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> - - <hibernate-session-factory /> - - <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator" init="eager"> + <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator"> <field name="commandService"><ref object="newTxRequiredCommandService" /></field> - <invoke method="initialize" /> </object> <object class="org.jbpm.pvm.internal.id.DatabaseIdComposer" init="eager" /> - <script-manager default-expression-language="juel" - default-script-language="juel"> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - <types resource="jbpm.variable.types.xml" /> <address-resolver /> @@ -64,12 +78,18 @@ </process-engine-context> <transaction-context> + <transaction /> + + <hibernate-session /> <repository-session /> <db-session /> - <message-session /> <timer-session /> - <history-session /> + + <history-sessions> + <object class="org.jbpm.pvm.internal.history.HistorySessionImpl" /> + </history-sessions> + <mail-session> <mail-server> <session-properties resource="jbpm.mail.properties" /> Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/idgenerator/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/idgenerator/jbpm.cfg.xml 2009-12-17 17:09:15 UTC (rev 5979) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/idgenerator/jbpm.cfg.xml 2009-12-17 19:45:24 UTC (rev 5980) @@ -3,12 +3,38 @@ <jbpm-configuration> <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> + <import resource="jbpm.default.scriptmanager.xml" /> <process-engine-context> - + + <hibernate-configuration> + <cfg resource="org/jbpm/test/idgenerator/jbpm.hibernate.cfg.xml" /> + </hibernate-configuration> + + + <!-- + Above are the customized parts. The rest is just duplication + of the default and hibernate tx config files + --> + + + <command-service name="txRequiredCommandService"> + <skip-interceptor /> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <command-service name="newTxRequiredCommandService"> + <retry-interceptor /> + <environment-interceptor policy="requiresNew" /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-session-factory /> + <repository-service /> <repository-cache /> <execution-service /> @@ -17,37 +43,53 @@ <identity-service /> <task-service /> - <hibernate-configuration> - <cfg resource="org/jbpm/test/idgenerator/jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> - - <hibernate-session-factory /> - - <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator" init="eager"> + <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator"> <field name="commandService"><ref object="newTxRequiredCommandService" /></field> - <invoke method="initialize" /> </object> <object class="org.jbpm.pvm.internal.id.DatabaseIdComposer" init="eager" /> - <script-manager default-expression-language="juel" - default-script-language="juel"> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - <types resource="jbpm.variable.types.xml" /> <address-resolver /> + + <mail-template name='task-notification'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hi ${task.assignee}, +Task "${task.name}" has been assigned to you. +${task.description} + +Sent by JBoss jBPM +]]></text> + </mail-template> + <mail-template name='task-reminder'> + <to users="${task.assignee}"/> + <subject>${task.name}</subject> + <text><![CDATA[Hey ${task.assignee}, +Do not forget about task "${task.name}". +${task.description} + +Sent by JBoss jBPM +]]></text> + </mail-template> + </process-engine-context> <transaction-context> + <transaction /> + + <hibernate-session /> <repository-session /> <db-session /> - <message-session /> <timer-session /> - <history-session /> + + <history-sessions> + <object class="org.jbpm.pvm.internal.history.HistorySessionImpl" /> + </history-sessions> + <mail-session> <mail-server> <session-properties resource="jbpm.mail.properties" />