[jboss-svn-commits] JBL Code SVN: r25031 - in labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss: soa/esb/client and 1 other directories.

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

Author: mark.little at jboss.com
Date: 2009-01-31 10:17:05 -0500 (Sat, 31 Jan 2009)
New Revision: 25031

Modified:
   labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
   labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
   labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java
Log:


Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2009-01-31 14:03:51 UTC (rev 25030)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/internal/soa/esb/couriers/TwoWayCourierImpl.java	2009-01-31 15:17:05 UTC (rev 25031)
@@ -152,7 +152,13 @@
         if (addr.startsWith(InVMEpr.INVM_PROTOCOL))        	
             return CourierFactory.getInstance().getInVMCourier(new InVMEpr(epr));
         if (addr.startsWith(HTTPEpr.HTTP_PROTOCOL))
+        {
+            if ("true".equals(epr.getAddr().getExtensionValue("is-gateway")))
+                throw new MalformedEPRException("Courier for "
+                        + epr.getClass().getSimpleName() + " not supported: ESB-unaware EPR used!");
+            else
         	return CourierFactory.getInstance().getHttpCourier(new HTTPEpr(epr));
+        }
         if (addr.startsWith(JMSEpr.JMS_PROTOCOL))
 			return new JmsCourier(new JMSEpr(epr), pickUpOnly);
 		if (addr.startsWith(JDBCEpr.JDBC_PROTOCOL))

Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2009-01-31 14:03:51 UTC (rev 25030)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2009-01-31 15:17:05 UTC (rev 25031)
@@ -111,7 +111,8 @@
     /**
      * Class logger.
      */
-    private static java.util.logging.Logger logger = Logger.getLogger(ServiceInvoker.class);
+    private static Logger logger = Logger.getLogger(ServiceInvoker.class);
+
     /**
      * The target service.
      */

Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java	2009-01-31 14:03:51 UTC (rev 25030)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java	2009-01-31 15:17:05 UTC (rev 25031)
@@ -342,6 +342,7 @@
     private void registerEndpoint() throws ConfigurationException, RegistryException {
     	try {
 			endpointReference = new HTTPEpr(new URI(protocol + "://"+ host + ":" + port + this.httpContext));
+			endpointReference.getAddr().addExtension("is-gateway", "true");
 		} catch (Exception e) {
 			throw new RegistryException("Tomcat gateway listener registration failed", e);
 		}