[jboss-cvs] JBossAS SVN: r68826 - branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42.

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

Author: richard.opalka at jboss.com
Date: 2008-01-10 10:50:05 -0500 (Thu, 10 Jan 2008)
New Revision: 68826

Modified:
   branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java
Log:
[JBWS-1797] enabling loading of context-params for JAX-WS endpoints only

Modified: branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java
===================================================================
--- branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java	2008-01-10 15:20:36 UTC (rev 68825)
+++ branches/Branch_4_2/webservices/src/main/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java	2008-01-10 15:50:05 UTC (rev 68826)
@@ -81,17 +81,28 @@
       webMetaData.setServletClassNames(getServletClassMap(wmd));
       webMetaData.setConfigName(wmd.getConfigName());
       webMetaData.setConfigFile(wmd.getConfigFile());
-      Map contextParams = wmd.getContextParams();
-      if (contextParams.containsKey("jbossws-config-name"))
-         webMetaData.setConfigName((String)contextParams.get("jbossws-config-name"));
-      if (contextParams.containsKey("jbossws-config-file"))
-         webMetaData.setConfigFile((String)contextParams.get("jbossws-config-file"));
       webMetaData.setSecurityDomain(wmd.getSecurityDomain());
       webMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
       webMetaData.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
+
+      processContextParams(dep, wmd.getContextParams(), webMetaData);      
       
       return webMetaData;
    }
+   
+   private void processContextParams(Deployment dep, Map contextParams, JSEArchiveMetaData webMetaData)
+   {
+      boolean isJaxwsJSEDeployment = dep.getType() == Deployment.DeploymentType.JAXWS_JSE;
+      boolean isJaxwsEJB3Deployment = dep.getType() == Deployment.DeploymentType.JAXWS_EJB3;
+      if (isJaxwsJSEDeployment || isJaxwsEJB3Deployment)
+      {
+         // WSDL is generated for JAX-WS endpoints thus do this stuff for JAX-WS endpoints only
+         if (contextParams.containsKey("jbossws-config-name"))
+            webMetaData.setConfigName((String)contextParams.get("jbossws-config-name"));
+         if (contextParams.containsKey("jbossws-config-file"))
+            webMetaData.setConfigFile((String)contextParams.get("jbossws-config-file"));
+      }
+   }
 
    private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
    {