[jboss-svn-commits] JBL Code SVN: r11371 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions/persistence and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 26 14:25:25 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-04-26 14:25:25 -0400 (Thu, 26 Apr 2007)
New Revision: 11371
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/persistence/StoreMessage.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql
labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql
labs/jbossesb/trunk/product/install/message-store/sql/postgresql/create_database.sql
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
Log:
Adding classification column to the messagestore.
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-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -95,7 +95,7 @@
MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DEFAULT_TYPE);
assertEquals((store != null), true);
try {
- URI uid = store.addMessage(message);
+ URI uid = store.addMessage(message, MessageStore.DLQ_CLASSIFICATION);
store.setUndelivered(uid);
} catch (MessageStoreException mse) {
log.error("Could not store undeliverable message.", mse);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/StoreMessage.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/StoreMessage.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/StoreMessage.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -103,7 +103,7 @@
MessageStore store = MessageStoreFactory.getInstance().getMessageStore(
getMessageStoreTypeURI());
try {
- store.addMessage(message);
+ store.addMessage(message, MessageStore.DEFAULT_CLASSIFICATION);
return message;
} catch (MessageStoreException e) {
throw new ActionProcessingException(e);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/filter/FilterManager.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -67,14 +67,14 @@
public Message doOutputWork (Message msg) throws CourierException
{
- if (_filters == null)
- return msg;
+// if (_filters == null)
+// return msg;
+//
+// for (int i = 0; i < _filters.length; i++)
+// {
+// msg = _filters[i].onOutput(msg);
+// }
- for (int i = 0; i < _filters.length; i++)
- {
- msg = _filters[i].onOutput(msg);
- }
-
return msg;
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -29,6 +29,8 @@
public interface MessageStore
{
+ public final static String DEFAULT_CLASSIFICATION = "STORE";
+ public final static String DLQ_CLASSIFICATION = "DLQ";
/**
* Get the implementation-specific message URI generator.
* @return the generator
@@ -41,7 +43,7 @@
* @return the URI of the generated message
* @throws MessageStoreException
*/
- public URI addMessage (Message message) throws MessageStoreException;
+ public URI addMessage (Message message, String classification) throws MessageStoreException;
/**
* Get a message from the store by URI.
@@ -70,6 +72,6 @@
* @return
* @throws MessageStoreException
*/
- public Map<URI, Message> getUndeliveredMessages() throws MessageStoreException;
+ public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException;
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -79,7 +79,7 @@
* add's a @Message to the database persistence store
* will set the 'delivered' flag to TRUE by default - assuming that the @Message has been delivered
*/
- public synchronized URI addMessage (Message message) throws MessageStoreException
+ public synchronized URI addMessage (Message message, String classification) throws MessageStoreException
{
// String messageString = null;
@@ -94,12 +94,13 @@
String messageString = Base64.encodeObject(Util.serialize(message));
// insert into the database
- String sql = "insert into message(uuid, type, message, delivered) values(?,?,?, ?)";
+ String sql = "insert into message(uuid, type, message, delivered, classification) values(?,?,?,?,?)";
ps = conn.prepareStatement(sql);
ps.setString(1, uid.toString());
ps.setString(2, message.getType().toString());
ps.setString(3, messageString);
ps.setString(4, "TRUE");
+ ps.setString(5, classification);
ps.execute();
}
@@ -218,9 +219,12 @@
* @return Map<URI, Message> - a collection of all the undelivered messages in the message-store
* @throws MessageStoreException
*/
- public Map<URI, Message> getUndeliveredMessages() throws MessageStoreException {
+ public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
HashMap<URI, Message> messages = new HashMap<URI, Message>();
String sql = "select uuid from message where delivered='FALSE'";
+ if (classification!=null) {
+ sql += " and classification='" + classification + "'";
+ }
try
{
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/jcr/JCRMessageStoreImpl.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -71,7 +71,7 @@
*
* @see org.jboss.soa.esb.services.persistence.MessageStore#addMessage(org.jboss.soa.esb.message.Message)
*/
- public URI addMessage(Message message) throws MessageStoreException {
+ public URI addMessage(Message message, String classification) throws MessageStoreException {
try {
Session session = JCRConnectionManager.getInstance().newRepositorySession();
Node root = getMessageStoreRootNode(session);
@@ -242,7 +242,7 @@
*
* @see org.jboss.soa.esb.services.persistence.MessageStore#getUndeliveredMessages()
*/
- public Map<URI, Message> getUndeliveredMessages() throws MessageStoreException {
+ public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException {
return new HashMap<URI, Message>();
}
Modified: labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/core/services/tests/src/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -88,7 +88,7 @@
MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
assertEquals((store != null), true);
- URI uid = store.addMessage(msg);
+ URI uid = store.addMessage(msg, MessageStore.DEFAULT_CLASSIFICATION);
store.setUndelivered(uid);
}
@@ -104,7 +104,7 @@
MessageStore store = MessageStoreFactory.getInstance().getMessageStore(MessageStoreType.DATABASE);
assertEquals((store != null), true);
- URI uid = store.addMessage(msg);
+ URI uid = store.addMessage(msg,MessageStore.DEFAULT_CLASSIFICATION);
store.setDelivered(uid);
}
@@ -131,22 +131,19 @@
MessageStoreType.DATABASE);
assertEquals((store != null), true);
- URI uid1 = store.addMessage(msg1);
- URI uid2 = store.addMessage(msg2);
- URI uid3 = store.addMessage(msg3);
- URI uid4 = store.addMessage(msg4);
+ URI uid1 = store.addMessage(msg1,MessageStore.DEFAULT_CLASSIFICATION);
+ URI uid2 = store.addMessage(msg2,MessageStore.DEFAULT_CLASSIFICATION);
+ URI uid3 = store.addMessage(msg3,MessageStore.DEFAULT_CLASSIFICATION);
+ URI uid4 = store.addMessage(msg4,MessageStore.DEFAULT_CLASSIFICATION);
store.setUndelivered(uid1);
store.setUndelivered(uid2);
store.setUndelivered(uid3);
store.setUndelivered(uid4);
- Map<URI, Message> messages = store.getUndeliveredMessages();
+ Map<URI, Message> messages = store.getUndeliveredMessages(MessageStore.DEFAULT_CLASSIFICATION);
assertEquals((messages != null), true);
-
-
-
}
@Test
@@ -182,12 +179,12 @@
// keep track of the UID to use in retrieving the Message
URI uid1 = null;
- uid1 = store.addMessage(msg1);
+ uid1 = store.addMessage(msg1, MessageStore.DEFAULT_CLASSIFICATION);
// System.out.println(uid1);
assertEquals((uid1 != null), true);
URI uid2 = null;
- uid2 = store.addMessage(msg2);
+ uid2 = store.addMessage(msg2,MessageStore.DEFAULT_CLASSIFICATION);
// System.out.println(uid2);
assertEquals((uid2 != null), true);
Modified: labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql 2007-04-26 18:25:25 UTC (rev 11371)
@@ -5,5 +5,6 @@
type VARCHAR NOT NULL,
message VARCHAR NOT NULL,
delivered VARCHAR NOT NULL,
+ classification VARCHAR,
CONSTRAINT pk_uid PRIMARY KEY (uuid)
);
Modified: labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/install/message-store/sql/mysql/create_database.sql 2007-04-26 18:25:25 UTC (rev 11371)
@@ -5,5 +5,6 @@
type varchar(128) NOT NULL,
message text(4000) NOT NULL,
delivered varchar(10) NOT NULL,
+ classification varchar(10),
PRIMARY KEY (`uuid`)
);
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/install/message-store/sql/postgresql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/message-store/sql/postgresql/create_database.sql 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/product/install/message-store/sql/postgresql/create_database.sql 2007-04-26 18:25:25 UTC (rev 11371)
@@ -14,5 +14,6 @@
"type" text NOT NULL,
message text NOT NULL,
delivered text NOT NULL,
+ classification text,
CONSTRAINT pk_uid PRIMARY KEY (uuid)
);
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreClient.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -73,7 +73,7 @@
{
try
{
- URI uid = store.addMessage(msg[rndMsg.nextInt(2)]);
+ URI uid = store.addMessage(msg[rndMsg.nextInt(2)], MessageStore.DEFAULT_CLASSIFICATION);
if (uid != null) writeList.add(uid);
else
System.err
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java 2007-04-26 18:03:08 UTC (rev 11370)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/messagestore/MessageStoreTest.java 2007-04-26 18:25:25 UTC (rev 11371)
@@ -91,7 +91,7 @@
//loop through adding the messages
Random rndMsg = new Random();
for (int x=0; x<=requestors; x++) {
- URI uid = store.addMessage(msg[rndMsg.nextInt(2)]);
+ URI uid = store.addMessage(msg[rndMsg.nextInt(2)], MessageStore.DEFAULT_CLASSIFICATION);
if (uid == null)
System.out.println("null returned from addMessage() call to uid");
else
More information about the jboss-svn-commits
mailing list