[jboss-svn-commits] JBL Code SVN: r38279 - in labs/jbossesb/branches/JBESB_4_11_CP/product: services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2013-02-12 16:51:08 -0500 (Tue, 12 Feb 2013)
New Revision: 38279

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
Log:
JBESB-3902
Provide ability to add esbToBpmVars default with a config property.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2013-02-01 07:51:54 UTC (rev 38278)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2013-02-12 21:51:08 UTC (rev 38279)
@@ -102,7 +102,8 @@
 			new KeyValuePair(Environment.RULES_CONTINUE_STATE			,getRulesContinueState()),
 			new KeyValuePair(Environment.RULES_RESOURCE_SCANNER_INTERVAL,getRulesResourceScannerInterval()),
 			new KeyValuePair(Environment.DEPLOYMENT_SCHEMA_VALIDATION	,getDeploymentSchemaValidation()),
-			new KeyValuePair(Environment.BINARY_SECURITY_TOKEN_IMPLEMENTATION_CLASS, getBinarySecurityTokenImplClass())
+			new KeyValuePair(Environment.BINARY_SECURITY_TOKEN_IMPLEMENTATION_CLASS, getBinarySecurityTokenImplClass()),
+			new KeyValuePair(Environment.LEGACY_ESB_TO_BPM_VARS, getLegacyEsbToBpmParams())
 	};
 
 	public static String dump()
@@ -444,6 +445,11 @@
 		return ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE).getProperty(Environment.MSG_STORE_JCR_ROOT_NODE_PATH);
 	}
 
+	public static String getLegacyEsbToBpmParams() {
+        return ModulePropertyManager.getPropertyManager(ModulePropertyManager.BPM_MODULE).getProperty(Environment.LEGACY_ESB_TO_BPM_VARS,
+                null);	
+	}
+	
     /**
      * Get the pipeline failure event interceptor class names
      * @return Pipeline failure event interceptor Class names.

Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2013-02-01 07:51:54 UTC (rev 38278)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2013-02-12 21:51:08 UTC (rev 38279)
@@ -31,6 +31,7 @@
 
         public static final String PROPERTIES_FILE = "org.jboss.soa.esb.propertyFile";
 
+        
         /**
          * Binding properties
          */
@@ -74,6 +75,9 @@
 
         public static final String WS_RETURN_STACK_TRACE = "org.jboss.soa.esb.ws.returnStackTrace";
         public static final String WS_TIMEOUT = "org.jboss.soa.esb.ws.timeout" ;
+        
+        public static final String LEGACY_ESB_TO_BPM_VARS = "org.jboss.soa.esb.legacy.bpmvars";
+        
         /*
          * Core properties
          */

Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2013-02-01 07:51:54 UTC (rev 38278)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/soa/esb/common/ModulePropertyManager.java	2013-02-12 21:51:08 UTC (rev 38279)
@@ -90,6 +90,8 @@
 	 * The names of the various modules in the property file.
 	 */
 
+	public static final String BPM_MODULE = "bpm";
+	
 	public static final String CORE_MODULE = "core";
 
 	public static final String CONNECTION_MODULE = "connection";

Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2013-02-01 07:51:54 UTC (rev 38278)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actionhandlers/EsbActionHandler.java	2013-02-12 21:51:08 UTC (rev 38279)
@@ -31,6 +31,8 @@
 import org.jboss.soa.esb.addressing.PortReference;
 import org.jboss.soa.esb.addressing.eprs.LogicalEPR;
 import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.common.Environment;
+import org.jboss.soa.esb.common.ModulePropertyManager;
 import org.jboss.soa.esb.couriers.Courier;
 import org.jboss.soa.esb.couriers.CourierFactory;
 import org.jboss.soa.esb.couriers.CourierUtil;
@@ -193,6 +195,12 @@
     {
         EPR replyTo = new LogicalEPR(ServiceInvoker.INTERNAL_SERVICE_CATEGORY, JBpmCallback.JBPM_CALL_BACK_SERVICE_NAME);
         PortReference portReference = replyTo.getAddr();
+        if (esbToJBpmXml!=null) {
+        	String legacy = ModulePropertyManager.getPropertyManager(ModulePropertyManager.BPM_MODULE).getProperty(Environment.LEGACY_ESB_TO_BPM_VARS);
+        	if (Boolean.valueOf(legacy).booleanValue()) {
+        		portReference.addExtension(Constants.ESB_TO_BPM_VARS_TAG, esbToJBpmXml);
+        	}
+        }
         if (globalProcessScope!=null) {
             portReference.addExtension(Constants.PROCESS_SCOPE_ATTR, globalProcessScope.toString());
         }
@@ -220,6 +228,7 @@
         portReference.addExtension(counterName, counter.toString());
         return replyTo;
     }
+    
     /**
      * Sets the faultTo EPR. This way jBPM can handle a failure in the ESB service by taking a 
      * exception (faultTo) transition.