[jboss-svn-commits] JBL Code SVN: r12719 - in labs/jbossesb/trunk/product: lib/ext and 1 other directories.

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

Author: kurt.stam at jboss.com
Date: 2007-06-20 14:44:06 -0400 (Wed, 20 Jun 2007)
New Revision: 12719

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
   labs/jbossesb/trunk/product/lib/ext/juddi-1.0-SNAPSHOT.jar
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
Log:
JBESB-638, initializing just once.

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2007-06-20 18:37:36 UTC (rev 12718)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2007-06-20 18:44:06 UTC (rev 12719)
@@ -26,29 +26,25 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.Collection;
 import java.util.Properties;
 import java.util.Set;
 
+import javax.jms.JMSException;
 import javax.naming.Context;
 
 import org.apache.log4j.Logger;
+import org.jboss.internal.soa.esb.rosetta.pooling.JmsConnectionPoolContainer;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.MalformedEPRException;
 import org.jboss.soa.esb.addressing.eprs.FTPEpr;
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
 import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
 import org.jboss.soa.esb.addressing.eprs.JMSEpr;
-import org.jboss.soa.esb.couriers.Courier;
-import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.couriers.CourierFactory;
-import org.jboss.soa.esb.couriers.CourierUtil;
 import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.listeners.message.MessageDeliveryAdapter;
 import org.jboss.soa.esb.message.Message;
-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.util.Util;
 
 public class ListenerUtil
@@ -58,33 +54,24 @@
 	{
 	}
 
-	public static EPR tryToDeliver(Message message, String category, String name)
-			throws CourierException, RegistryException, MalformedEPRException
+    /**
+     * For unittest/quickstart use, to deliver a message. This method closes all
+     * JmsCOnnectionPools.
+     * 
+     * @param message
+     * @param category
+     * @param name
+     * @throws MessageDeliverException
+     * @throws RegistryException
+     * @throws JMSException
+     */
+	public static void tryToDeliver(Message message, String category, String name)
+			throws MessageDeliverException, RegistryException, JMSException
 	{
-		Courier courier = null;
-		Registry reg = RegistryFactory.getRegistry();
-		Collection<EPR> all = reg.findEPRs(category, name);
-		if (null != all)
-			for (EPR epr : all)
-			{
-				try
-				{
-					courier = CourierFactory.getCourier(epr);
-					if (!courier.deliver(message))
-						continue;
-					return epr;
-				}
-				finally
-				{
-					CourierUtil.cleanCourier(courier);
-				}
-			}
-		String service = "[" + category + "," + name + "]";
-		String txt = (null == all || all.size() < 1) ? "No EPRs registered for "
-				+ service
-				: "Unable to deliverAsync message to registered EPRs for " + service;
-		throw new CourierException(txt);
-	} // ________________________________
+        MessageDeliveryAdapter adapter = new MessageDeliveryAdapter(category, name);
+        adapter.deliverAsync(message);
+        JmsConnectionPoolContainer.removeAllPools();
+	}
 
 	public static EPR assembleEpr(ConfigTree tree)
 			throws ConfigurationException

Modified: labs/jbossesb/trunk/product/lib/ext/juddi-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java	2007-06-20 18:37:36 UTC (rev 12718)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java	2007-06-20 18:44:06 UTC (rev 12719)
@@ -44,6 +44,9 @@
 {
     public static void main(String args[]) throws Exception
     {
+//      Setting the ConnectionFactory such that it will use scout
+        System.setProperty("javax.xml.registry.ConnectionFactoryClass","org.apache.ws.scout.registry.ConnectionFactoryImpl");
+        
     	if (args.length < 3)
     	{
     		System.out.println("Usage SendEsbMessage <category> <name> <text to send>");