[jboss-svn-commits] JBL Code SVN: r7225 - in labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb: actions listeners/message

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

Author: daniel.brum at jboss.com
Date: 2006-10-30 07:18:10 -0500 (Mon, 30 Oct 2006)
New Revision: 7225

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java
Log:


Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java	2006-10-30 10:55:08 UTC (rev 7224)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java	2006-10-30 12:18:10 UTC (rev 7225)
@@ -37,7 +37,7 @@
 {
 	public  static final String BEFORE_ACTION="org.jboss.soa.esb.actions.current.before";
 	private static final String CURRENT_OBJECT="org.jboss.soa.esb.actions.current.after";
-	private static final String CONFIG_TREE	="org.jboss.soa.esb.helpers.ConfigTree";
+//	private static final String CONFIG_TREE	="org.jboss.soa.esb.helpers.ConfigTree";
 
     /**
      * Obtain the current object from standard spot within message 
@@ -84,34 +84,34 @@
     	return oRet;
     }	
 
-    /**
-     * Put a Config tree in predefined spot for it in 'this'
-     * <br/>NULL values are not stored 
-     * @param message - to operate on
-     * @param tree - ConfigTree to store - Won't be stored if &lt;null&gt;
-     * @return ConfigTree previously stored
-     */
-    public static ConfigTree setConfigTree(Message message, ConfigTree tree)
-    {
-    	ConfigTree oRet = (ConfigTree)message.getBody().remove(CONFIG_TREE);
-    	if (null!=tree)
-    		message.getBody().add(CONFIG_TREE,tree.toXml());
-    	return oRet;
-    }	
-    /**
-     * Put a Config tree in predefined spot for it in 'this'
-     * <br/>NULL values are not stored 
-     * @param message - to operate on
-     * @param tree - ConfigTree to store - Won't be stored if &lt;null&gt;
-     * @return ConfigTree previously stored
-     */
-    public static ConfigTree getConfigTree(Message message)
-    {
-    	ConfigTree oRet =null; 
-    	try { oRet = ConfigTree.fromXml((String)message.getBody().get(CONFIG_TREE)); }
-    	catch(Exception e)  { _logger.error("Problems getting ConfigTree from Message",e); }
-    	return (null==oRet)?new ConfigTree("mock"):oRet;
-    }
+//    /**
+//     * Put a Config tree in predefined spot for it in 'this'
+//     * <br/>NULL values are not stored 
+//     * @param message - to operate on
+//     * @param tree - ConfigTree to store - Won't be stored if &lt;null&gt;
+//     * @return ConfigTree previously stored
+//     */
+//    public static ConfigTree setConfigTree(Message message, ConfigTree tree)
+//    {
+//    	ConfigTree oRet = (ConfigTree)message.getBody().remove(CONFIG_TREE);
+//    	if (null!=tree)
+//    		message.getBody().add(CONFIG_TREE,tree.toXml());
+//    	return oRet;
+//    }	
+//    /**
+//     * Put a Config tree in predefined spot for it in 'this'
+//     * <br/>NULL values are not stored 
+//     * @param message - to operate on
+//     * @param tree - ConfigTree to store - Won't be stored if &lt;null&gt;
+//     * @return ConfigTree previously stored
+//     */
+//    public static ConfigTree getConfigTree(Message message)
+//    {
+//    	ConfigTree oRet =null; 
+//    	try { oRet = ConfigTree.fromXml((String)message.getBody().get(CONFIG_TREE)); }
+//    	catch(Exception e)  { _logger.error("Problems getting ConfigTree from Message",e); }
+//    	return (null==oRet)?new ConfigTree("mock"):oRet;
+//    }
     
     public static NotificationList getNotifyList(ConfigTree tree, String type)
     {

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2006-10-30 10:55:08 UTC (rev 7224)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2006-10-30 12:18:10 UTC (rev 7225)
@@ -1,14 +1,14 @@
 package org.jboss.soa.esb.listeners.message;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import org.apache.log4j.Logger;
-
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.actions.ActionUtils;
-import org.jboss.soa.esb.helpers.ConfigTree;
 
 
 /**
@@ -27,13 +27,13 @@
      * @param message Message - The initial message to be run through the whole action 
      * class chain
      */
-    public ActionProcessingPipeline(Message message)
+    public ActionProcessingPipeline(Message message, ConfigTree config)
     	throws ConfigurationException
     {
     	if (null==message)
     		throw new IllegalArgumentException("Message must be not null");
         _message	= message;
-        _config		= ActionUtils.getConfigTree(_message);
+        _config		= config;
     	if (null==_config)
     		throw new IllegalArgumentException("Configuration needed for action classes");
     	_actionList = _config.getChildren(ListenerTagNames.ACTION_ELEMENT_TAG);

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java	2006-10-30 10:55:08 UTC (rev 7224)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java	2006-10-30 12:18:10 UTC (rev 7225)
@@ -37,14 +37,12 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.log4j.Logger;
-
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.addressing.eprs.JMSEpr;
 import org.jboss.soa.esb.helpers.AppServerContext;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
 import org.jboss.soa.esb.util.Util;
-import org.jboss.soa.esb.actions.ActionUtils;
-import org.jboss.soa.esb.addressing.eprs.JMSEpr;
 import org.xml.sax.SAXException;
 
 /**
@@ -92,10 +90,9 @@
     		org.jboss.soa.esb.message.Message message = (lwait > 0 ) ? receiveEsbMessage(100) : null;
         	if (null!=message)
         	{	
-        		ActionUtils.setConfigTree(message,_config);
         		ActionProcessingPipeline chain = null;
 
-        		try	{ chain = new ActionProcessingPipeline(message); }
+        		try	{ chain = new ActionProcessingPipeline(message,_config); }
         		catch (IllegalArgumentException e)	
         			{	_logger.error(e); 	continue; }
         		catch (ConfigurationException e)