[jboss-svn-commits] JBL Code SVN: r10278 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions/routing and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Mar 16 14:30:44 EDT 2007


Author: kevin.conner at jboss.com
Date: 2007-03-16 14:30:44 -0400 (Fri, 16 Mar 2007)
New Revision: 10278

Removed:
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/BaseTestActionProcessor.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java
Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/EchoRouter.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessageBox.java
   labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/MessageBox.java
Log:
More action updates

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -1,14 +1,11 @@
 package org.jboss.soa.esb.actions.converters;
 
-import java.io.Serializable;
 import java.util.List;
 
 import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.KeyValuePair;
-import org.jboss.soa.esb.message.Message;
 
 /**
  * Abstract object and xstream action processor for common functionality. 
@@ -17,7 +14,7 @@
  * @author danielmarchant
  *
  */
-public abstract class AbstractObjectXStream implements ActionProcessor {
+public abstract class AbstractObjectXStream extends AbstractActionPipelineProcessor {
 	
 	
 	 protected String classAlias;
@@ -49,26 +46,8 @@
 	        excludePackage = KeyValuePair.getBooleanValue("exclude-package", properties, true);
 	    }
 	
-	   
 	
-
-	public Serializable getErrorNotification(Message message) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Serializable getOkNotification(Message message) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public abstract Message process(Message message) throws ActionProcessingException ;
 	
-	
-	
-	
-	
-	
 	public String getName() {
 		return name;
 	}

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -22,12 +22,11 @@
 
 package org.jboss.soa.esb.actions.converters;
 
-import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.KeyValuePair;
@@ -45,7 +44,7 @@
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  * @since Version 4.0
  */
-public class ByteArrayToString implements ActionProcessor {
+public class ByteArrayToString extends AbstractActionPipelineProcessor {
     
     private String encoding;
     
@@ -85,21 +84,4 @@
             throw new ActionProcessingException("Unable to decode byte[] to String. Unsupported character encoding configuration: " + encoding, e);
         }
     }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(Message)
-     */
-    public Serializable getOkNotification(Message message) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(Message)
-     */
-    public Serializable getErrorNotification(Message message) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
 }

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -22,15 +22,14 @@
 package org.jboss.soa.esb.actions.converters;
 
 
-import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.KeyValuePair;
@@ -57,7 +56,7 @@
  * @author danielmarchant
  * @since Version 4.0
  */
-public class ObjectInvoke  implements ActionProcessor {
+public class ObjectInvoke extends AbstractActionPipelineProcessor {
 
 	private static Logger logger = Logger.getLogger(ObjectInvoke.class);
 	
@@ -114,16 +113,6 @@
     }
 	
 	
-	
-	public Serializable getErrorNotification(Message message) {
-		return null;
-	}
-
-	public Serializable getOkNotification(Message message) {
-		return null;
-	}
-
-	
 	/**
 	 * Processes the message by using the giving class-processor.
 	 *  

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -22,15 +22,14 @@
 
 package org.jboss.soa.esb.actions.converters;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.KeyValuePair;
@@ -54,7 +53,7 @@
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  * @since Version 4.0
  */
-public class ObjectToCSVString implements ActionProcessor {
+public class ObjectToCSVString extends AbstractActionPipelineProcessor {
 
 	public static final String BEAN_PROPERTIES_PROP = "bean-properties";
 	public static final String FAIL_ON_MISSING_PROPERTY = "fail-on-missing-property";
@@ -151,18 +150,4 @@
         ActionUtils.setTaskObject(message,csv.toString());
         return message;
     }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
-     */
-    public Serializable getOkNotification(Message message) {
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
-     */
-    public Serializable getErrorNotification(Message message) {
-        return null;
-    }
 }

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -22,12 +22,11 @@
 
 package org.jboss.soa.esb.actions.converters;
 
-import java.io.Serializable;
 import java.util.List;
 
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.KeyValuePair;
@@ -54,7 +53,7 @@
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  * @since Version 4.0
  */
-public class ObjectToXStream implements ActionProcessor {
+public class ObjectToXStream extends AbstractActionPipelineProcessor {
     
     private String classAlias;
     private boolean excludePackage;
@@ -100,18 +99,4 @@
         ActionUtils.setTaskObject(message,xstream.toXML(object));
         return message;
     }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
-     */
-    public Serializable getOkNotification(Message message) {
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
-     */
-    public Serializable getErrorNotification(Message message) {
-        return null;
-    }
 }

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -1,12 +1,10 @@
 package org.jboss.soa.esb.actions.converters;
 
-import java.io.Serializable;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.helpers.KeyValuePair;
@@ -38,7 +36,7 @@
  * @author danielmarchant
  * @since Version 4.0
  */
-public class XStreamToObject  extends AbstractObjectXStream implements ActionProcessor {
+public class XStreamToObject  extends AbstractObjectXStream {
 
 	private static Logger logger = Logger.getLogger(XStreamToObject.class);
 	
@@ -47,12 +45,7 @@
     
     // action related variables
    
-    
-
-
-
-
-	/**
+    /**
      * Public constructor.
      * @param properties Action Properties.
      * @throws ConfigurationException Action not properly configured.
@@ -61,9 +54,6 @@
     	this(properties.getName(), properties.attributesAsList());
     }
     
-    
-    
-    
     /**
      * Public constructor.
      * @param actionName Action name.
@@ -80,18 +70,6 @@
 		}
     }
 	
-	
-	
-	public Serializable getErrorNotification(Message message) {
-		return null;
-	}
-
-	public Serializable getOkNotification(Message message) {
-		return null;
-	}
-
-	
-	
 	/**
 	 * Processes the message by using the giving class-processor.
 	 *  

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/EchoRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/EchoRouter.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/EchoRouter.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -22,11 +22,9 @@
 
 package org.jboss.soa.esb.actions.routing;
 
-import java.io.Serializable;
-
 import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
 import org.jboss.soa.esb.helpers.ConfigTree;
 
@@ -41,7 +39,7 @@
  * 
  * @author <a href="mailto:johan.kumps at telenet.be">Johan Kumps</a>
  */
-public class EchoRouter implements ActionProcessor {
+public class EchoRouter extends AbstractActionPipelineProcessor {
 
 	/* The logger for this class */
 	private static Logger logger = Logger.getLogger(EchoRouter.class);
@@ -65,25 +63,4 @@
 		return message;
 
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
-	 */
-	public Serializable getOkNotification(
-			org.jboss.soa.esb.message.Message message) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
-	 */
-	public Serializable getErrorNotification(
-			org.jboss.soa.esb.message.Message message) {
-		return null;
-	}
-
 }

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -27,6 +27,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
@@ -47,14 +48,11 @@
  *
  * @author <a href="mailto:johan.kumps at telenet.be">Johan Kumps</a>
  */
-public class HttpRouter implements ActionProcessor {
+public class HttpRouter extends AbstractActionPipelineProcessor {
 
 	/* The logger for this class */
 	private static Logger logger = Logger.getLogger(HttpRouter.class);
 
-	/* The configuration for this ActionProcessor */
-	private ConfigTree configTree = null;
-
 	/* The url to route the message to */
 	private String urlToRouteTo = null;
 
@@ -71,11 +69,9 @@
 	 *            the configuration to use in this HttpRouter instance
 	 */
 	public HttpRouter(ConfigTree configTree) {
-		this.configTree = configTree;
-		this.urlToRouteTo = this
-				.obtainAttribute(ListenerTagNames.HTTP_ROUTER_ROUTE_URL,
-						DEFAULT_URL_TO_ROUTE_TO);
-
+                urlToRouteTo = obtainAttribute(configTree,
+                    ListenerTagNames.HTTP_ROUTER_ROUTE_URL,
+                    DEFAULT_URL_TO_ROUTE_TO);
 	}
 
 	/*
@@ -100,10 +96,16 @@
 			InvokerLocator locator = new InvokerLocator(this.urlToRouteTo);
 
 			Client remotingClient = new Client(locator);
-			remotingClient.connect();
-
-			remotingClient.invoke(oCurr, null);
-			return message;
+                        remotingClient.connect();
+                        try
+                        {
+                            remotingClient.invoke(oCurr, null);
+                            return message;
+                        }
+                        finally
+                        {
+                            remotingClient.disconnect() ;
+                        }
 		} catch (Throwable e) {
 			String errorMessage = "Exception while sending message [" + oCurr
 					+ "] to destination [" + this.urlToRouteTo + "].";
@@ -124,29 +126,8 @@
 	 * @return the value of the attribute or the default one is not set in
 	 *         configuration tree
 	 */
-	private String obtainAttribute(String p_sAtt, String p_sDefault) {
-		String sVal = this.configTree.getAttribute(p_sAtt);
+	private String obtainAttribute(final ConfigTree configTree, String p_sAtt, String p_sDefault) {
+		String sVal = configTree.getAttribute(p_sAtt);
 		return (null != sVal) ? sVal : p_sDefault;
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
-	 */
-	public Serializable getOkNotification(
-			org.jboss.soa.esb.message.Message message) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
-	 */
-	public Serializable getErrorNotification(
-			org.jboss.soa.esb.message.Message message) {
-		return null;
-	}
-
 }

Deleted: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/BaseTestActionProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/BaseTestActionProcessor.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/BaseTestActionProcessor.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Vector;
-
-import org.jboss.soa.esb.message.Message;
-
-/**
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- * @since Version 4.0
- */
-public abstract class BaseTestActionProcessor implements ActionProcessor {
-
-	public ActionProcessingException exception;
-	public List<Message> processedMessages = new Vector<Message>();
-	public boolean returnNull = false;
-	
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#process(java.lang.Object)
-     */
-    public Message process(Message message) throws ActionProcessingException {
-    	if(exception != null) {
-    		throw exception;
-    	}
-    	
-    	processedMessages.add(message);
-    	
-    	if(returnNull) {
-    		return null;
-    	}
-    	
-    	return message;
-    }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
-     */
-    public Serializable getOkNotification(Message message) {
-        return "OK: " + message;
-    }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
-     */
-    public Serializable getErrorNotification(Message message) {
-        return "ERROR: " + message;
-    }
-
-}

Deleted: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.soa.esb.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.soa.esb.message.Message;
-
-/**
- * 
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- * @since Version 4.0
- */
-public class ToNowhereRouter extends BaseTestActionProcessor {
-
-    public static List<Object> objects = new ArrayList<Object>();
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
-     */
-    public Message process(Message msg) throws ActionProcessingException {
-        objects.add(ActionUtils.getTaskObject(msg));
-                
-        System.out.println("ToNowhereRouter");
-        return msg;
-    }
-
-}

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -24,9 +24,9 @@
 
 import java.util.Date;
 
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionUtils;
-import org.jboss.soa.esb.actions.BaseTestActionProcessor;
 import org.jboss.soa.esb.message.Message;
 
 /**
@@ -35,7 +35,7 @@
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  * @since Version 4.0
  */
-public class LongToDateConverter extends BaseTestActionProcessor
+public class LongToDateConverter extends AbstractActionPipelineProcessor
 {
 
 	/*

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -22,9 +22,9 @@
 
 package org.jboss.soa.esb.actions.converters;
 
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionUtils;
-import org.jboss.soa.esb.actions.BaseTestActionProcessor;
 import org.jboss.soa.esb.message.Message;
 
 /**
@@ -32,7 +32,7 @@
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  * @since Version 4.0
  */
-public class StringToLongConverter extends BaseTestActionProcessor {
+public class StringToLongConverter extends AbstractActionPipelineProcessor {
 
     /* (non-Javadoc)
      * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/EchoRouterUnitTest.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -41,9 +41,6 @@
 		msg.getBody().setContents("hello world".getBytes());
 		
 		router.process(msg);
-		
-		router.getErrorNotification(null);
-		router.getOkNotification(null);
 	}
 	
 }

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/routing/HttpRouterUnitTest.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -74,9 +74,6 @@
 		{
 			//fail();
 		}
-		
-		router.getErrorNotification(null);
-		router.getOkNotification(null);
 	}
 	
 }

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessageBox.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessageBox.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/MessageBox.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -22,7 +22,6 @@
 
 package org.jboss.soa.esb.actions;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Vector;
 
@@ -37,7 +36,7 @@
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  * @since Version 4.0
  */
-public class MessageBox implements ActionProcessor {
+public class MessageBox extends AbstractActionPipelineProcessor {
 
     private static Logger logger = Logger.getLogger(MessageBox.class);
     public static List<Object> messages = new Vector<Object>(); 
@@ -75,19 +74,4 @@
         logger.error(errorMsg);
         TestCase.fail(errorMsg);
     }
-    
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
-     */
-    public Serializable getOkNotification(Message message) {
-        return "OK" + ActionUtils.getTaskObject(message);
-    }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
-     */
-    public Serializable getErrorNotification(Message message) {
-        return "Error" + ActionUtils.getTaskObject(message);
-    }
-
 }

Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/MessageBox.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/MessageBox.java	2007-03-16 18:01:10 UTC (rev 10277)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/MessageBox.java	2007-03-16 18:30:44 UTC (rev 10278)
@@ -29,6 +29,7 @@
 import junit.framework.TestCase;
 
 import org.apache.log4j.Logger;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
 import org.jboss.soa.esb.actions.ActionProcessingException;
 import org.jboss.soa.esb.actions.ActionProcessor;
 import org.jboss.soa.esb.actions.ActionUtils;
@@ -40,7 +41,7 @@
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  * @since Version 4.0
  */
-public class MessageBox implements ActionProcessor {
+public class MessageBox extends AbstractActionPipelineProcessor {
 
     private static Logger logger = Logger.getLogger(MessageBox.class);
     public static List<Object> messages = new Vector<Object>(); 
@@ -78,19 +79,4 @@
         logger.error(errorMsg);
         TestCase.fail(errorMsg);
     }
-    
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
-     */
-    public Serializable getOkNotification(Message message) {
-        return "OK" + ActionUtils.getTaskObject(message);
-    }
-
-    /* (non-Javadoc)
-     * @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
-     */
-    public Serializable getErrorNotification(Message message) {
-        return "Error" + ActionUtils.getTaskObject(message);
-    }
-
 }




More information about the jboss-svn-commits mailing list