[jboss-svn-commits] JBL Code SVN: r10305 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions/converters and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Mar 17 14:40:16 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-03-17 14:40:16 -0400 (Sat, 17 Mar 2007)
New Revision: 10305
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractActionPipelineProcessor.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionPipelineProcessor.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
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/scripting/GroovyActionProcessor.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessorMethodInfo.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionLifecycleProcessor.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionPipelineProcessor.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionLifecycleProcessor.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessor.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessorConstructorFailure.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionProcessor.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/MessageBox.java
Log:
Change signature to expect Throwable
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractActionPipelineProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractActionPipelineProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractActionPipelineProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -37,9 +37,9 @@
* pipeline generates an exception.
*
* @param message The original message.
- * @param ex The exception raised by the pipeline processing
+ * @param th The throwable raised by the pipeline processing
*/
- public void processException(final Message message, final Exception ex)
+ public void processException(final Message message, final Throwable th)
{
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionPipelineProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionPipelineProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionPipelineProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -64,9 +64,9 @@
* pipeline generates an exception.
*
* @param message The original message.
- * @param ex The exception raised by the pipeline processing
+ * @param th The throwable raised by the pipeline processing
*/
- public void processException(final Message message, final Exception ex) ;
+ public void processException(final Message message, final Throwable th) ;
/**
* Process a successful pipeline process.
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -28,7 +28,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -357,7 +356,7 @@
return string.toString();
}
- public void processException(final Message message, final Exception ex) {
+ public void processException(final Message message, final Throwable th) {
}
public void processSuccess(final Message message) {
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-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -22,14 +22,11 @@
package org.jboss.soa.esb.actions.routing;
-import java.io.Serializable;
-
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;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.listeners.ListenerTagNames;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/scripting/GroovyActionProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -131,7 +131,7 @@
}
}
- public void processException(final Message message, final Exception ex) {
+ public void processException(final Message message, final Throwable th) {
}
public void processSuccess(final Message message) {
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessorMethodInfo.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessorMethodInfo.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/ActionProcessorMethodInfo.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -177,13 +177,13 @@
* @param message The initial message.
* @param ex The exception.
*/
- void processException(final Object instance, final Message message, final Exception ex)
+ void processException(final Object instance, final Message message, final Throwable th)
{
if (hasProcessException())
{
try
{
- processException.invoke(instance, message, ex) ;
+ processException.invoke(instance, message, th) ;
}
catch (final IllegalAccessException iae)
{
@@ -191,8 +191,7 @@
}
catch (final InvocationTargetException ite)
{
- final Throwable th = ite.getTargetException() ;
- LOGGER.warn("Unexpected invocation target exception from processor", th) ;
+ LOGGER.warn("Unexpected invocation target exception from processor", ite.getTargetException()) ;
}
}
}
@@ -256,7 +255,7 @@
final Method processSuccess = getMethod(actionClass, processSuccessName, Message.class);
final String processExceptionName = getPropertyValue(actionConfig, ListenerTagNames.EXCEPTION_METHOD_TAG) ;
- final Method processException = getMethod(actionClass, processExceptionName, Message.class, Exception.class) ;
+ final Method processException = getMethod(actionClass, processExceptionName, Message.class, Throwable.class) ;
return new ActionProcessorMethodInfo(processMethods, processSuccess, processException) ;
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionLifecycleProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionLifecycleProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionLifecycleProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -85,13 +85,13 @@
* pipeline generates an exception.
*
* @param message The original message.
- * @param ex The exception raised by the pipeline processing
+ * @param th The throwable raised by the pipeline processing
*/
- public void processException(final Message message, final Exception ex)
+ public void processException(final Message message, final Throwable th)
{
if (methodInfo.hasProcessException())
{
- methodInfo.processException(lifecycle, message, ex) ;
+ methodInfo.processException(lifecycle, message, th) ;
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionPipelineProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionPipelineProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionPipelineProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -84,17 +84,17 @@
* pipeline generates an exception.
*
* @param message The original message.
- * @param ex The exception raised by the pipeline processing
+ * @param th The throwable raised by the pipeline processing
*/
- public void processException(final Message message, final Exception ex)
+ public void processException(final Message message, final Throwable th)
{
if (methodInfo.hasProcessException())
{
- methodInfo.processException(processor, message, ex) ;
+ methodInfo.processException(processor, message, th) ;
}
else
{
- processor.processException(message, ex) ;
+ processor.processException(message, th) ;
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/OverriddenActionProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -110,14 +110,14 @@
* pipeline generates an exception.
*
* @param message The original message.
- * @param ex The exception raised by the pipeline processing
+ * @param th The throwable raised by the pipeline processing
*/
- public void processException(final Message message, final Exception ex)
+ public void processException(final Message message, final Throwable th)
{
final Object instance = messageInstanceMap.remove(message) ;
if (instance != null)
{
- methodInfo.processException(instance, message, ex) ;
+ methodInfo.processException(instance, message, th) ;
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionLifecycleProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionLifecycleProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionLifecycleProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -51,12 +51,12 @@
return message ;
}
- public void processException(Message message, Exception ex)
+ public void processException(Message message, Throwable th)
{
MockActionInfo.addExceptionId(id) ;
}
- public void anotherProcessException(Message message, Exception ex)
+ public void anotherProcessException(Message message, Throwable th)
{
MockActionInfo.addExceptionId(anotherId) ;
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -51,12 +51,12 @@
return message ;
}
- public void processException(Message message, Exception ex)
+ public void processException(Message message, Throwable th)
{
MockActionInfo.addExceptionId(id) ;
}
- public void anotherProcessException(Message message, Exception ex)
+ public void anotherProcessException(Message message, Throwable th)
{
MockActionInfo.addExceptionId(anotherId) ;
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessorConstructorFailure.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessorConstructorFailure.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionPipelineProcessorConstructorFailure.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -43,7 +43,7 @@
return message ;
}
- public void processException(Message message, Exception ex)
+ public void processException(Message message, Throwable th)
{
MockActionInfo.addExceptionId(id) ;
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionProcessor.java 2007-03-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/message/MockActionProcessor.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -49,12 +49,12 @@
return message ;
}
- public void processException(Message message, Exception ex)
+ public void processException(Message message, Throwable th)
{
MockActionInfo.addExceptionId(id) ;
}
- public void anotherProcessException(Message message, Exception ex)
+ public void anotherProcessException(Message message, Throwable th)
{
MockActionInfo.addExceptionId(anotherId) ;
}
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-17 16:27:36 UTC (rev 10304)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/message/MessageBox.java 2007-03-17 18:40:16 UTC (rev 10305)
@@ -22,7 +22,6 @@
package org.jboss.soa.esb.listeners.message;
-import java.io.Serializable;
import java.util.List;
import java.util.Vector;
@@ -31,7 +30,6 @@
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;
import org.jboss.soa.esb.message.Message;
More information about the jboss-svn-commits
mailing list