[jboss-svn-commits] JBL Code SVN: r25045 - 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: jim.ma
Date: 2009-02-02 02:49:58 -0500 (Mon, 02 Feb 2009)
New Revision: 25045

Modified:
   labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/addressing/util/DefaultReplyTo.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/config/mappers/HttpListenerMapper.java
Log:
Fixed the compile error and removed the code for support http message aware listener in HttpListenerMapper

Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/addressing/util/DefaultReplyTo.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/addressing/util/DefaultReplyTo.java	2009-02-02 06:52:52 UTC (rev 25044)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/addressing/util/DefaultReplyTo.java	2009-02-02 07:49:58 UTC (rev 25045)
@@ -59,8 +59,6 @@
 		throw new IllegalArgumentException("toEpr must not be null");
         if (toEpr instanceof InVMEpr)
         return new DefaultInVMReplyToEpr((InVMEpr) toEpr);
-        if (toEpr instanceof HTTPEpr)
-            return new DefaultHttpReplyToEpr((HTTPEpr) toEpr);
 	    if (toEpr instanceof JMSEpr)
 		return new DefaultJmsReplyToEpr((JMSEpr) toEpr);
 	    // Check for SFTPEpr first, as it extends FTPEpr

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-02-02 06:52:52 UTC (rev 25044)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2009-02-02 07:49:58 UTC (rev 25045)
@@ -27,10 +27,8 @@
 import javax.security.auth.Subject;
 
 import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.addressing.eprs.DefaultHttpReplyToEpr;
 import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
 import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.jboss.internal.soa.esb.couriers.HttpCourier;
 import org.jboss.internal.soa.esb.couriers.TwoWayCourierImpl;
 import org.jboss.internal.soa.esb.services.security.PrivateCryptoUtil;
 import org.jboss.soa.esb.ConfigurationException;

Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/HttpListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/HttpListenerMapper.java	2009-02-02 06:52:52 UTC (rev 25044)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/HttpListenerMapper.java	2009-02-02 07:49:58 UTC (rev 25045)
@@ -20,7 +20,6 @@
 package org.jboss.soa.esb.listeners.config.mappers;
 
 import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.addressing.eprs.HTTPEpr;
 import org.jboss.soa.esb.addressing.eprs.JMSEpr;
 import org.jboss.soa.esb.dom.YADOMUtil;
 import org.jboss.soa.esb.listeners.ListenerTagNames;
@@ -93,20 +92,7 @@
             listenerNode.setAttribute(HttpGatewayListener.REQUEST_CONTEXT_TAG, bus.getContext());
             listenerNode.setAttribute(HttpGatewayListener.SERVER_PORT_TAG, Integer.toString(port));
         } else {
-			Element eprNode = YADOMUtil.addElement(listenerNode, ListenerTagNames.EPR_TAG);
-
-			
-			// Map EPR related attributes onto the EPR - from the bus and provider and listener...
-			//mapJmsEprProperties(eprNode, provider, messageFilter);
-			eprNode.setAttribute(ListenerTagNames.PROTOCOL_TAG, HTTPEpr.HTTP_PROTOCOL);
-             
-			eprNode.setAttribute(ListenerTagNames.HOST_TAG, provider.getHost());
-			
-			eprNode.setAttribute(ListenerTagNames.PORT_TAG, Integer.toString(provider.getPort()));
-			eprNode.setAttribute(ListenerTagNames.CONTEXT_TAG, bus.getContext());
-			
-			listenerNode.setAttribute(ListenerTagNames.LISTENER_CLASS_TAG, HttpMessageAwareListener.class.getName());
-			YADOMUtil.removeEmptyAttributes(eprNode);
+			throw new ConfigurationException("Invalid <http-listener> config [" + listener.getName() +"]. <http-listener> is currently only supported as a gateway listener.");
         }
 
         return listenerNode;