[jboss-svn-commits] JBL Code SVN: r6168 - in labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb: actions listeners util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 12 09:04:12 EDT 2006
Author: tfennelly
Date: 2006-09-12 09:04:01 -0400 (Tue, 12 Sep 2006)
New Revision: 6168
Added:
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java
Modified:
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-01.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-02.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-03.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-04.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-05.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-06.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-07.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-08.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-09.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-10.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-11.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinitionFactoryUnitTest.java
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/LongToDateConverter.java
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformAction-Config-01.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/StringToLongConverter.java
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListener-Config-01.xml
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListenerUnitTest.java
labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/util/MockPoller.java
Log:
renamed "ActionHandler" to "ActionProcessor" and made appropriate handler/Handler name changes to processor/Processor
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-01.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-01.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-01.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,16 +1,16 @@
<Actions>
- <Action name="ActionA" handler="TestActionHandler1">
+ <Action name="ActionA" processor="TestActionProcessor1">
<property name="param1" value="val1" />
<property name="param2" value="val2" />
<property name="param3" value="val3" />
</Action>
- <Action name="ActionB" handler="TestActionHandler1">
+ <Action name="ActionB" processor="TestActionProcessor1">
<property name="param1" value="val2" />
</Action>
- <Action name="ActionC" handler="TestActionHandler2" />
+ <Action name="ActionC" processor="TestActionProcessor2" />
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- <Alias name="TestActionHandler2" class="org.jboss.soa.esb.actions.TestActionHandler2" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ <Alias name="TestActionProcessor2" class="org.jboss.soa.esb.actions.TestActionProcessor2" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-02.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-02.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-02.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,9 +1,9 @@
<Actions>
- <Action name="" handler="TestActionHandler1">
+ <Action name="" processor="TestActionProcessor1">
<property name="param1" value="val1" />
</Action>
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-03.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-03.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-03.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,9 +1,9 @@
<Actions>
- <Action name="ActionA" handler="">
+ <Action name="ActionA" processor="">
<property name="param1" value="val1" />
</Action>
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-04.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-04.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-04.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,9 +1,9 @@
<Actions>
- <Action name="ActionA" handler="TestActionHandler1">
+ <Action name="ActionA" processor="TestActionProcessor1">
<property name="" value="val1" />
</Action>
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-05.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-05.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-05.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,9 +1,9 @@
<Actions>
- <Action name="ActionA" handler="TestActionHandler1">
+ <Action name="ActionA" processor="TestActionProcessor1">
<property name="param1" value="" />
</Action>
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-06.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-06.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-06.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,9 +1,9 @@
<Actions>
- <Action name="ActionA" handler="UnknownHandle1">
+ <Action name="ActionA" processor="UnknownHandle1">
<property name="param1" value="val1" />
</Action>
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-07.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-07.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-07.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,9 +1,9 @@
<Actions>
- <Action name="ActionA" handler="TestActionHandler1">
+ <Action name="ActionA" processor="TestActionProcessor1">
<property name="param1" value="val1" />
</Action>
- <HandlerAliases>
- <Alias name="" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-08.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-08.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-08.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,6 +1,6 @@
<Actions>
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-09.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-09.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-09.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,5 +1,5 @@
<Actions>
- <Action name="ActionA" handler="TestActionHandler1">
+ <Action name="ActionA" processor="TestActionProcessor1">
<property name="param1" value="val1" />
</Action>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-10.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-10.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-10.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,8 +1,8 @@
<Actions>
- <Action name="ActionA" handler="TestActionHandler1">
+ <Action name="ActionA" processor="TestActionProcessor1">
<property name="param1" value="val1" />
</Action>
- <HandlerAliases>
- </HandlerAliases>
+ <ProcessorAliases>
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-11.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-11.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinition-Config-11.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -1,9 +1,9 @@
<Actions>
- <Action name="ActionA" handler="TestActionHandler1">
+ <Action name="ActionA" processor="TestActionProcessor1">
<property name="param1" value="val1" />
</Action>
- <HandlerAliases>
- <Alias name="TestActionHandler1" class="org.jboss.soa.esb.actions.TestActionHandler1" />
- </HandlerAliases>
+ <ProcessorAliases>
+ <Alias name="TestActionProcessor1" class="org.jboss.soa.esb.actions.TestActionProcessor1" />
+ </ProcessorAliases>
</Actions>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinitionFactoryUnitTest.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinitionFactoryUnitTest.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ActionDefinitionFactoryUnitTest.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -26,7 +26,6 @@
import java.util.List;
import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.actions.ActionDefinitionFactory.ActionDefinition;
import org.jboss.soa.esb.helpers.DomElement;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.xml.sax.SAXException;
@@ -44,39 +43,39 @@
DomElement config = DomElement.fromInputStream(getClass().getResourceAsStream("ActionDefinition-Config-01.xml"));
ActionDefinitionFactory factory = new ActionDefinitionFactory(config);
- // ActionHandler Impl with a non-default public constructor
+ // ActionProcessor Impl with a non-default public constructor
ActionDefinition actionDef = factory.getInstance("ActionA");
assertEquals("ActionA", actionDef.getName());
List<KeyValuePair> properties = actionDef.getProperties();
assertEquals(3, properties.size());
- TestActionHandler1 handler1 = (TestActionHandler1) actionDef.getHandler();
- assertEquals(actionDef.getName(), handler1.name);
- assertEquals(properties, handler1.properties);
+ TestActionProcessor1 processor1 = (TestActionProcessor1) actionDef.getProcessor();
+ assertEquals(actionDef.getName(), processor1.name);
+ assertEquals(properties, processor1.properties);
actionDef = factory.getInstance("ActionB");
assertEquals("ActionB", actionDef.getName());
properties = actionDef.getProperties();
assertEquals(1, properties.size());
- handler1 = (TestActionHandler1) actionDef.getHandler();
- assertEquals(actionDef.getName(), handler1.name);
- assertEquals(properties, handler1.properties);
+ processor1 = (TestActionProcessor1) actionDef.getProcessor();
+ assertEquals(actionDef.getName(), processor1.name);
+ assertEquals(properties, processor1.properties);
- // ActionHandler Impl with a non-default public constructor
+ // ActionProcessor Impl with a non-default public constructor
actionDef = factory.getInstance("ActionC");
assertEquals("ActionC", actionDef.getName());
- TestActionHandler2 handler2 = (TestActionHandler2) actionDef.getHandler();
+ TestActionProcessor2 processor2 = (TestActionProcessor2) actionDef.getProcessor();
}
public void test_bad_config() throws SAXException, IOException, ConfigurationException {
test_bad_config("ActionDefinition-Config-02.xml", "Actions/Action has no 'name' defined.");
- test_bad_config("ActionDefinition-Config-03.xml", "Actions/Action [ActionA] has no 'handler' defined.");
+ test_bad_config("ActionDefinition-Config-03.xml", "Actions/Action [ActionA] has no 'processor' defined.");
test_bad_config("ActionDefinition-Config-04.xml", "Actions/Action/property has no 'name' defined. Action [ActionA]");
test_bad_config("ActionDefinition-Config-05.xml", "Actions/Action/property has no 'value' defined. Action [ActionA]");
- test_bad_config("ActionDefinition-Config-06.xml", "No action handler class defined for handler alias");
- test_bad_config("ActionDefinition-Config-07.xml", "Actions/HandlerAliases/Alias has no 'name' defined");
+ test_bad_config("ActionDefinition-Config-06.xml", "No action processor class defined for processor alias");
+ test_bad_config("ActionDefinition-Config-07.xml", "Actions/ProcessorAliases/Alias has no 'name' defined");
test_bad_config("ActionDefinition-Config-08.xml", "No 'Actions/Action' configurations");
- test_bad_config("ActionDefinition-Config-09.xml", "No 'Actions/HandlerAliases' configuration");
- test_bad_config("ActionDefinition-Config-10.xml", "No action handler classes defined");
+ test_bad_config("ActionDefinition-Config-09.xml", "No 'Actions/ProcessorAliases' configuration");
+ test_bad_config("ActionDefinition-Config-10.xml", "No action processor classes defined");
}
private void test_bad_config(String configName, String exceptionMsg) throws SAXException, IOException, ConfigurationException {
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/LongToDateConverter.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/LongToDateConverter.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/LongToDateConverter.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -29,15 +29,16 @@
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
* @since Version 4.0
*/
-public class LongToDateConverter implements ActionHandler {
+public class LongToDateConverter implements ActionProcessor {
/* (non-Javadoc)
- * @see org.jboss.soa.esb.actions.ActionHandler#processAction(java.lang.Object)
+ * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
- public Object processAction(Object payload) throws ActionProcessingException {
+ public Object process(Object payload) throws ActionProcessingException {
if(!(payload instanceof Long)) {
throw new ActionProcessingException("This action handler only accepts Long object instances.");
}
+ System.out.println("LongToDateConverter");
return new Date((Long)payload);
}
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformAction-Config-01.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformAction-Config-01.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformAction-Config-01.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -21,22 +21,22 @@
<!--
Under the new architecture I think these will be equivalent to "Contracts Definitions"?
-->
- <Action name="X12N837-to-HL7V3" handler="Smooks" />
- <Action name="Process-HL7V3-Claim" handler="ClaimsProcessor" />
- <Action name="HL7V3-to-X12N837" handler="Smooks" />
- <Action name="Route-to-Claims" handler="SocketRouter">
+ <Action name="X12N837-to-HL7V3" processor="Smooks" />
+ <Action name="Process-HL7V3-Claim" processor="ClaimsProcessor" />
+ <Action name="HL7V3-to-X12N837" processor="Smooks" />
+ <Action name="Route-to-Claims" processor="SocketRouter">
<property name="address" value="xxxxx" />
</Action>
- <HandlerAliases>
+ <ProcessorAliases>
<!--
Under the new architecture I think these will be equivalent to "Services"? The alias "name" being like the Service URN.
-->
- <Alias name="Smooks" class="org.jboss.soa.esb.actions.SmooksTransformActionHandler" />
+ <Alias name="Smooks" class="org.jboss.soa.esb.actions.SmooksTransformActionProcessor" />
<Alias name="ClaimsProcessor" class="com.acme.health.ClaimsProcessor" />
<Alias name="JmsRouter" class="org.jboss.soa.esb.actions.JmsRouter" />
<Alias name="SocketRouter" class="org.jboss.soa.esb.actions.SocketRouter" />
- </HandlerAliases>
+ </ProcessorAliases>
</Actions>
</TransformActionListener>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/StringToLongConverter.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/StringToLongConverter.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/StringToLongConverter.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -27,15 +27,17 @@
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
* @since Version 4.0
*/
-public class StringToLongConverter implements ActionHandler {
+public class StringToLongConverter implements ActionProcessor {
/* (non-Javadoc)
- * @see org.jboss.soa.esb.actions.ActionHandler#processAction(java.lang.Object)
+ * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
- public Object processAction(Object payload) throws ActionProcessingException {
+ public Object process(Object payload) throws ActionProcessingException {
if(!(payload instanceof String)) {
throw new ActionProcessingException("This action handler only accepts String object instances.");
}
+
+ System.out.println("StringToLongConverter");
return Long.parseLong((String)payload);
}
Added: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions;
+
+import java.util.List;
+
+import org.jboss.soa.esb.helpers.KeyValuePair;
+
+/**
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ * @since Version 4.0
+ */
+
+public class TestActionProcessor1 implements ActionProcessor {
+
+ public String name;
+ public List<KeyValuePair> properties;
+
+ public TestActionProcessor1(String name, List<KeyValuePair> properties) {
+ System.out.println("Instantiate action handler: " + name);
+
+ this.name = name;
+ this.properties = properties;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
+ */
+ public Object process(Object payload) {
+ System.out.println("processAction: " + payload);
+ return payload;
+ }
+}
Added: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions;
+
+/**
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ * @since Version 4.0
+ */
+
+public class TestActionProcessor2 implements ActionProcessor {
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
+ */
+ public Object process(Object payload) {
+ System.out.println("processAction: " + payload);
+ return payload;
+ }
+}
Added: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.soa.esb.actions;
+
+/**
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ * @since Version 4.0
+ */
+
+public class TestActionProcessor3 implements ActionProcessor {
+
+ public TestActionProcessor3(String name) {
+ System.out.println("Instantiate action handler: " + name);
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
+ */
+ public Object process(Object payload) {
+ System.out.println("processAction: " + payload);
+ return payload;
+ }
+}
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -30,16 +30,18 @@
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
* @since Version 4.0
*/
-public class ToNowhereRouter implements ActionHandler {
+public class ToNowhereRouter implements ActionProcessor {
public static List objects = new ArrayList();
/* (non-Javadoc)
- * @see org.jboss.soa.esb.actions.ActionHandler#processAction(java.lang.Object)
+ * @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
- public Object processAction(Object payload) throws ActionProcessingException {
+ public Object process(Object payload) throws ActionProcessingException {
objects.add(payload);
+ System.out.println("ToNowhereRouter");
+
return null;
}
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListener-Config-01.xml
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListener-Config-01.xml 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListener-Config-01.xml 2006-09-12 13:04:01 UTC (rev 6168)
@@ -14,18 +14,18 @@
<!--
Under the new architecture I think these will be equivalent to "Contracts Definitions"?
-->
- <Action name="String-To-Long" handler="StringToLongConverter" />
- <Action name="Long-To-Date" handler="LongToDateConverter" />
- <Action name="Route-To-Nowhere" handler="ToNowhereRouter" />
+ <Action name="String-To-Long" processor="StringToLongConverter" />
+ <Action name="Long-To-Date" processor="LongToDateConverter" />
+ <Action name="Route-To-Nowhere" processor="ToNowhereRouter" />
- <HandlerAliases>
+ <ProcessorAliases>
<!--
Under the new architecture I think these will be equivalent to "Services"? The alias "name" being like the Service URN.
-->
<Alias name="StringToLongConverter" class="org.jboss.soa.esb.actions.StringToLongConverter" />
<Alias name="LongToDateConverter" class="org.jboss.soa.esb.actions.LongToDateConverter" />
<Alias name="ToNowhereRouter" class="org.jboss.soa.esb.actions.ToNowhereRouter" />
- </HandlerAliases>
+ </ProcessorAliases>
</Actions>
</ListenerConfig>
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListenerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListenerUnitTest.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/GpListenerUnitTest.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -63,23 +63,28 @@
ListenersManagerExecThread execThread = new ListenersManagerExecThread(listenerManager);
long currentTimeInMillis = System.currentTimeMillis();
+ // Clear the routing processor at the end of the pipeline...
ToNowhereRouter.objects.clear();
- // Start the listener...
+ // Start the GpListener command thread...
execThread.start();
- // Stick the current time in as a string...
+ // Stick the current time into the poller as a String...
MockPoller.addToQueue("" + currentTimeInMillis);
- Thread.sleep(500);
- // Send a shutdown command to the listener...
- InMemoryCommandQueue.getQueue("test-queue").addCommand("shutdown");
- execThread.assertShutdownOK(10000);
+ // The message has been pulled from the poller in-queue at this stage because MockPoller.addToQueue blocks.
+ // Wait for a few milliseconds to allow the processor pipeline do it's thing...
+ Thread.sleep(200);
- // Check did the "payload" get processed...
+ // Check did the "payload" get processed. The String containing the time should have been processed down the
+ // pileline and into a Date object in the ToNowhereRouter (mock routing processor) at the end of the pipeline...
assertEquals(1, ToNowhereRouter.objects.size());
Object date = ToNowhereRouter.objects.get(0);
assertTrue(date instanceof Date);
assertEquals(new Date(currentTimeInMillis), date);
+
+ // Send a shutdown command to the GpListener...
+ InMemoryCommandQueue.getQueue("test-queue").addCommand("shutdown");
+ execThread.assertShutdownOK(10000);
}
}
Modified: labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/util/MockPoller.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/util/MockPoller.java 2006-09-12 12:08:19 UTC (rev 6167)
+++ labs/jbossesb/workspace/tfennelly/product/core/listeners/tests/src/org/jboss/soa/esb/util/MockPoller.java 2006-09-12 13:04:01 UTC (rev 6168)
@@ -22,16 +22,26 @@
public MockPoller(GpListener p_oDad, DomElement p_oParms, ActionDefinitionFactory actionDefinitionFactory) throws Exception {
super(p_oDad, p_oParms, actionDefinitionFactory);
+ m_iPollMillis = 250;
}
/**
* Add an object for processing by the configured action handler.
+ * <p/>
+ * Blocks indefinitely until the message is consumed.
* @param actionObject The Object instance for processing.
*/
public static void addToQueue(Object actionObject) {
synchronized (queue) {
queue.add(actionObject);
}
+ while(!queue.isEmpty()) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ throw new IllegalStateException("Unexpected thread interupt.", e);
+ }
+ }
}
public static void clearQueue() {
More information about the jboss-svn-commits
mailing list