[jbossws-commits] JBossWS SVN: r10388 - in stack/metro/branches/ropalka/modules/server/src/main: java/org/jboss/wsf/stack/metro/metadata and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-07-27 04:28:25 -0400 (Mon, 27 Jul 2009)
New Revision: 10388

Modified:
   stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
   stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
   stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Log:
[JBWS-2332] refactoring

Modified: stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java	2009-07-27 08:21:15 UTC (rev 10387)
+++ stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java	2009-07-27 08:28:25 UTC (rev 10388)
@@ -21,6 +21,7 @@
  */
 package org.jboss.wsf.stack.metro;
 
+import org.jboss.wsf.common.integration.Constants;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
@@ -88,20 +89,21 @@
    }
    
    /**
-    * Puts SUN JAX-WS config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map
-    * @param dep deployment where to put
-    * @param dd beans to be put
+    * Puts Metro config file reference to the stack specific context properties. 
+    *
+    * @param dep webservice deployment
+    * @param jaxwsConfigURL Metro DD URL
+    * @see org.jboss.wsf.common.integration.Constants.STACK_CONTEXT_PARAMS
     */
    private static void putSunJaxwsConfigToDeployment(Deployment dep, URL jaxwsConfigURL)
    {
       // get property map
-      String propKey = "org.jboss.ws.webapp.ContextParameterMap";
-      Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
+      Map<String, String> contextParams = (Map<String, String>)dep.getProperty(Constants.STACK_CONTEXT_PARAMS);
       if (contextParams == null)
       {
          // if there's no associated map with the property create it now
          contextParams = new HashMap<String, String>();
-         dep.setProperty(propKey, contextParams);
+         dep.setProperty(Constants.STACK_CONTEXT_PARAMS, contextParams);
       }
       // put sun jaxws config URL to the property map
       contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, jaxwsConfigURL.toExternalForm());

Modified: stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java	2009-07-27 08:21:15 UTC (rev 10387)
+++ stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java	2009-07-27 08:28:25 UTC (rev 10388)
@@ -33,6 +33,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.common.integration.Constants;
 import org.jboss.wsf.spi.deployment.ArchiveDeployment;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -142,7 +143,7 @@
    private URL getDDUrlFromContext(Deployment deployment) throws MalformedURLException
    {
       Map<String, String> contextProperties =
-        (Map<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap");
+        (Map<String, String>)deployment.getProperty(Constants.STACK_CONTEXT_PARAMS);
 
       return new URL(contextProperties.get(PARAM_SUN_JAXWS_URL));
    }

Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml	2009-07-27 08:21:15 UTC (rev 10387)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml	2009-07-27 08:28:25 UTC (rev 10388)
@@ -30,7 +30,8 @@
     <property name="provides">ContextProperties</property>
     <property name="contextProperties">
       <map keyClass="java.lang.String" valueClass="java.lang.String">
-        <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
+        <entry><key>org.jboss.wsf.common.integration.Constants.StackTransportClass</key>
+        <value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
       </map>
     </property>
     <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->