[jboss-svn-commits] JBL Code SVN: r23183 - in labs/jbossesb/workspace/skeagh/runtime/src: main/java/org/jboss/esb/deploy/config and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 29 09:11:40 EDT 2008
Author: tfennelly
Date: 2008-09-29 09:11:40 -0400 (Mon, 29 Sep 2008)
New Revision: 23183
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/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/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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java 2008-09-29 13:11:40 UTC (rev 23183)
@@ -710,7 +710,7 @@
{
try
{
- // Deploy the transformers first...
+ // Deploy the processors first...
deployProcessors(routerConfigMap.getKey(), routerConfig.getProcessors(), routerConfig.getName());
// Now deploy the router...
@@ -809,12 +809,12 @@
}
/**
- * Deploy the transformers.
+ * Deploy the processors.
*
* @param serviceName The service with which the transformer set is associated.
* @param processors The transformer list.
- * @param routerConfigName The name of the owning router. @throws DeploymentException Error deploying transformers.
- * @throws DeploymentException Error deploying transformers.
+ * @param routerConfigName The name of the owning router. @throws DeploymentException Error deploying processors.
+ * @throws DeploymentException Error deploying processors.
*/
private void deployProcessors(final ServiceName serviceName, final List<MessageProcessor> processors, final String routerConfigName) throws DeploymentException
{
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 13:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java 2008-09-29 13:11:40 UTC (rev 23183)
@@ -46,7 +46,7 @@
*/
private MessageDispatcher dispatcher;
/**
- * Router transformers.
+ * Router processors.
*/
private List<MessageProcessor> processors;
/**
@@ -119,9 +119,9 @@
}
/**
- * Get message transformers.
+ * Get message processors.
*
- * @return The message transformers.
+ * @return The message processors.
*/
public final List<MessageProcessor> getProcessors()
{
@@ -129,9 +129,9 @@
}
/**
- * Set message transformers.
+ * Set message processors.
*
- * @param processors The message transformers.
+ * @param processors The message processors.
*/
public final void setProcessors(final List<MessageProcessor> 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 13:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java 2008-09-29 13:11:40 UTC (rev 23183)
@@ -40,7 +40,7 @@
*/
private OutboundRouter router;
/**
- * Router transformers.
+ * Router processors.
*/
private List<MessageProcessor> processors;
@@ -85,9 +85,9 @@
}
/**
- * Get message transformers.
+ * Get message processors.
*
- * @return The message transformers.
+ * @return The message processors.
*/
public final List<MessageProcessor> getProcessors()
{
@@ -95,9 +95,9 @@
}
/**
- * Set message transformers.
+ * Set message processors.
*
- * @param processors The message transformers.
+ * @param processors The message processors.
*/
public final void setProcessors(final List<MessageProcessor> processors)
{
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java 2008-09-29 13:11:40 UTC (rev 23183)
@@ -61,7 +61,7 @@
*/
private DeploymentContext deploymentContext;
/**
- * Inbound transformers to be applied before invoking
+ * Inbound processors to be applied before invoking
* the service (can be null).
*/
private List<MessageProcessor> processors;
@@ -298,7 +298,7 @@
for (OutboundRouterConfig outboundRouterConfig : outboundRouters)
{
// Create a shallow clone of the message in case there's an error or
- // there are multiple outrouters with transformers on them...
+ // there are multiple outrouters with processors on them...
Message clone = (Message) outMessage.clone();
OutboundRouter outRouter = outboundRouterConfig.getRouter();
@@ -352,10 +352,10 @@
}
/**
- * Apply the supplied set of transformers on the supplied message.
+ * Apply the supplied set of processors on the supplied message.
*
* @param outMessage The message.
- * @param outboundProcessors The transformers to be applied.
+ * @param outboundProcessors The processors to be applied.
* @throws org.jboss.esb.routing.RoutingException
* Error applying transformer.
*/
@@ -398,9 +398,9 @@
}
/**
- * Get inbound transformers.
+ * Get inbound processors.
*
- * @return The inbound transformers.
+ * @return The inbound processors.
*/
public final List<MessageProcessor> getProcessors()
{
@@ -408,9 +408,9 @@
}
/**
- * Set inbound transformers.
+ * Set inbound processors.
*
- * @param processors The inbound transformers.
+ * @param processors The inbound processors.
*/
public final void setProcessors(final List<MessageProcessor> 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 13:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java 2008-09-29 13:11:40 UTC (rev 23183)
@@ -114,7 +114,7 @@
}
catch (Throwable t)
{
- // The message must make it past the inbound transformers...
+ // The message must make it past the inbound processors...
String errorMessage = "Exception applying Inbound Transforms to Service '" + getServiceName() + "'. Rejecting message. Fix transformation!";
logger.error(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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/jbossesb-5.0.xsd 2008-09-29 13:11:40 UTC (rev 23183)
@@ -49,7 +49,7 @@
Transformers...
-->
- <xs:complexType name="transformers">
+ <xs:complexType name="processors">
<xs:sequence>
<xs:element ref="abstractTransformer" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
@@ -144,7 +144,7 @@
<xs:complexType name="abstractInRouter" abstract="true">
<xs:sequence>
- <xs:element name="transformers" type="transformers" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="processors" type="processors" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
</xs:complexType>
@@ -179,7 +179,7 @@
<xs:complexType name="abstractOutRouter" abstract="true">
<xs:sequence>
- <xs:element name="transformers" type="transformers" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="processors" type="processors" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
</xs:complexType>
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/processors-smooks.xml 2008-09-29 13:11:40 UTC (rev 23183)
@@ -3,7 +3,7 @@
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:bindings beanId="processors" class="java.util.ArrayList" createOnElement="processors">
<jb:wiring beanIdRef="processor" />
</jb:bindings>
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inandoutrouters_01.xml 2008-09-29 13:11:40 UTC (rev 23183)
@@ -4,7 +4,7 @@
<inRouters serviceCategory="service-cat" serviceName="service-a">
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</transformer>
@@ -14,29 +14,29 @@
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">1</property>
</inRouter>
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
</transformer>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">2</property>
</inRouter>
</inRouters>
<inRouters serviceCategory="service-cat" serviceName="service-b">
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">4</property>
</inRouter>
<inRouter name="inrouter4" class="org.jboss.esb.deploy.config.MyInRouter">
@@ -47,7 +47,7 @@
<outRouters serviceCategory="service-cat" serviceName="service-a">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</transformer>
@@ -57,29 +57,29 @@
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">1</property>
</outRouter>
<outRouter name="outrouter2" class="org.jboss.esb.deploy.config.MyOutRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
</transformer>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">2</property>
</outRouter>
</outRouters>
<outRouters serviceCategory="service-cat" serviceName="service-b">
<outRouter name="outrouter3" class="org.jboss.esb.deploy.config.MyOutRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">4</property>
</outRouter>
<outRouter name="outrouter4" class="org.jboss.esb.deploy.config.MyOutRouter">
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-inrouters_01.xml 2008-09-29 13:11:40 UTC (rev 23183)
@@ -4,7 +4,7 @@
<inRouters serviceCategory="service-cat" serviceName="service-a">
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</transformer>
@@ -14,29 +14,29 @@
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">1</property>
</inRouter>
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
</transformer>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">2</property>
</inRouter>
</inRouters>
<inRouters serviceCategory="service-cat" serviceName="service-b">
<inRouter name="inrouter3" class="org.jboss.esb.deploy.config.MyInRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">4</property>
</inRouter>
<inRouter name="inrouter4" class="org.jboss.esb.deploy.config.MyInRouter">
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/jbossesb-outrouters_01.xml 2008-09-29 13:11:40 UTC (rev 23183)
@@ -3,7 +3,7 @@
<routing>
<outRouters serviceCategory="service-cat" serviceName="service-a">
<outRouter name="outrouter1" class="org.jboss.esb.deploy.config.MyOutRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">1</property>
</transformer>
@@ -13,28 +13,28 @@
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">3</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">1</property>
</outRouter>
<outRouter name="outrouter2" class="org.jboss.esb.deploy.config.MyOutRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">4</property>
</transformer>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">5</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">2</property>
</outRouter>
</outRouters>
<outRouters serviceCategory="service-cat" serviceName="service-b">
<outRouter name="outrouter3" class="org.jboss.esb.deploy.config.MyOutRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer">
<property name="someParam">6</property>
</transformer>
- </transformers>
+ </processors>
<property name="myparam">4</property>
</outRouter>
<outRouter name="outrouter4" class="org.jboss.esb.deploy.config.MyOutRouter">
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/jbossesb-deploy-01.xml 2008-09-29 13:11:40 UTC (rev 23183)
@@ -14,9 +14,9 @@
<inRouters serviceCategory="service-cat" serviceName="service-a">
<inRouter name="inrouter1" class="org.jboss.esb.deploy.config.MyInRouter" />
<inRouter name="inrouter2" class="org.jboss.esb.deploy.config.MyInRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.deploy.config.MyMessageTransformer" />
- </transformers>
+ </processors>
</inRouter>
</inRouters>
<outRouters serviceCategory="service-cat" serviceName="service-a">
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-intransform.xml 2008-09-29 13:11:40 UTC (rev 23183)
@@ -7,11 +7,11 @@
<routing>
<inRouters serviceCategory="hello" serviceName="hello">
<inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.dispatch.RestStringTransformer">
<property name="newString">Goodbye World!</property>
</transformer>
- </transformers>
+ </processors>
</inRouter>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
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:04:18 UTC (rev 23182)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/jbossesb-dispatch-with-outtransform.xml 2008-09-29 13:11:40 UTC (rev 23183)
@@ -7,20 +7,20 @@
<routing>
<inRouters serviceCategory="hello" serviceName="hello">
<inRouter name="inrouter1" class="org.jboss.esb.dispatch.HelloInboundRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.dispatch.RestStringTransformer">
<property name="newString">Goodbye World!</property>
</transformer>
- </transformers>
+ </processors>
</inRouter>
</inRouters>
<outRouters serviceCategory="hello" serviceName="hello">
<outRouter name="outrouter1" class="org.jboss.esb.dispatch.HelloOutboundRouter">
- <transformers>
+ <processors>
<transformer class="org.jboss.esb.dispatch.RestStringTransformer">
<property name="newString">Some other form of googbye!</property>
</transformer>
- </transformers>
+ </processors>
</outRouter>
</outRouters>
</routing>
More information about the jboss-svn-commits
mailing list