[jbossws-commits] JBossWS SVN: r6255 - framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-04-07 10:13:51 -0400 (Mon, 07 Apr 2008)
New Revision: 6255

Added:
   framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/HttpTransportDeploymentAspect.java
Removed:
   framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
Log:
Introduced generic HttpTransport DA

Deleted: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java	2008-04-07 14:13:02 UTC (rev 6254)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java	2008-04-07 14:13:51 UTC (rev 6255)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.framework.deployment;
-
-//$Id$
-
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
-
-/**
- * A deployer that assigns the endpoint address. 
- *
- * @author Thomas.Diesler at jboss.org
- * @since 19-May-2007
- */
-public class EndpointAddressDeploymentAspect extends DeploymentAspect
-{
-   @Override
-   public void create(Deployment dep, WSFRuntime runtime)
-   {
-      String contextRoot = dep.getService().getContextRoot();
-      if (contextRoot == null)
-         throw new IllegalStateException("Cannot obtain context root");
-      
-      SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
-      ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
-      ServerConfig serverConfig = spi.getServerConfig();
-      
-      String host = serverConfig.getWebServiceHost();
-      int port = serverConfig.getWebServicePort();
-      String hostAndPort = host + (port > 0 ? ":" + port : ""); 
-
-      for (Endpoint ep : dep.getService().getEndpoints())
-      {
-         String urlPattern = ep.getURLPattern();
-         if (urlPattern == null)
-            throw new IllegalStateException("Cannot obtain url pattern");
-
-         if (urlPattern.endsWith("/*"))
-            urlPattern = urlPattern.substring(0, urlPattern.length() - 2);
-
-         ep.setAddress("http://" + hostAndPort + contextRoot + urlPattern);
-      }
-   }
-}
\ No newline at end of file

Copied: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/HttpTransportDeploymentAspect.java (from rev 6240, framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java)
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/HttpTransportDeploymentAspect.java	                        (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/HttpTransportDeploymentAspect.java	2008-04-07 14:13:51 UTC (rev 6255)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.wsf.framework.deployment;
+
+//$Id$
+
+import org.jboss.wsf.spi.ComposableRuntime;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.transport.*;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Invokes a HTTP {@link org.jboss.wsf.spi.transport.TransportManager} 
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.com
+ * 
+ * @since 19-May-2007
+ */
+public class HttpTransportDeploymentAspect extends DeploymentAspect
+{
+   @Override
+   public void create(Deployment dep, WSFRuntime runtime)
+   {
+      TransportManagerFactory tmf = ((ComposableRuntime)runtime).getTransportManagerFactory();
+      TransportManager httpTransport = tmf.createTransportManager(Protocol.HTTP);
+
+      // Context root
+      String contextRoot = dep.getService().getContextRoot();
+      if (contextRoot == null)
+         throw new IllegalStateException("Cannot obtain context root");
+
+      // Setup transport for each endpoint
+      for (Endpoint ep : dep.getService().getEndpoints())
+      {
+         String urlPattern = ep.getURLPattern();
+         if (urlPattern == null)
+            throw new IllegalStateException("Cannot obtain url pattern");
+         if (urlPattern.endsWith("/*"))
+            urlPattern = urlPattern.substring(0, urlPattern.length() - 2);
+
+         HttpSpec spec = new HttpSpec(contextRoot, urlPattern);
+
+         // Propagate stack provided properties through TransportSpec (ServletClass and InitParameter)
+         String servletClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS);
+         if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS);
+
+         Object ctxProps = dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS);
+         Map ctxParams = ctxProps != null ?  (Map)ctxProps:new HashMap();
+
+         spec.setServletClass(servletClass);
+         spec.getContextParameter().putAll(ctxParams);
+         
+         ListenerRef ref = httpTransport.createListener(ep, spec);
+         ep.addAttachment(ListenerRef.class, ref);
+         ep.setAddress(ref.getAddress().toString());
+      }
+   }
+}
\ No newline at end of file


Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/HttpTransportDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF