[jboss-cvs] JBossAS SVN: r66214 - trunk/webservices/src/main/org/jboss/wsf/container/jboss50.

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

Author: thomas.diesler at jboss.com
Date: 2007-10-17 08:33:52 -0400 (Wed, 17 Oct 2007)
New Revision: 66214

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
Log:
[JBWS-1797] Setting .NET friendly Endpoint in web.xml

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java	2007-10-17 10:27:42 UTC (rev 66213)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java	2007-10-17 12:33:52 UTC (rev 66214)
@@ -29,6 +29,7 @@
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.metadata.ear.spec.ModuleMetaData;
 import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
@@ -57,11 +58,11 @@
    {
       String contextRoot = null;
       
-      WebMetaData wmd = unit.getAttachment(WebMetaData.class);
-      dep.addAttachment(WebMetaData.class, wmd);
+      WebMetaData specmd = unit.getAttachment(WebMetaData.class);
+      dep.addAttachment(WebMetaData.class, specmd);
       
-      JBossWebMetaData jbwmd = unit.getAttachment(JBossWebMetaData.class);
-      dep.addAttachment(JBossWebMetaData.class, jbwmd);
+      JBossWebMetaData wmd = unit.getAttachment(JBossWebMetaData.class);
+      dep.addAttachment(JBossWebMetaData.class, wmd);
 
       if (unit.getParent() != null)
       {
@@ -78,21 +79,42 @@
       }
       
       if (contextRoot == null)
-         contextRoot = jbwmd.getContextRoot();
+         contextRoot = wmd.getContextRoot();
       
       JSEArchiveMetaData umd = new JSEArchiveMetaData();
       umd.setContextRoot(contextRoot);
-      umd.setServletMappings(getServletMappings(jbwmd));
-      umd.setServletClassNames(getServletClassMap(jbwmd));
-      umd.setConfigName(jbwmd.getConfigName());
-      umd.setConfigFile(jbwmd.getConfigFile());
-      umd.setSecurityDomain(jbwmd.getSecurityDomain());
-      umd.setPublishLocationAdapter(getPublishLocationAdpater(jbwmd));
-      umd.setSecurityMetaData(getSecurityMetaData(jbwmd.getSecurityContraints()));
+      umd.setServletMappings(getServletMappings(wmd));
+      umd.setServletClassNames(getServletClassMap(wmd));
+      umd.setSecurityDomain(wmd.getSecurityDomain());
+      umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
+      umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
 
+      setConfigNameAndFile(umd, wmd, specmd);
+      
       return umd;
    }
 
+   private void setConfigNameAndFile(JSEArchiveMetaData umd, JBossWebMetaData wmd, WebMetaData specmd)
+   {
+      String configName = wmd.getConfigName();
+      String configFile = wmd.getConfigFile();
+      
+      List<ParamValueMetaData> contextParams = specmd.getContextParams();
+      if (contextParams != null)
+      {
+         for (ParamValueMetaData ctxParam : contextParams)
+         {
+            if (ctxParam.getParamName().equals("jbossws-config-name"))
+               configName = ctxParam.getParamValue();
+            if (ctxParam.getParamName().equals("jbossws-config-file"))
+               configFile = ctxParam.getParamValue();
+         }
+      }
+      
+      umd.setConfigName(configName);
+      umd.setConfigFile(configFile);
+   }
+
    private PublishLocationAdapter getPublishLocationAdpater(final JBossWebMetaData wmd)
    {
       return new PublishLocationAdapter()