[jboss-svn-commits] JBL Code SVN: r23182 - in labs/jbossesb/workspace/skeagh: api/service/src/main/java/org/jboss/esb/service and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 29 09:04:19 EDT 2008
Author: tfennelly
Date: 2008-09-29 09:04:18 -0400 (Mon, 29 Sep 2008)
New Revision: 23182
Added:
labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessingException.java
labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessor.java
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml
Removed:
labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java
labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformer.java
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/transformers-smooks.xml
Modified:
labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/Service.java
labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceException.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/inrouters-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/outrouters-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java
Log:
Renaming the Transformers to Processors
Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessingException.java (from rev 23172, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessingException.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessingException.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.message;
+
+import org.jboss.esb.JBossESBException;
+
+/**
+ * Message Processing Exception.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class MessageProcessingException extends JBossESBException
+{
+
+ /**
+ * Public Constructor.
+ *
+ * @param message Exception message.
+ */
+ public MessageProcessingException(final String message)
+ {
+ super(message);
+ }
+
+ /**
+ * Public Constructor.
+ *
+ * @param message Exception message.
+ * @param cause Exception cause.
+ */
+ public MessageProcessingException(final String message, final Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessingException.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessor.java (from rev 23172, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformer.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessor.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessor.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.message;
+
+/**
+ * Message Transformer Interface.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface MessageProcessor
+{
+ /**
+ * Process the message.
+ *
+ * @param message The message to be processed.
+ * @throws MessageProcessingException An exception occured while processing the message.
+ */
+ Message process(final Message message) throws MessageProcessingException;
+}
Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessor.java
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.message;
-
-import org.jboss.esb.JBossESBException;
-
-/**
- * Message Transformation Exception.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class MessageTransformationException extends JBossESBException
-{
-
- /**
- * Public Constructor.
- *
- * @param message Exception message.
- */
- public MessageTransformationException(final String message)
- {
- super(message);
- }
-
- /**
- * Public Constructor.
- *
- * @param message Exception message.
- * @param cause Exception cause.
- */
- public MessageTransformationException(final String message, final Throwable cause)
- {
- super(message, cause);
- }
-}
Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformer.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformer.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.message;
-
-/**
- * Message Transformer Interface.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface MessageTransformer
-{
- /**
- * Transform the message.
- *
- * @param message The message to be transformed.
- * @throws MessageTransformationException An exception occured while transforming the message.
- */
- void transform(Message message) throws MessageTransformationException;
-}
Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/Service.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/Service.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/Service.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -20,6 +20,7 @@
package org.jboss.esb.service;
import org.jboss.esb.message.Message;
+import org.jboss.esb.message.MessageProcessor;
/**
* ESB Service interface.
@@ -44,7 +45,7 @@
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public interface Service
+public interface Service extends MessageProcessor
{
/**
* Service process method.
Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceException.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceException.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -19,14 +19,14 @@
*/
package org.jboss.esb.service;
-import org.jboss.esb.JBossESBException;
+import org.jboss.esb.message.MessageProcessingException;
/**
* Service Exception.
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public class ServiceException extends JBossESBException
+public class ServiceException extends MessageProcessingException
{
/**
* Public Constructor.
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -37,7 +37,7 @@
import org.jboss.esb.federate.bus.BusInboundRouter;
import org.jboss.esb.federate.bus.BusOutboundRouter;
import org.jboss.esb.federate.bus.BusRoutingContext;
-import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.message.MessageProcessor;
import org.jboss.esb.properties.ApplicationProperties;
import org.jboss.esb.properties.PropertiesIterator;
import org.jboss.esb.schedule.JobScheduler;
@@ -602,8 +602,8 @@
{
try
{
- // Deploy the transformers first...
- deployTransformers(serviceName, routerConfig.getTransformers(), routerConfig.getName());
+ // Deploy the processors first...
+ deployProcessors(serviceName, routerConfig.getProcessors(), routerConfig.getName());
// Create a LocalDispatcher and hook it into the DispatcherProxy...
LocalDispatcher dispatcher = new LocalDispatcher(context);
@@ -611,7 +611,7 @@
dispatcher.setService(getService(aggregatedDeploymentUnit, serviceName));
dispatcher.setReplyTo(routerConfig.getReplyTo());
dispatcher.setFaultTo(routerConfig.getFaultTo());
- dispatcher.setTransformers(routerConfig.getTransformers());
+ dispatcher.setProcessors(routerConfig.getProcessors());
dispatcher.setOutboundRouters(aggregatedDeploymentUnit.getOutboundRouters().get(serviceName));
// Set the dispacther on both the router and the routerconfig. We set it on the config
@@ -711,7 +711,7 @@
try
{
// Deploy the transformers first...
- deployTransformers(routerConfigMap.getKey(), routerConfig.getTransformers(), routerConfig.getName());
+ deployProcessors(routerConfigMap.getKey(), routerConfig.getProcessors(), routerConfig.getName());
// Now deploy the router...
deployObject(routerConfig.getRouter(), routerConfig.getName(), routerConfigMap.getKey());
@@ -812,28 +812,28 @@
* Deploy the transformers.
*
* @param serviceName The service with which the transformer set is associated.
- * @param transformers The transformer list.
+ * @param processors The transformer list.
* @param routerConfigName The name of the owning router. @throws DeploymentException Error deploying transformers.
* @throws DeploymentException Error deploying transformers.
*/
- private void deployTransformers(final ServiceName serviceName, final List<MessageTransformer> transformers, final String routerConfigName) throws DeploymentException
+ private void deployProcessors(final ServiceName serviceName, final List<MessageProcessor> processors, final String routerConfigName) throws DeploymentException
{
- if (transformers != null)
+ if (processors != null)
{
- for (MessageTransformer transformer : transformers)
+ for (MessageProcessor processor : processors)
{
try
{
- deployObject(transformer, null, serviceName);
- logger.debug("Deployed transformer for router '" + routerConfigName + "' (" + transformer.getClass().getName() + ").");
+ deployObject(processor, null, serviceName);
+ logger.debug("Deployed transformer for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").");
}
catch (InvocationTargetException e)
{
- throw new DeploymentException("Unable to deploy transformer for router '" + routerConfigName + "' (" + transformer.getClass().getName() + ").", e.getCause());
+ throw new DeploymentException("Unable to deploy transformer for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").", e.getCause());
}
catch (Exception e)
{
- throw new DeploymentException("Unable to deploy transformer for router '" + routerConfigName + "' (" + transformer.getClass().getName() + ").", e);
+ throw new DeploymentException("Unable to deploy transformer for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").", e);
}
}
}
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -19,7 +19,7 @@
*/
package org.jboss.esb.deploy.config;
-import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.message.MessageProcessor;
import org.jboss.esb.routing.InboundRouter;
import org.jboss.esb.routing.MessageDispatcher;
import org.jboss.esb.service.ServiceName;
@@ -48,7 +48,7 @@
/**
* Router transformers.
*/
- private List<MessageTransformer> transformers;
+ private List<MessageProcessor> processors;
/**
* "replyTo" address for all messages dispatched from this router.
*/
@@ -123,19 +123,19 @@
*
* @return The message transformers.
*/
- public final List<MessageTransformer> getTransformers()
+ public final List<MessageProcessor> getProcessors()
{
- return transformers;
+ return processors;
}
/**
* Set message transformers.
*
- * @param transformers The message transformers.
+ * @param processors The message transformers.
*/
- public final void setTransformers(final List<MessageTransformer> transformers)
+ public final void setProcessors(final List<MessageProcessor> processors)
{
- this.transformers = transformers;
+ this.processors = processors;
}
/**
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -19,7 +19,7 @@
*/
package org.jboss.esb.deploy.config;
-import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.message.MessageProcessor;
import org.jboss.esb.routing.OutboundRouter;
import java.util.List;
@@ -42,7 +42,7 @@
/**
* Router transformers.
*/
- private List<MessageTransformer> transformers;
+ private List<MessageProcessor> processors;
/**
* Get the router configuration name.
@@ -89,18 +89,18 @@
*
* @return The message transformers.
*/
- public final List<MessageTransformer> getTransformers()
+ public final List<MessageProcessor> getProcessors()
{
- return transformers;
+ return processors;
}
/**
* Set message transformers.
*
- * @param transformers The message transformers.
+ * @param processors The message transformers.
*/
- public final void setTransformers(final List<MessageTransformer> transformers)
+ public final void setProcessors(final List<MessageProcessor> processors)
{
- this.transformers = transformers;
+ this.processors = processors;
}
}
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -32,7 +32,7 @@
import org.jboss.esb.history.events.OutboundRouterProcessingEvent;
import org.jboss.esb.history.events.ServiceProcessingEvent;
import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.message.MessageProcessor;
import org.jboss.esb.routing.MessageDispatcher;
import org.jboss.esb.routing.OutboundRouter;
import org.jboss.esb.routing.RoutingException;
@@ -64,7 +64,7 @@
* Inbound transformers to be applied before invoking
* the service (can be null).
*/
- private List<MessageTransformer> transformers;
+ private List<MessageProcessor> processors;
/**
* The service name.
*/
@@ -162,15 +162,15 @@
* @throws org.jboss.esb.routing.RoutingException
* Error applying transformer.
*/
- protected final void applyInboundTransforms(final Message message) throws RoutingException
+ protected final void applyInboundProcessors(final Message message) throws RoutingException
{
- if (transformers != null && !transformers.isEmpty())
+ if (processors != null && !processors.isEmpty())
{
- for (MessageTransformer transformer : transformers)
+ for (MessageProcessor processor : processors)
{
try
{
- transformer.transform(message);
+ processor.process(message);
}
catch (Throwable t)
{
@@ -321,7 +321,7 @@
{
try
{
- applyOutboundTransformers(clone, outboundRouterConfig.getTransformers());
+ applyOutboundProcessors(clone, outboundRouterConfig.getProcessors());
}
catch (Throwable t)
{
@@ -355,19 +355,19 @@
* Apply the supplied set of transformers on the supplied message.
*
* @param outMessage The message.
- * @param outboundTransformers The transformers to be applied.
+ * @param outboundProcessors The transformers to be applied.
* @throws org.jboss.esb.routing.RoutingException
* Error applying transformer.
*/
- private void applyOutboundTransformers(final Message outMessage, final List<MessageTransformer> outboundTransformers) throws RoutingException
+ private void applyOutboundProcessors(final Message outMessage, final List<MessageProcessor> outboundProcessors) throws RoutingException
{
- if (outboundTransformers != null && !outboundTransformers.isEmpty())
+ if (outboundProcessors != null && !outboundProcessors.isEmpty())
{
- for (MessageTransformer transformer : outboundTransformers)
+ for (MessageProcessor processor : outboundProcessors)
{
try
{
- transformer.transform(outMessage);
+ processor.process(outMessage);
}
catch (Throwable t)
{
@@ -402,19 +402,19 @@
*
* @return The inbound transformers.
*/
- public final List<MessageTransformer> getTransformers()
+ public final List<MessageProcessor> getProcessors()
{
- return transformers;
+ return processors;
}
/**
* Set inbound transformers.
*
- * @param transformers The inbound transformers.
+ * @param processors The inbound transformers.
*/
- public final void setTransformers(final List<MessageTransformer> transformers)
+ public final void setProcessors(final List<MessageProcessor> processors)
{
- this.transformers = transformers;
+ this.processors = processors;
}
/**
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -110,7 +110,7 @@
{
try
{
- applyInboundTransforms(message);
+ applyInboundProcessors(message);
}
catch (Throwable t)
{
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/inrouters-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/inrouters-smooks.xml 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/inrouters-smooks.xml 2008-09-29 13:04:18 UTC (rev 23182)
@@ -37,7 +37,7 @@
<jb:bindings beanId="inRouterConfig" class="org.jboss.esb.deploy.config.InboundRouterConfig" createOnElement="inRouter">
<jb:wiring property="router" beanIdRef="inRouter" />
- <jb:wiring property="transformers" beanIdRef="transformers" />
+ <jb:wiring property="processors" beanIdRef="processors" />
<jb:wiring property="replyTo" beanIdRef="replyTo" />
<jb:wiring property="faultTo" beanIdRef="faultTo" />
<jb:value property="name" data="inRouter/@name" />
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd-smooks.xml 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd-smooks.xml 2008-09-29 13:04:18 UTC (rev 23182)
@@ -6,7 +6,7 @@
<import file="resources-smooks.xml" />
<import file="inrouters-smooks.xml" />
<import file="outrouters-smooks.xml" />
- <import file="transformers-smooks.xml" />
+ <import file="processors-smooks.xml" />
<import file="services-smooks.xml" />
</smooks-resource-list>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/outrouters-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/outrouters-smooks.xml 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/outrouters-smooks.xml 2008-09-29 13:04:18 UTC (rev 23182)
@@ -37,7 +37,7 @@
<jb:bindings beanId="outRouterConfig" class="org.jboss.esb.deploy.config.OutboundRouterConfig" createOnElement="outRouter">
<jb:wiring property="router" beanIdRef="outRouter" />
- <jb:wiring property="transformers" beanIdRef="transformers" />
+ <jb:wiring property="processors" beanIdRef="processors" />
<jb:value property="name" data="outRouter/@name" />
</jb:bindings>
Copied: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml (from rev 23172, labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/transformers-smooks.xml)
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml 2008-09-29 13:04:18 UTC (rev 23182)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"
+ default-selector-namespace="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
+
+ <jb:bindings beanId="processors" class="java.util.ArrayList" createOnElement="transformers">
+ <jb:wiring beanIdRef="processor" />
+ </jb:bindings>
+
+ <resource-config selector="transformer">
+ <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
+ <param name="beanId">processor</param> <!-- Wired in above. -->
+ <param name="classAttrib">class</param>
+ <param name="expectedType">org.jboss.esb.message.MessageProcessor</param>
+ </resource-config>
+
+ <resource-config selector="transformer/property">
+ <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
+ <param name="beanId">processor</param> <!-- Created above. -->
+ <param name="nameAttrib">name</param>
+ </resource-config>
+
+</smooks-resource-list>
\ No newline at end of file
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Deleted: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/transformers-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/transformers-smooks.xml 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/transformers-smooks.xml 2008-09-29 13:04:18 UTC (rev 23182)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"
- default-selector-namespace="http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd">
-
- <jb:bindings beanId="transformers" class="java.util.ArrayList" createOnElement="transformers">
- <jb:wiring beanIdRef="transformer" />
- </jb:bindings>
-
- <resource-config selector="transformer">
- <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
- <param name="beanId">transformer</param> <!-- Wired in above. -->
- <param name="classAttrib">class</param>
- <param name="expectedType">org.jboss.esb.message.MessageTransformer</param>
- </resource-config>
-
- <resource-config selector="transformer/property">
- <resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
- <param name="beanId">transformer</param> <!-- Created above. -->
- <param name="nameAttrib">name</param>
- </resource-config>
-
-</smooks-resource-list>
\ No newline at end of file
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -22,7 +22,7 @@
import org.jboss.esb.deploy.DeploymentException;
import org.jboss.esb.deploy.config.digest.DefaultConfigurationDigester;
import org.jboss.esb.deploy.config.digest.DigestUtil;
-import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.message.MessageProcessor;
import org.jboss.esb.service.ServiceName;
import org.junit.After;
import static org.junit.Assert.assertEquals;
@@ -127,19 +127,19 @@
InboundRouterConfig routerConfig = aRouterConfigs.get(0);
assertEquals("inrouter1", routerConfig.getName());
assertEquals("1", ((MyInRouter) routerConfig.getRouter()).getMyparam());
- List<MessageTransformer> transformers = routerConfig.getTransformers();
- assertEquals(3, transformers.size());
- assertEquals(1, ((MyMessageTransformer) transformers.get(0)).getSomeParam());
- assertEquals(2, ((MyMessageTransformer) transformers.get(1)).getSomeParam());
- assertEquals(3, ((MyMessageTransformer) transformers.get(2)).getSomeParam());
+ List<MessageProcessor> processors = routerConfig.getProcessors();
+ assertEquals(3, processors.size());
+ assertEquals(1, ((MyMessageTransformer) processors.get(0)).getSomeParam());
+ assertEquals(2, ((MyMessageTransformer) processors.get(1)).getSomeParam());
+ assertEquals(3, ((MyMessageTransformer) processors.get(2)).getSomeParam());
routerConfig = aRouterConfigs.get(1);
assertEquals("inrouter2", routerConfig.getName());
assertEquals("2", ((MyInRouter) routerConfig.getRouter()).getMyparam());
- transformers = routerConfig.getTransformers();
- assertEquals(2, transformers.size());
- assertEquals(4, ((MyMessageTransformer) transformers.get(0)).getSomeParam());
- assertEquals(5, ((MyMessageTransformer) transformers.get(1)).getSomeParam());
+ processors = routerConfig.getProcessors();
+ assertEquals(2, processors.size());
+ assertEquals(4, ((MyMessageTransformer) processors.get(0)).getSomeParam());
+ assertEquals(5, ((MyMessageTransformer) processors.get(1)).getSomeParam());
List<InboundRouterConfig> bRouterConfigs = inRouters.get(new ServiceName("service-cat", "service-b"));
assertNotNull(bRouterConfigs);
@@ -147,16 +147,16 @@
routerConfig = bRouterConfigs.get(0);
assertEquals("inrouter3", routerConfig.getName());
assertEquals("4", ((MyInRouter) routerConfig.getRouter()).getMyparam());
- transformers = routerConfig.getTransformers();
- assertEquals(1, transformers.size());
- assertEquals(6, ((MyMessageTransformer) transformers.get(0)).getSomeParam());
+ processors = routerConfig.getProcessors();
+ assertEquals(1, processors.size());
+ assertEquals(6, ((MyMessageTransformer) processors.get(0)).getSomeParam());
routerConfig = bRouterConfigs.get(1);
assertEquals("inrouter4", routerConfig.getName());
assertEquals("5", ((MyInRouter) routerConfig.getRouter()).getMyparam());
assertEquals(5, ((MyInRouter) routerConfig.getRouter()).getMyOtherParam());
- transformers = routerConfig.getTransformers();
- assertNull(transformers);
+ processors = routerConfig.getProcessors();
+ assertNull(processors);
}
private void test_outrouters(String config) throws IOException, DeploymentException
@@ -176,19 +176,19 @@
OutboundRouterConfig routerConfig = aRouterConfigs.get(0);
assertEquals("outrouter1", routerConfig.getName());
assertEquals("1", ((MyOutRouter) routerConfig.getRouter()).getMyparam());
- List<MessageTransformer> transformers = routerConfig.getTransformers();
- assertEquals(3, transformers.size());
- assertEquals(1, ((MyMessageTransformer) transformers.get(0)).getSomeParam());
- assertEquals(2, ((MyMessageTransformer) transformers.get(1)).getSomeParam());
- assertEquals(3, ((MyMessageTransformer) transformers.get(2)).getSomeParam());
+ List<MessageProcessor> processors = routerConfig.getProcessors();
+ assertEquals(3, processors.size());
+ assertEquals(1, ((MyMessageTransformer) processors.get(0)).getSomeParam());
+ assertEquals(2, ((MyMessageTransformer) processors.get(1)).getSomeParam());
+ assertEquals(3, ((MyMessageTransformer) processors.get(2)).getSomeParam());
routerConfig = aRouterConfigs.get(1);
assertEquals("outrouter2", routerConfig.getName());
assertEquals("2", ((MyOutRouter) routerConfig.getRouter()).getMyparam());
- transformers = routerConfig.getTransformers();
- assertEquals(2, transformers.size());
- assertEquals(4, ((MyMessageTransformer) transformers.get(0)).getSomeParam());
- assertEquals(5, ((MyMessageTransformer) transformers.get(1)).getSomeParam());
+ processors = routerConfig.getProcessors();
+ assertEquals(2, processors.size());
+ assertEquals(4, ((MyMessageTransformer) processors.get(0)).getSomeParam());
+ assertEquals(5, ((MyMessageTransformer) processors.get(1)).getSomeParam());
List<OutboundRouterConfig> bRouterConfigs = inRouters.get(new ServiceName("service-cat", "service-b"));
assertNotNull(bRouterConfigs);
@@ -196,16 +196,16 @@
routerConfig = bRouterConfigs.get(0);
assertEquals("outrouter3", routerConfig.getName());
assertEquals("4", ((MyOutRouter) routerConfig.getRouter()).getMyparam());
- transformers = routerConfig.getTransformers();
- assertEquals(1, transformers.size());
- assertEquals(6, ((MyMessageTransformer) transformers.get(0)).getSomeParam());
+ processors = routerConfig.getProcessors();
+ assertEquals(1, processors.size());
+ assertEquals(6, ((MyMessageTransformer) processors.get(0)).getSomeParam());
routerConfig = bRouterConfigs.get(1);
assertEquals("outrouter4", routerConfig.getName());
assertEquals("5", ((MyOutRouter) routerConfig.getRouter()).getMyparam());
assertEquals(5, ((MyOutRouter) routerConfig.getRouter()).getMyOtherParam());
- transformers = routerConfig.getTransformers();
- assertNull(transformers);
+ processors = routerConfig.getProcessors();
+ assertNull(processors);
}
@Test
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -19,9 +19,9 @@
*/
package org.jboss.esb.deploy.config;
-import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.message.MessageProcessor;
import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageTransformationException;
+import org.jboss.esb.message.MessageProcessingException;
import org.jboss.esb.annotations.Initialize;
import org.jboss.esb.annotations.Property;
import org.jboss.esb.annotations.Uninitialize;
@@ -33,7 +33,7 @@
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public class MyMessageTransformer implements MessageTransformer
+public class MyMessageTransformer implements MessageProcessor
{
private ServiceName serviceName;
@@ -52,10 +52,12 @@
initialised = false;
}
- public void transform(Message message) throws MessageTransformationException
+ public Message process(Message message) throws MessageProcessingException
{
TestCase.assertNotNull(serviceName);
TestCase.assertEquals(serviceName, AddressingContext.getContext().getTo());
+
+ return message;
}
public int getSomeParam()
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java 2008-09-29 12:59:00 UTC (rev 23181)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java 2008-09-29 13:04:18 UTC (rev 23182)
@@ -24,13 +24,13 @@
import org.jboss.esb.context.DeploymentContext;
import org.jboss.esb.context.InvocationContext;
import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageTransformationException;
-import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.message.MessageProcessingException;
+import org.jboss.esb.message.MessageProcessor;
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public class RestStringTransformer implements MessageTransformer
+public class RestStringTransformer implements MessageProcessor
{
@Property
private String newString;
@@ -38,11 +38,13 @@
public static AddressingContext addressingContext;
public static DeploymentContext deploymentContext;
- public void transform(Message message) throws MessageTransformationException
+ public Message process(Message message) throws MessageProcessingException
{
invocationContext = InvocationContext.getContext();
addressingContext = AddressingContext.getContext();
deploymentContext = DeploymentContext.getContext();
message.setPayload(newString);
+
+ return message;
}
}
More information about the jboss-svn-commits
mailing list