[jboss-svn-commits] JBL Code SVN: r7515 - in labs/jbossesb/trunk/product/core/rosetta/src/org/jboss: internal/soa/esb/couriers soa/esb/couriers

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

Author: kurt.stam at jboss.com
Date: 2006-11-09 13:57:49 -0500 (Thu, 09 Nov 2006)
New Revision: 7515

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/DeliverCourier.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/PickUpCourier.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourier.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/Courier.java
Log:
Adding inheritance of the courier interfaces.

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/DeliverCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/DeliverCourier.java	2006-11-09 18:50:27 UTC (rev 7514)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/DeliverCourier.java	2006-11-09 18:57:49 UTC (rev 7515)
@@ -25,8 +25,8 @@
 import org.jboss.soa.esb.couriers.CourierException;
 import org.jboss.soa.esb.message.Message;
 
-interface DeliverCourier 
+public interface DeliverCourier 
 {
 	public boolean	deliver(Message message) throws CourierException;
-	public void		cleanup();
+	public void		stopDurableDelivery();
 }

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2006-11-09 18:50:27 UTC (rev 7514)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2006-11-09 18:57:49 UTC (rev 7515)
@@ -46,6 +46,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.addressing.eprs.JMSEpr;
 import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.couriers.CourierTimeoutException;
 import org.jboss.soa.esb.helpers.AppServerContext;
 import org.jboss.soa.esb.helpers.KeyValuePair;
 import org.jboss.soa.esb.message.Message;
@@ -333,4 +334,16 @@
     protected MessageProducer 	_messageProducer;
     protected MessageConsumer	_messageConsumer;
     protected List<KeyValuePair> _messageProperties;
+	public Message pickup(long millis) throws CourierException, CourierTimeoutException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void stopDurablePickup() {
+		cleanup();
+	}
+
+	public void stopDurableDelivery() {
+		cleanup();
+	}
 }

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/PickUpCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/PickUpCourier.java	2006-11-09 18:50:27 UTC (rev 7514)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/PickUpCourier.java	2006-11-09 18:57:49 UTC (rev 7515)
@@ -23,10 +23,15 @@
 package org.jboss.internal.soa.esb.couriers;
 
 import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.couriers.CourierTimeoutException;
 import org.jboss.soa.esb.message.Message;
-
-interface PickUpCourier 
+/**
+ * 
+ * @author kstam
+ *
+ */
+public interface PickUpCourier 
 {
-	public Message	pickUp(long millis) throws CourierException;
-	public void		cleanup();
+	public Message	pickup(long millis) throws CourierException, CourierTimeoutException;
+	public void		stopDurablePickup();
 }

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourier.java	2006-11-09 18:50:27 UTC (rev 7514)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourier.java	2006-11-09 18:57:49 UTC (rev 7515)
@@ -34,7 +34,7 @@
  * @author esteban
  * @author kstam at redhat.com
  */
-public class TwoWayCourier implements Courier 
+public class TwoWayCourier implements Courier
 {
 	private DeliverCourier	_deliverCourier;
 	private PickUpCourier	_pickupCourier;
@@ -57,7 +57,7 @@
 		DeliverCourier old = _deliverCourier;
 		_deliverCourier	= getDeliverCourier(toEPR);
 		if (null!=old)
-			old.cleanup();
+			old.stopDurableDelivery();
 	}
 	/**
 	 * @see  org.jboss.soa.esb.couriers.Courier#setReplyEpr(toReplyEPR).
@@ -67,7 +67,7 @@
 		PickUpCourier old = _pickupCourier;
 		_pickupCourier	= getPickupCourier(replyToEPR);
 		if (null!=old)
-			old.cleanup();
+			old.stopDurablePickup();
 	}
 	/**
 	 * @see  org.jboss.soa.esb.couriers.Courier#getDeliverCourier(EPR toEPR).
@@ -131,7 +131,7 @@
 		try {
 			replyMessage = pickupNext(waitTime);
 		} finally {
-			_pickupCourier.cleanup();
+			_pickupCourier.stopDurablePickup();
 		}
 		return replyMessage;
 	}
@@ -142,7 +142,7 @@
 	{
 		if (null==_pickupCourier)
 			throw new CourierException("No replyToEPR was provided at construction time");
-		return _pickupCourier.pickUp(waitTime);
+		return _pickupCourier.pickup(waitTime);
 	}
 	/**
 	 * @see  org.jboss.soa.esb.couriers.Courier#stopDurableDelivery().
@@ -150,7 +150,7 @@
 	public void stopDurableDelivery() 
 	{
 		if (null!=_deliverCourier)
-			_deliverCourier.cleanup();
+			_deliverCourier.stopDurableDelivery();
 	}
 	/**
 	 * @see  org.jboss.soa.esb.couriers.Courier#stopDurablePickup().
@@ -158,6 +158,6 @@
 	public void stopDurablePickup() 
 	{
 		if (null!=_pickupCourier)
-			_pickupCourier.cleanup();
+			_pickupCourier.stopDurablePickup();
 	}
 }

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/Courier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/Courier.java	2006-11-09 18:50:27 UTC (rev 7514)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/Courier.java	2006-11-09 18:57:49 UTC (rev 7515)
@@ -22,6 +22,8 @@
 
 package org.jboss.soa.esb.couriers;
 
+import org.jboss.internal.soa.esb.couriers.DeliverCourier;
+import org.jboss.internal.soa.esb.couriers.PickUpCourier;
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.message.Message;
 /**
@@ -31,7 +33,7 @@
  * @author kstam at redhat.com
  *
  */
-public interface Courier 
+public interface Courier extends DeliverCourier, PickUpCourier
 {
 	/**
 	 * Try to deliver an ESB message. This is a one shot delivery.