[jbpm-commits] JBoss JBPM SVN: r4687 - in jbpm3/trunk/modules/core/src/main/java/org/jbpm: instantiation and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-05-01 04:50:05 -0400 (Fri, 01 May 2009)
New Revision: 4687

Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/UserCodeInterceptorConfig.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java
Log:
[JBPM-2194] Allow clients to set the UserCodeInterceptor in the configuration file

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java	2009-05-01 05:24:39 UTC (rev 4686)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/GraphElement.java	2009-05-01 08:50:05 UTC (rev 4687)
@@ -281,8 +281,8 @@
           token.lock(lockOwnerId);
         }
 
-        if (UserCodeInterceptorConfig.userCodeInterceptor != null) {
-          UserCodeInterceptorConfig.userCodeInterceptor.executeAction(action, executionContext);
+        if (UserCodeInterceptorConfig.getUserCodeInterceptor() != null) {
+          UserCodeInterceptorConfig.getUserCodeInterceptor().executeAction(action, executionContext);
         } else {
           action.execute(executionContext);
         }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/UserCodeInterceptorConfig.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/UserCodeInterceptorConfig.java	2009-05-01 05:24:39 UTC (rev 4686)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/UserCodeInterceptorConfig.java	2009-05-01 08:50:05 UTC (rev 4687)
@@ -1,9 +1,25 @@
 package org.jbpm.instantiation;
 
-public abstract class UserCodeInterceptorConfig {
+import org.jbpm.JbpmConfiguration;
 
-  public static UserCodeInterceptor userCodeInterceptor = null;
+public class UserCodeInterceptorConfig {
 
+  private static UserCodeInterceptor userCodeInterceptor;
+
+  private UserCodeInterceptorConfig() {
+    // hide default constructor to prevent instantiation
+  }
+
+  public static UserCodeInterceptor getUserCodeInterceptor() {
+    if (userCodeInterceptor != null) return userCodeInterceptor;
+
+    if (JbpmConfiguration.Configs.hasObject("jbpm.user.code.interceptor")) {
+      return (UserCodeInterceptor) JbpmConfiguration.Configs.getObject("jbpm.user.code.interceptor");
+    }
+
+    return null;
+  }
+
   public static void setUserCodeInterceptor(UserCodeInterceptor interceptor) {
     userCodeInterceptor = interceptor;
   }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java	2009-05-01 05:24:39 UTC (rev 4686)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/def/TaskController.java	2009-05-01 08:50:05 UTC (rev 4687)
@@ -81,8 +81,8 @@
         ContextInstance contextInstance = (processInstance != null ? processInstance.getContextInstance() : null);
         Token token = taskInstance.getToken();
 
-        if (UserCodeInterceptorConfig.userCodeInterceptor != null) {
-          UserCodeInterceptorConfig.userCodeInterceptor.executeTaskControllerInitialization(taskControllerHandler, taskInstance, contextInstance, token);
+        if (UserCodeInterceptorConfig.getUserCodeInterceptor() != null) {
+          UserCodeInterceptorConfig.getUserCodeInterceptor().executeTaskControllerInitialization(taskControllerHandler, taskInstance, contextInstance, token);
         } else {
           taskControllerHandler.initializeTaskVariables(taskInstance, contextInstance, token);
         }
@@ -131,8 +131,8 @@
         ContextInstance contextInstance = (processInstance != null ? processInstance.getContextInstance() : null);
         Token token = taskInstance.getToken();
 
-        if (UserCodeInterceptorConfig.userCodeInterceptor != null) {
-          UserCodeInterceptorConfig.userCodeInterceptor.executeTaskControllerSubmission(taskControllerHandler, taskInstance, contextInstance, token);
+        if (UserCodeInterceptorConfig.getUserCodeInterceptor() != null) {
+          UserCodeInterceptorConfig.getUserCodeInterceptor().executeTaskControllerSubmission(taskControllerHandler, taskInstance, contextInstance, token);
         } else {
           taskControllerHandler.submitTaskVariables(taskInstance, contextInstance, token);
         }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java	2009-05-01 05:24:39 UTC (rev 4686)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java	2009-05-01 08:50:05 UTC (rev 4687)
@@ -304,9 +304,9 @@
       // instantiate the assignment handler
       AssignmentHandler assignmentHandler = (AssignmentHandler)assignmentDelegation.instantiate();
       // invoke the assignment handler
-      if (UserCodeInterceptorConfig.userCodeInterceptor != null)
+      if (UserCodeInterceptorConfig.getUserCodeInterceptor() != null)
       {
-        UserCodeInterceptorConfig.userCodeInterceptor.executeAssignment(assignmentHandler, assignable, executionContext);
+        UserCodeInterceptorConfig.getUserCodeInterceptor().executeAssignment(assignmentHandler, assignable, executionContext);
       }
       else
       {