[jboss-cvs] JBossAS SVN: r106337 - in trunk: webservices/src/main/java/org/jboss/webservices/integration/tomcat and 1 other directory.

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

Author: alessio.soldano at jboss.com
Date: 2010-06-30 01:59:21 -0400 (Wed, 30 Jun 2010)
New Revision: 106337

Modified:
   trunk/component-matrix/pom.xml
   trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
Log:
- [JBWS-3073] add check for servlet class provider parameter when modifying the jbossweb metadata
- [JBAS-7902] remove context params propagation (not used anymore)


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-06-30 03:31:06 UTC (rev 106336)
+++ trunk/component-matrix/pom.xml	2010-06-30 05:59:21 UTC (rev 106337)
@@ -55,7 +55,7 @@
     <version.jboss.jbossws-cxf>3.3.1.SP1</version.jboss.jbossws-cxf>
     <version.jboss.jbossws-common>1.3.0.GA</version.jboss.jbossws-common>
     <version.jboss.jbossws-framework>3.3.0.GA</version.jboss.jbossws-framework>
-    <version.jboss.jbossws-spi>1.3.0.GA</version.jboss.jbossws-spi>
+    <version.jboss.jbossws-spi>1.4.0.Beta1</version.jboss.jbossws-spi>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.jsf-deployer>1.0.0-20100615.170722-11</version.jboss.jsf-deployer>
     <version.jboss.osgi.apache.xerces>2.9.1.SP4</version.jboss.osgi.apache.xerces>

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2010-06-30 03:31:06 UTC (rev 106336)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java	2010-06-30 05:59:21 UTC (rev 106337)
@@ -22,7 +22,6 @@
 package org.jboss.webservices.integration.tomcat;
 
 import java.util.List;
-import java.util.Map;
 
 import org.jboss.logging.Logger;
 import org.jboss.metadata.javaee.spec.ParamValueMetaData;
@@ -34,6 +33,7 @@
 import org.jboss.wsf.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.ServletClassProvider;
 
 /**
  * The modifier of jboss web meta data.
@@ -66,40 +66,11 @@
    {
       final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class);
 
-      this.propagateContextProps(dep, jbossWebMD);
       this.configureEndpoints(dep, jbossWebMD);
       this.modifyContextRoot(dep, jbossWebMD);
    }
 
    /**
-    * Propagates stack specific context parameters if specified. 
-    *
-    * @param dep webservice deployment
-    * @param jbossWebMD web meta data
-    */
-   @SuppressWarnings("unchecked")
-   private void propagateContextProps(final Deployment dep, final JBossWebMetaData jbossWebMD)
-   {
-      final Map<String, String> stackContextParams = (Map<String, String>) dep
-            .getProperty(WSConstants.STACK_CONTEXT_PARAMS);
-
-      if (stackContextParams != null)
-      {
-         this.log.debug("Creating context parameters");
-         final List<ParamValueMetaData> contextParams = WebMetaDataHelper.getContextParams(jbossWebMD);
-
-         for (Map.Entry<String, String> entry : stackContextParams.entrySet())
-         {
-            final String paramName = entry.getKey();
-            final String paramValue = entry.getValue();
-
-            this.log.debug("Setting context parameter name: " + paramName + " value: " + paramValue);
-            WebMetaDataHelper.newParamValue(paramName, paramValue, contextParams);
-         }
-      }
-   }
-
-   /**
     * Configures transport servlet class for every found webservice endpoint. 
     *
     * @param dep webservice deployment
@@ -109,7 +80,7 @@
    {
       final String transportClassName = this.getTransportClassName(dep);
       final ClassLoader loader = dep.getInitialClassLoader();
-      this.log.debug("Modifying servlets");
+      this.log.trace("Modifying servlets");
 
       for (final ServletMetaData servletMD : jbossWebMD.getServlets())
       {
@@ -151,11 +122,29 @@
     */
    private String getTransportClassName(final Deployment dep)
    {
-      final String transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS);
+      String transportClassName = null;
+      String transportClassProviderName = (String) dep.getProperty("stack.transport.class.provider"); //TODO replace with WSContants reference once jbossws-common 1.4 is released
+      if (transportClassProviderName != null)
+      {
+         try
+         {
+            ServletClassProvider scp = (ServletClassProvider)(Class.forName(transportClassProviderName).newInstance());
+            transportClassName = scp.getServletClassName();
+         }
+         catch (Exception e)
+         {
+            log.warn("Cannot get transport class name from stack.transport.class.provider", e);
+         }
+      }
+      
+      if (transportClassName == null)
+      {
+         transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS);
+      }
 
       if (transportClassName == null)
       {
-         throw new IllegalStateException("Cannot obtain deployment property: " + WSConstants.STACK_TRANSPORT_CLASS);
+         throw new IllegalStateException("Cannot obtain deployment property : " + WSConstants.STACK_TRANSPORT_CLASS);
       }
 
       return transportClassName;