[jboss-svn-commits] JBL Code SVN: r12619 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/actions/routing and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 15 12:11:19 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-06-15 12:11:18 -0400 (Fri, 15 Jun 2007)
New Revision: 12619
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/MessageFilter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/StaticRouter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java
labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/CheckMessageStoreAction.java
labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml
labs/jbossesb/trunk/product/samples/quickstarts/messagestore/src/org/jboss/soa/esb/samples/quickstart/messagestore/CheckMessageStoreAction.java
labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java
labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java
labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java
labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java
labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml
labs/jbossesb/trunk/product/tools/configeditor/editor/resources/action-templates.xml
Log:
Updated actions to terminate action pipeline: JBESB-624
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -99,7 +99,7 @@
, MessageRouter.DEAD_LETTER_SERVICE_NAME
, message);
}
- return message;
+ return null;
} catch (MessageRouterException mre) {
throw new ActionProcessingException(mre.getMessage(), mre);
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/MessageFilter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/MessageFilter.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/MessageFilter.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -76,7 +76,7 @@
} catch (MessageRouterException mre) {
throw new ActionProcessingException(mre.getMessage(), mre);
}
- return message;
+ return null;
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/StaticRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/StaticRouter.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/StaticRouter.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -57,7 +57,7 @@
{
try {
MessageRouter.deliverMessages(_destinations, message);
- return message;
+ return null;
} catch (MessageRouterException ex) {
throw new ActionProcessingException(ex);
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/AbstractRouter.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -70,7 +70,7 @@
route(message);
}
- return message;
+ return null;
}
/**
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/HttpRouter.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -97,7 +97,7 @@
try
{
remotingClient.invoke(oCurr, null);
- return message;
+ return null;
}
finally
{
Modified: labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/install/tomcat/jboss-esb.xml 2007-06-15 16:11:18 UTC (rev 12619)
@@ -30,11 +30,6 @@
/>
</listeners>
<actions>
- <action name="PersistAction"
- class="org.jboss.soa.esb.actions.MessagePersister" >
- <property name="classfication" value="DLQ"/>
- <property name="message-store-type" value="urn:jboss/esb/persistence/type/DATABASE"/>
- </action>
<action name="notificationAction"
class="org.jboss.soa.esb.actions.Notifier">
<property name="okMethod" value="notifyOK" />
@@ -44,6 +39,11 @@
</NotificationList>
</property>
</action>
+ <action name="PersistAction"
+ class="org.jboss.soa.esb.actions.MessagePersister" >
+ <property name="classfication" value="DLQ"/>
+ <property name="message-store-type" value="urn:jboss/esb/persistence/type/DATABASE"/>
+ </action>
</actions>
</service>
</services>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/CheckMessageStoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/CheckMessageStoreAction.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/samples/quickstarts/deadletter/src/org/jboss/soa/esb/samples/quickstart/deadletter/CheckMessageStoreAction.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -24,12 +24,13 @@
import java.util.Map;
import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.services.persistence.MessageStoreException;
-public class CheckMessageStoreAction extends AbstractActionLifecycle {
+public class CheckMessageStoreAction extends AbstractActionPipelineProcessor {
protected ConfigTree _config;
@@ -44,21 +45,37 @@
* @return
* @throws Exception
*/
- public Message process(Message message) throws Exception
+ public Message process(Message message)
{
+ return message ;
+ }
+
+ /**
+ * Process a successful pipeline process.
+ * Invoked when the pipeline processing completes successfully.
+ *
+ * @param message The original message.
+ */
+ public void processSuccess(final Message message)
+ {
//I can call the messagestore API directory if it is deployed in the same JVM
String messageStoreClass = "org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl";
MessageStore messageStore = MessageStoreFactory.getInstance().getMessageStore(messageStoreClass);
// Get all the messages in the DLQ
System.out.println("Show all messages in the messageStore with category DLQ");
- Map<URI,Message> messageMap = messageStore.getAllMessages("DLQ");
- for (Message dlqMmessage : messageMap.values()) {
+ try
+ {
+ Map<URI,Message> messageMap = messageStore.getAllMessages("DLQ");
+ for (Message dlqMmessage : messageMap.values()) {
+ System.out.println("***********");
+ System.out.println(new String(dlqMmessage.getBody().getByteArray()));
+ }
+ }
+ catch (final MessageStoreException mse)
+ {
System.out.println("***********");
- System.out.println(new String(dlqMmessage.getBody().getByteArray()));
+ System.out.println("Error from message store: " + mse.getMessage()) ;
}
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- return message;
-
}
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/samples/quickstarts/messagestore/jboss-esb.xml 2007-06-15 16:11:18 UTC (rev 12619)
@@ -48,13 +48,13 @@
</NotificationList>
</property>
</action>
+ <!-- Check that the message is really there (executes on success of pipeline) -->
+ <action name="CheckMessageStore" class="org.jboss.soa.esb.samples.quickstart.messagestore.CheckMessageStoreAction" />
<!-- Add a copy of the message to the message store under categorization 'test' -->
<action name="PersistAction" class="org.jboss.soa.esb.actions.MessagePersister" >
<property name="classfication" value="test"/>
<property name="message-store-class" value="org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl"/>
</action>
- <!-- Check that the message is really there -->
- <action name="CheckMessageStore" class="org.jboss.soa.esb.samples.quickstart.messagestore.CheckMessageStoreAction" />
</actions>
</service>
</services>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/messagestore/src/org/jboss/soa/esb/samples/quickstart/messagestore/CheckMessageStoreAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/messagestore/src/org/jboss/soa/esb/samples/quickstart/messagestore/CheckMessageStoreAction.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/samples/quickstarts/messagestore/src/org/jboss/soa/esb/samples/quickstart/messagestore/CheckMessageStoreAction.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -23,12 +23,13 @@
import java.net.URI;
import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.actions.AbstractActionPipelineProcessor;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.persistence.MessageStore;
+import org.jboss.soa.esb.services.persistence.MessageStoreException;
-public class CheckMessageStoreAction extends AbstractActionLifecycle {
+public class CheckMessageStoreAction extends AbstractActionPipelineProcessor {
protected ConfigTree _config;
@@ -43,21 +44,37 @@
* @return
* @throws Exception
*/
- public Message process(Message originalMessage) throws Exception
+ public Message process(Message originalMessage)
{
+ return originalMessage ;
+ }
+
+ /**
+ * Process a successful pipeline process.
+ * Invoked when the pipeline processing completes successfully.
+ *
+ * @param originalMessage The original message.
+ */
+ public void processSuccess(final Message originalMessage)
+ {
//I can call the messagestore API directory if it is deployed in the same JVM
String messageStoreClass = "org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl";
MessageStore messageStore = MessageStoreFactory.getInstance().getMessageStore(messageStoreClass);
//Try to pull the message out
- Message message = messageStore.getMessage((URI) originalMessage.getProperties().getProperty(MessageStore.MESSAGE_STORE_URI));
- //Print out the content of the message
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- System.out.println("Body (from the stored message): "
- + new String(message.getBody().getByteArray()));
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
-
- return message;
-
+ try
+ {
+ Message message = messageStore.getMessage((URI) originalMessage.getProperties().getProperty(MessageStore.MESSAGE_STORE_URI));
+ //Print out the content of the message
+ System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+ System.out.println("Body (from the stored message): "
+ + new String(message.getBody().getByteArray()));
+ System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+ }
+ catch (final MessageStoreException mse)
+ {
+ System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+ System.out.println("Error from message store: " + mse.getMessage()) ;
+ System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+ }
}
-
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteExpressShipping.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -45,7 +45,7 @@
System.out.println(e.getMessage());
logFooter();
}
- return message;
+ return null;
}
private void logHeader() {
System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/org/jboss/soa/esb/samples/quickstart/simplecbr/RouteNormalShipping.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -45,7 +45,7 @@
System.out.println(e.getMessage());
logFooter();
}
- return message;
+ return null;
}
private void logHeader() {
System.out.println("\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/actions/BankResponseActions.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -58,6 +58,6 @@
- return message;
+ return null;
}
}
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/soa/esb/actions/MessagePersister.java 2007-06-15 16:11:18 UTC (rev 12619)
@@ -67,7 +67,7 @@
} catch (MessageStoreException mse) {
log.error("Could not store undeliverable message.", mse);
}
- return message;
+ return null;
}
/* (non-Javadoc)
* @see org.jboss.soa.esb.actions.ActionLifecycle#initialise()
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/jboss-esb.xml 2007-06-15 16:11:18 UTC (rev 12619)
@@ -27,11 +27,6 @@
/>
</listeners>
<actions>
- <action name="PersistAction"
- class="org.jboss.soa.esb.actions.MessagePersister" >
- <property name="classfication" value="DLQ"/>
- <property name="message-store-class" value="org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl"/>
- </action>
<action name="notificationAction"
class="org.jboss.soa.esb.actions.Notifier">
<property name="okMethod" value="notifyOK" />
@@ -41,6 +36,11 @@
</NotificationList>
</property>
</action>
+ <action name="PersistAction"
+ class="org.jboss.soa.esb.actions.MessagePersister" >
+ <property name="classfication" value="DLQ"/>
+ <property name="message-store-class" value="org.jboss.internal.soa.esb.persistence.format.db.DBMessageStoreImpl"/>
+ </action>
</actions>
</service>
</services>
Modified: labs/jbossesb/trunk/product/tools/configeditor/editor/resources/action-templates.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/configeditor/editor/resources/action-templates.xml 2007-06-15 15:58:39 UTC (rev 12618)
+++ labs/jbossesb/trunk/product/tools/configeditor/editor/resources/action-templates.xml 2007-06-15 16:11:18 UTC (rev 12619)
@@ -1,4 +1,17 @@
<action-templates xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd">
+ <action name="Notifier" class="org.jboss.soa.esb.actions.Notifier">
+ <property name="okMethod" value="notifyOK"/>
+ <property name="notification-details">
+ <NotificationList type="OK">
+ <target class="NotifyConsole"/>
+ <target class="NotifyQueues">
+ <queue jndiName="queuename">
+ <messageProp name="propname" value="propvalue"/>
+ </queue>
+ </target>
+ </NotificationList>
+ </property>
+ </action>
<action name="ContentBasedRouter" class="org.jboss.soa.esb.actions.ContentBasedRouter">
<property name="ruleSet" value="MyESBRules-XPath.drl"/>
<property name="ruleLanguage" value="XPathLanguage.dsl"/>
@@ -7,17 +20,4 @@
<route-to destination-name="xxx" service-category="yyy" service-name="zzz"/>
</property>
</action>
- <action name="Notifier" class="org.jboss.soa.esb.actions.Notifier">
- <property name="okMethod" value="notifyOK"/>
- <property name="notification-details">
- <NotificationList type="OK">
- <target class="NotifyConsole"/>
- <target class="NotifyQueues">
- <queue jndiName="queuename">
- <messageProp name="propname" value="propvalue"/>
- </queue>
- </target>
- </NotificationList>
- </property>
- </action>
</action-templates>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list