[jboss-svn-commits] JBL Code SVN: r23185 - in labs/jbossesb/workspace/skeagh/runtime/src: main/java/org/jboss/esb/dispatch and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 29 09:39:13 EDT 2008
Author: tfennelly
Date: 2008-09-29 09:39:13 -0400 (Mon, 29 Sep 2008)
New Revision: 23185
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/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/jbossesb-5.0.xsd
labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml
Log:
Renaming the Transformers to Processors
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 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java 2008-09-29 13:39:13 UTC (rev 23185)
@@ -811,8 +811,8 @@
/**
* Deploy the processors.
*
- * @param serviceName The service with which the transformer set is associated.
- * @param processors The transformer list.
+ * @param serviceName The service with which the processor set is associated.
+ * @param processors The processor list.
* @param routerConfigName The name of the owning router. @throws DeploymentException Error deploying processors.
* @throws DeploymentException Error deploying processors.
*/
@@ -825,15 +825,15 @@
try
{
deployObject(processor, null, serviceName);
- logger.debug("Deployed transformer for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").");
+ logger.debug("Deployed processor for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").");
}
catch (InvocationTargetException e)
{
- throw new DeploymentException("Unable to deploy transformer for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").", e.getCause());
+ throw new DeploymentException("Unable to deploy processor for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").", e.getCause());
}
catch (Exception e)
{
- throw new DeploymentException("Unable to deploy transformer for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").", e);
+ throw new DeploymentException("Unable to deploy processor for router '" + routerConfigName + "' (" + processor.getClass().getName() + ").", e);
}
}
}
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 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java 2008-09-29 13:39:13 UTC (rev 23185)
@@ -156,11 +156,11 @@
}
/**
- * Apply the inbound transform set.
+ * Apply the inbound processor set.
*
* @param message The message.
* @throws org.jboss.esb.routing.RoutingException
- * Error applying transformer.
+ * Error applying processor.
*/
protected final void applyInboundProcessors(final Message message) throws RoutingException
{
@@ -174,7 +174,7 @@
}
catch (Throwable t)
{
- throw new RoutingException("Error applying inbound transformer.", t);
+ throw new RoutingException("Error applying inbound processor.", t);
}
}
}
@@ -325,7 +325,7 @@
}
catch (Throwable t)
{
- logger.error("Exception applying message transformations on OutboundRouter for Service '" + addressContext.getTo() + "' via OutboundRouter. Router Configuration '" + outboundRouterConfig.getName() + "'. Routing to Dead Letter Service '" + DeadLetterPersistanceService.SERVICE_NAME + "'.", t);
+ logger.error("Exception applying message processors on OutboundRouter for Service '" + addressContext.getTo() + "' via OutboundRouter. Router Configuration '" + outboundRouterConfig.getName() + "'. Routing to Dead Letter Service '" + DeadLetterPersistanceService.SERVICE_NAME + "'.", t);
// We route the clone because it's unmodified... allows us to
// start from scratch again...
routeToDeadLetterService(clone, t);
@@ -357,7 +357,7 @@
* @param outMessage The message.
* @param outboundProcessors The processors to be applied.
* @throws org.jboss.esb.routing.RoutingException
- * Error applying transformer.
+ * Error applying processor.
*/
private void applyOutboundProcessors(final Message outMessage, final List<MessageProcessor> outboundProcessors) throws RoutingException
{
@@ -371,7 +371,7 @@
}
catch (Throwable t)
{
- throw new RoutingException("Error applying outbound transformer.", t);
+ throw new RoutingException("Error applying outbound processor.", t);
}
}
}
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 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java 2008-09-29 13:39:13 UTC (rev 23185)
@@ -80,7 +80,7 @@
/**
* Dispatch method.
* <p/>
- * Receives a message, applies the set of transforms to it, passes it to
+ * Receives a message, applies the set of processors to it, passes it to
* the Service, takes back the Service result and passes to the
* outbound routers.
*
@@ -115,7 +115,7 @@
catch (Throwable t)
{
// The message must make it past the inbound processors...
- String errorMessage = "Exception applying Inbound Transforms to Service '" + getServiceName() + "'. Rejecting message. Fix transformation!";
+ String errorMessage = "Exception applying Inbound Processors to Service '" + getServiceName() + "'. Rejecting message. Fix Processor!";
logger.error(errorMessage, t);
throw new IllegalStateException(errorMessage, t);
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd 2008-09-29 13:39:13 UTC (rev 23185)
@@ -58,7 +58,7 @@
<xs:complexType name="abstractProcessor" abstract="true"/>
<xs:element name="abstractProcessor" type="abstractProcessor" abstract="true" />
- <xs:element name="transformer" substitutionGroup="abstractProcessor">
+ <xs:element name="processor" substitutionGroup="abstractProcessor">
<xs:complexType>
<xs:complexContent>
<xs:extension base="abstractProcessor">
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml 2008-09-29 13:39:13 UTC (rev 23185)
@@ -7,14 +7,14 @@
<jb:wiring beanIdRef="processor" />
</jb:bindings>
- <resource-config selector="transformer">
+ <resource-config selector="processor">
<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-config selector="processor/property">
<resource>org.jboss.esb.deploy.config.digest.SetProperty</resource>
<param name="beanId">processor</param> <!-- Created above. -->
<param name="nameAttrib">name</param>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml 2008-09-29 13:39:13 UTC (rev 23185)
@@ -5,26 +5,26 @@
<inRouters serviceCategory="service-cat" serviceName="service-a">
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">2</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">1</property>
</inRouter>
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">2</property>
</inRouter>
@@ -33,9 +33,9 @@
<inRouters serviceCategory="service-cat" serviceName="service-b">
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">4</property>
</inRouter>
@@ -48,26 +48,26 @@
<outRouters serviceCategory="service-cat" serviceName="service-a">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">2</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">1</property>
</outRouter>
<outRouter name="outrouter2" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">2</property>
</outRouter>
@@ -76,9 +76,9 @@
<outRouters serviceCategory="service-cat" serviceName="service-b">
<outRouter name="outrouter3" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">4</property>
</outRouter>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml 2008-09-29 13:39:13 UTC (rev 23185)
@@ -5,26 +5,26 @@
<inRouters serviceCategory="service-cat" serviceName="service-a">
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">2</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">1</property>
</inRouter>
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">2</property>
</inRouter>
@@ -33,9 +33,9 @@
<inRouters serviceCategory="service-cat" serviceName="service-b">
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">4</property>
</inRouter>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_01.xml 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_01.xml 2008-09-29 13:39:13 UTC (rev 23185)
@@ -4,26 +4,26 @@
<outRouters serviceCategory="service-cat" serviceName="service-a">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">2</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">1</property>
</outRouter>
<outRouter name="outrouter2" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
- </transformer>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ </processor>
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">2</property>
</outRouter>
@@ -31,9 +31,9 @@
<outRouters serviceCategory="service-cat" serviceName="service-b">
<outRouter name="outrouter3" class="org.jboss.esb.deploy.config.MyOutRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
- </transformer>
+ </processor>
</processors>
<property name="myparam">4</property>
</outRouter>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml 2008-09-29 13:39:13 UTC (rev 23185)
@@ -15,7 +15,7 @@
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
<processors>
- <transformer class="org.jboss.esb.deploy.config.MyMessageTransformer" />
+ <processor class="org.jboss.esb.deploy.config.MyMessageTransformer" />
</processors>
</inRouter>
</inRouters>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml 2008-09-29 13:39:13 UTC (rev 23185)
@@ -8,9 +8,9 @@
<inRouters serviceCategory="hello" serviceName="hello">
<inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
<processors>
- <transformer class="org.jboss.esb.dispatch.RestStringTransformer">
+ <processor class="org.jboss.esb.dispatch.RestStringTransformer">
<property name="newString">Goodbye World!</property>
- </transformer>
+ </processor>
</processors>
</inRouter>
</inRouters>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml 2008-09-29 13:26:15 UTC (rev 23184)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml 2008-09-29 13:39:13 UTC (rev 23185)
@@ -8,18 +8,18 @@
<inRouters serviceCategory="hello" serviceName="hello">
<inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
<processors>
- <transformer class="org.jboss.esb.dispatch.RestStringTransformer">
+ <processor class="org.jboss.esb.dispatch.RestStringTransformer">
<property name="newString">Goodbye World!</property>
- </transformer>
+ </processor>
</processors>
</inRouter>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter">
<processors>
- <transformer class="org.jboss.esb.dispatch.RestStringTransformer">
+ <processor class="org.jboss.esb.dispatch.RestStringTransformer">
<property name="newString">Some other form of googbye!</property>
- </transformer>
+ </processor>
</processors>
</outRouter>
</outRouters>
More information about the jboss-svn-commits
mailing list