[jboss-svn-commits] JBL Code SVN: r14082 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/internal/soa/esb/couriers/tests and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2007-08-07 12:20:35 -0400 (Tue, 07 Aug 2007)
New Revision: 14082

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
Log:
Cleaning up deprication warnings.

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-08-07 13:29:15 UTC (rev 14081)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/Aggregator.java	2007-08-07 16:20:35 UTC (rev 14082)
@@ -49,7 +49,6 @@
 import org.jboss.soa.esb.services.registry.Registry;
 import org.jboss.soa.esb.services.registry.RegistryException;
 import org.jboss.soa.esb.services.registry.RegistryFactory;
-import org.jboss.soa.esb.services.routing.MessageRouter;
 
 /**
  * Simple Aggregator. The aggregator relies on 'aggregatorTags'. To puzzle the individual
@@ -135,16 +134,16 @@
 	@SuppressWarnings("unchecked")
     public Message process(Message message) throws ActionProcessingException
 	{
-        ArrayList<String> aggregatorTags = (ArrayList<String>) message.getProperties().getProperty(MessageRouter.AGGEGRATOR_TAG);
+        ArrayList<String> aggregatorTags = (ArrayList<String>) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
 		
         if (aggregatorTags!=null && aggregatorTags.size()>0) {
             String aggregatorTag = (String) aggregatorTags.get(aggregatorTags.size()-1);
             //Removing the last tags and setting them as "the one in current use"
             if (aggregatorTags.size()>1) {
                 aggregatorTags.remove(aggregatorTags.size()-1);
-                message.getProperties().setProperty(MessageRouter.AGGEGRATOR_TAG, aggregatorTags);
+                message.getProperties().setProperty(Aggregator.AGGEGRATOR_TAG, aggregatorTags);
             } else {
-                message.getProperties().remove(MessageRouter.AGGEGRATOR_TAG);
+                message.getProperties().remove(Aggregator.AGGEGRATOR_TAG);
             }
             String[] tag = aggregatorTag.split(":");
             String uuId = tag[0];
@@ -226,9 +225,9 @@
             //Push additional AggregatorTags onto the new message, so we can aggregate in case of nested splits.
             //Only need to get it from the first message, should be the same for the others.
             if (isFirstTime) {
-                ArrayList aggregatorTags = (ArrayList) message.getProperties().getProperty(MessageRouter.AGGEGRATOR_TAG);
+                ArrayList aggregatorTags = (ArrayList) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
                 if (aggregatorTags!=null && aggregatorTags.size()>0) {
-                    aggregatedMessage.getProperties().setProperty(MessageRouter.AGGEGRATOR_TAG, aggregatorTags);
+                    aggregatedMessage.getProperties().setProperty(Aggregator.AGGEGRATOR_TAG, aggregatorTags);
                 }
                 isFirstTime=false;
             }
@@ -292,7 +291,7 @@
                         if (isTimedOut(message)) {
                             //We found a timed-out message. Let's go notify ourselves about by resending a message,
                             //it if we haven't done so already
-                            String aggregatorTag = (String) message.getProperties().getProperty(MessageRouter.AGGEGRATOR_TAG);
+                            String aggregatorTag = (String) message.getProperties().getProperty(Aggregator.AGGEGRATOR_TAG);
                             String[] tag = aggregatorTag.split(":");
                             String uuId = tag[0];
                             if (!_notified.contains(uuId)) {

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java	2007-08-07 13:29:15 UTC (rev 14081)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/couriers/tests/FileCourierUnitTest.java	2007-08-07 16:20:35 UTC (rev 14082)
@@ -190,7 +190,7 @@
 		try
 		{
 		    Message retrieved = pickUp.pickup(1000);
-		    
+		    _logger.info(retrieved);
 		    Assert.fail();
 		}
 		catch (FaultMessageException ex)