[jboss-svn-commits] JBL Code SVN: r25068 - in labs/jbossesb/workspace/mlittle/legstar/product: rosetta/src/org/jboss/soa/esb/listeners/config/mappers and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 3 03:26:22 EST 2009
Author: jim.ma
Date: 2009-02-03 03:26:22 -0500 (Tue, 03 Feb 2009)
New Revision: 25068
Added:
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/HttpListenerMapper.java
Removed:
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/message/HttpMessageAwareListener.java
Modified:
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ESBAwareGenerator.java
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/mappers110/ESBAwareGenerator.java
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/GatewayGenerator.java
labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
Log:
Removed the stuff related to HttpCourier and reverted the helloworld sample
Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2009-02-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -42,7 +42,6 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.util.Util;
-
public class ListenerUtil
{
private static Logger logger = Logger.getLogger(ListenerUtil.class);
Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ESBAwareGenerator.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ESBAwareGenerator.java 2009-02-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/ESBAwareGenerator.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -210,7 +210,8 @@
} else if (listener instanceof GroovyListener) {
listenerConfigTree = GroovyListenerMapper.map(root, (GroovyListener)listener, model);
} else if (listener instanceof HttpListener) {
- listenerConfigTree = HttpListenerMapper.map(root, (HttpListener) listener, model);
+ logger.error("Http listener only supported in Gateway mode.");
+ return;
} else {
listenerConfigTree = UntypedListenerMapper.map(root, listener, model);
}
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-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/HttpListenerMapper.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -28,7 +28,6 @@
import org.jboss.soa.esb.listeners.config.xbeanmodel101.HttpListenerDocument.HttpListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel101.HttpProviderDocument.HttpProvider;
import org.jboss.soa.esb.listeners.gateway.HttpGatewayListener;
-import org.jboss.soa.esb.listeners.message.HttpMessageAwareListener;
import org.w3c.dom.Element;
/**
Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/ESBAwareGenerator.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/ESBAwareGenerator.java 2009-02-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/ESBAwareGenerator.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -36,6 +36,7 @@
import org.jboss.soa.esb.listeners.config.xbeanmodel110.FtpListenerDocument.FtpListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.GroovyListenerDocument.GroovyListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.JbrListenerDocument.JbrListener;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.HttpListenerDocument.HttpListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.JmsBusDocument.JmsBus;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.JmsJcaProviderDocument.JmsJcaProvider;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.JmsListenerDocument.JmsListener;
@@ -208,7 +209,10 @@
return;
} else if (listener instanceof GroovyListener) {
listenerConfigTree = GroovyListenerMapper.map(root, (GroovyListener)listener, model);
- } else {
+ } else if (listener instanceof HttpListener) {
+ logger.error("Http listener only supported in Gateway mode.");
+ return;
+ } else {
listenerConfigTree = UntypedListenerMapper.map(root, listener, model);
}
Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/GatewayGenerator.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/GatewayGenerator.java 2009-02-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/GatewayGenerator.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -32,6 +32,7 @@
import org.jboss.soa.esb.listeners.config.xbeanmodel110.GroovyListenerDocument.GroovyListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.HibernateListenerDocument.HibernateListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.JbrListenerDocument.JbrListener;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.HttpListenerDocument.HttpListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.JmsListenerDocument.JmsListener;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.ServiceDocument.Service;
import org.jboss.soa.esb.listeners.config.xbeanmodel110.SqlListenerDocument.SqlListener;
@@ -132,6 +133,8 @@
listenerConfig = SqlListenerMapper.map(root, (SqlListener) gateway, model);
} else if (gateway instanceof JbrListener) {
listenerConfig = JbrListenerMapper.map(root, (JbrListener) gateway, model);
+ } else if (gateway instanceof HttpListener) {
+ listenerConfig = HttpListenerMapper.map(root, (HttpListener) gateway, model);
} else if (gateway instanceof GroovyListener) {
listenerConfig = GroovyListenerMapper.map(root, (GroovyListener) gateway, model);
} else if (gateway instanceof HibernateListener) {
Added: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/HttpListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/HttpListenerMapper.java (rev 0)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/HttpListenerMapper.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -0,0 +1,80 @@
+package org.jboss.soa.esb.listeners.config.mappers110;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.addressing.eprs.JMSEpr;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.PropertyDocument.Property;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.HttpBusDocument.HttpBus;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.HttpListenerDocument.HttpListener;
+import org.jboss.soa.esb.listeners.config.xbeanmodel110.HttpProviderDocument.HttpProvider;
+import org.jboss.soa.esb.listeners.gateway.HttpGatewayListener;
+import org.w3c.dom.Element;
+
+/**
+ * Http listener mapper.
+ * @author <a href="mailto:ema at redhat.com">Jim Ma</a>
+ */
+public class HttpListenerMapper {
+ /**
+ * Perform the Http listener mapping.
+ * @param root The "ConfigTree" configuration root node.
+ * @param listener http listener config.
+ * @param model The configuration model from which the mapping is being performed.
+ * @return The ConfigTree listener configuration node.
+ * @throws org.jboss.soa.esb.ConfigurationException Invalid listener configuration.
+ */
+ public static Element map(Element root, HttpListener listener, XMLBeansModel model) throws ConfigurationException {
+ Element listenerNode = YADOMUtil.addElement(root, "listener");
+ HttpBus bus;
+ HttpProvider provider;
+
+ listenerNode.setAttribute("name", listener.getName());
+
+ try {
+ bus = (HttpBus) model.getBus(listener.getBusidref());
+ } catch (ClassCastException e) {
+ throw new ConfigurationException("Invalid busid reference [" + listener.getBusidref() + "] on listener [" + listener.getName() + "]. A <http-listener> must reference a <http-bus>.");
+ }
+ try {
+ provider = (HttpProvider) model.getProvider(bus);
+
+ } catch (ClassCastException e) {
+ throw new ConfigurationException("Invalid bus config [" + listener.getBusidref() + "]. Should be contained within a <http-provider> instance. Unexpected exception - this should have caused a validation error!");
+ }
+
+ // Map the standard listener attributes - common across all listener types...
+ MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
+ // Map the <property> elements targeted at the listener - from the listener itself.
+ //MapperUtil.mapProperties(provider.getPropertyList(), listenerNode);
+ for(Property property : provider.getPropertyList()) {
+ Element propertyElement = listenerNode.getOwnerDocument().createElement("property");
+ MapperUtil.serialize(property, propertyElement);
+ listenerNode.appendChild(propertyElement);
+ }
+
+
+
+
+ MapperUtil.mapProperties(bus.getPropertyList(), listenerNode);
+ MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
+
+ if(listener.getIsGateway()) {
+ String host = provider.getHost();
+ int port = provider.getPort();
+
+ listenerNode.setAttribute("gatewayClass", HttpGatewayListener.class.getName());
+ listenerNode.setAttribute(ListenerTagNames.IS_GATEWAY_TAG, Boolean.toString(listener.getIsGateway()));
+
+ if(host != null) {
+ listenerNode.setAttribute(HttpGatewayListener.SERVER_HOST_TAG, host);
+ }
+ listenerNode.setAttribute(HttpGatewayListener.REQUEST_CONTEXT_TAG, bus.getContext());
+ listenerNode.setAttribute(HttpGatewayListener.SERVER_PORT_TAG, Integer.toString(port));
+ } else {
+ throw new ConfigurationException("Invalid <http-listener> config [" + listener.getName() +"]. <http-listener> is currently only supported as a gateway listener.");
+ }
+
+ return listenerNode;
+ }
+}
Deleted: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/message/HttpMessageAwareListener.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/message/HttpMessageAwareListener.java 2009-02-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/message/HttpMessageAwareListener.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -1,157 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.listeners.message;
-
-import java.util.List;
-
-import javax.management.MBeanServer;
-
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardWrapper;
-import org.apache.catalina.loader.WebappLoader;
-import org.apache.catalina.startup.ContextConfig;
-import org.apache.log4j.Logger;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.addressing.eprs.HTTPEpr;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.helpers.KeyValuePair;
-import org.jboss.soa.esb.listeners.ListenerTagNames;
-import org.jboss.soa.esb.listeners.ListenerUtil;
-import org.jboss.soa.esb.listeners.gateway.HttpServerDelegate;
-import org.jboss.soa.esb.listeners.lifecycle.AbstractManagedLifecycle;
-import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
-
-/**
- * This class extends MessageAwareListener. It starts the TomcatServer in doStart() and
- * destroy created tomcat artifacts in doStop().
- * @author <a href="mailto:ema at redhat.com">Jim Ma</a>
- *
- */
-
-public class HttpMessageAwareListener extends AbstractManagedLifecycle {
-
- /**JMX domain name for tomcat listener*/
- public static String DOMAIN_NAME = "jboss.esb.tomcat";
-
- public MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
-
- public StandardContext ctx = null;
-
- public String host = null;
- public String port = null;
- public String httpContext = null;
-
- public String dispatchServletClassName = "";
-
-
- private static final long serialVersionUID = 1L;
-
- private static Logger logger = Logger.getLogger(HttpMessageAwareListener.class);
-
- private EPR _epr;
-
- public HttpMessageAwareListener(final ConfigTree config)
- throws ConfigurationException {
- super(config);
- List<KeyValuePair> properties = getConfig().childPropertyList();
- String maxThreads = getConfig().getAttribute(ListenerTagNames.MAX_THREADS_TAG);
- ConfigTree eprElement = config.getFirstChild(ListenerTagNames.EPR_TAG);
- host = eprElement.getAttribute(ListenerTagNames.HOST_TAG, "localhost");
- port = eprElement.getAttribute(ListenerTagNames.PORT_TAG);
- httpContext = eprElement.getAttribute(ListenerTagNames.CONTEXT_TAG);
- _epr = ListenerUtil.assembleEpr(eprElement);
- }
-
- protected void doInitialise() throws ManagedLifecycleException {
-
- }
-
- protected void doStart() throws ManagedLifecycleException {
- try {
- this.startHttpServer();
- } catch (Exception e) {
- throw new ManagedLifecycleException("Failed to start MessageAwareListener", e);
-
- }
- }
- protected void doStop() throws ManagedLifecycleException {
- try {
- stopHttpServer();
- } catch (Exception e) {
- throw new ManagedLifecycleException("Failed to stop MessageAwareListener", e) ;
- }
- }
-
- protected void doDestroy() throws ManagedLifecycleException {
-
- }
-
- /**
- * Start the tomcat http server.It will check if it really needs to create
- * Tomcat connector and host. Then add these new tomcat component to tomcat Engine
- * tree through JMX server.
- * @throws Exception For error during start tomcat context
- */
- @SuppressWarnings("unchecked")
- protected void startHttpServer() throws Exception {
- HttpServerDelegate.getInstance().createHost(host);
- List<KeyValuePair> properties = getConfig().childPropertyList();
- //TODO:add maxThreads option
- HttpServerDelegate.getInstance().createConnector(port, properties);
-
- ctx = new StandardContext();
- ctx.setLoader(new WebappLoader(getClass().getClassLoader()));
- ContextConfig ctxCfg = new ContextConfig();
- ctx.addLifecycleListener(ctxCfg);
-
-
- ctxCfg.setDefaultWebXml("org/apache/catalin/startup/NO_DEFAULT_XML");
- ctx.setPath(httpContext);
- ctx.setDocBase(".");
- ctx.getServletContext().setAttribute("config", this.getConfig());
- initWebappDefaults(ctx);
- HttpServerDelegate.getInstance().addContext(host, ctx);
- }
-
- protected void initWebappDefaults(StandardContext ctx) throws Exception {
- StandardWrapper sw = (StandardWrapper) ctx.createWrapper();
- sw.setServletClass("org.jboss.internal.soa.esb.couriers.HttpESBListenerServlet");
- sw.setName("default");
- ctx.addChild(sw);
- sw.addInitParameter("listings", "false");
- sw.setLoadOnStartup(1);
- try {
- sw.start();
- } catch (LifecycleException e) {
- logger.error("Unexpected error when start the default servlet");
- throw e;
- }
- ctx.addServletMapping("/", "default");
- }
-
- public void stopHttpServer() throws Exception {
- HttpServerDelegate.getInstance().destroyContext(host, port, httpContext);
- }
-}
Modified: labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java 2009-02-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/MyJMSListenerAction.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -23,7 +23,6 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageFactory;
public class MyJMSListenerAction extends AbstractActionLifecycle
{
@@ -35,13 +34,12 @@
public Message displayMessage(Message message) throws Exception{
- System.out.println("&&&&&&&&&&&&& Service 1 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- System.out.println("Header: " + message.getHeader().getCall().stringForm());
+ System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+ System.out.println("Body: " + message.getBody().get()) ;
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
-
return message;
}
-}
\ No newline at end of file
+}
Modified: labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java 2009-02-03 08:13:54 UTC (rev 25067)
+++ labs/jbossesb/workspace/mlittle/legstar/product/samples/quickstarts/helloworld/src/org/jboss/soa/esb/samples/quickstart/helloworld/test/SendEsbMessage.java 2009-02-03 08:26:22 UTC (rev 25068)
@@ -52,9 +52,9 @@
esbMessage.getBody().add(args[2]);
- Message msg = new ServiceInvoker(args[0], args[1]).deliverSync(esbMessage, 20000);
- System.out.println("----" + msg.getBody().get());
+ new ServiceInvoker(args[0], args[1]).deliverAsync(esbMessage);
}
}
+
More information about the jboss-svn-commits
mailing list