[jboss-cvs] JBossAS SVN: r66526 - 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-29 05:44:42 -0400 (Mon, 29 Oct 2007)
New Revision: 66526

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java
Log:
Remove invalid usage of WebMetaData

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-29 07:54:06 UTC (rev 66525)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java	2007-10-29 09:44:42 UTC (rev 66526)
@@ -23,6 +23,11 @@
 
 // $Id: JSEArchiveMetaDataAdapter.java 4013 2007-07-27 04:37:52Z thomas.diesler at jboss.com $
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
 import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
@@ -35,18 +40,14 @@
 import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
 import org.jboss.metadata.web.spec.ServletMetaData;
-import org.jboss.metadata.web.spec.ServletsMetaData;
-import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
 import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter;
 import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter;
 import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection;
 
-import java.util.*;
-
 /**
  * Build container independent web meta data
  *
@@ -59,11 +60,8 @@
    {
       String contextRoot = null;
       
-      WebMetaData specmd = unit.getAttachment(WebMetaData.class);
-      dep.addAttachment(WebMetaData.class, specmd);
-      
-      JBossWebMetaData wmd = unit.getAttachment(JBossWebMetaData.class);
-      dep.addAttachment(JBossWebMetaData.class, wmd);
+      JBossWebMetaData jbossWebMetaData = unit.getAttachment(JBossWebMetaData.class);
+      dep.addAttachment(JBossWebMetaData.class, jbossWebMetaData);
 
       if (unit.getParent() != null)
       {
@@ -80,27 +78,27 @@
       }
       
       if (contextRoot == null)
-         contextRoot = wmd.getContextRoot();
+         contextRoot = jbossWebMetaData.getContextRoot();
       
       JSEArchiveMetaData umd = new JSEArchiveMetaData();
       umd.setContextRoot(contextRoot);
-      umd.setServletMappings(getServletMappings(wmd));
-      umd.setServletClassNames(getServletClassMap(wmd));
-      umd.setSecurityDomain(wmd.getSecurityDomain());
-      umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
-      umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
+      umd.setServletMappings(getServletMappings(jbossWebMetaData));
+      umd.setServletClassNames(getServletClassMap(jbossWebMetaData));
+      umd.setSecurityDomain(jbossWebMetaData.getSecurityDomain());
+      umd.setPublishLocationAdapter(getPublishLocationAdpater(jbossWebMetaData));
+      umd.setSecurityMetaData(getSecurityMetaData(jbossWebMetaData.getSecurityContraints()));
 
-      setConfigNameAndFile(umd, wmd, specmd);
+      setConfigNameAndFile(umd, jbossWebMetaData);
       
       return umd;
    }
 
-   private void setConfigNameAndFile(JSEArchiveMetaData umd, JBossWebMetaData wmd, WebMetaData specmd)
+   private void setConfigNameAndFile(JSEArchiveMetaData umd, JBossWebMetaData jbossWebMetaData)
    {
-      String configName = wmd.getConfigName();
-      String configFile = wmd.getConfigFile();
+      String configName = jbossWebMetaData.getConfigName();
+      String configFile = jbossWebMetaData.getConfigFile();
       
-      List<ParamValueMetaData> contextParams = specmd.getContextParams();
+      List<ParamValueMetaData> contextParams = jbossWebMetaData.getContextParams();
       if (contextParams != null)
       {
          for (ParamValueMetaData ctxParam : contextParams)

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java	2007-10-29 07:54:06 UTC (rev 66525)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java	2007-10-29 09:44:42 UTC (rev 66526)
@@ -28,9 +28,9 @@
 import java.util.Map;
 
 import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.ListenerMetaData;
 import org.jboss.metadata.web.spec.ServletMetaData;
-import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 import org.jboss.wsf.spi.deployment.Endpoint;
@@ -66,7 +66,7 @@
 
    private void modifyServletClass(Deployment dep, String servletClass)
    {
-      WebMetaData webMetaData = dep.getAttachment(WebMetaData.class);
+      JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class);
       if (webMetaData != null)
       {
          for (ServletMetaData servlet : webMetaData.getServlets())
@@ -101,7 +101,7 @@
 
    private void modifyListener(Deployment dep, String listenerClass)
    {
-      WebMetaData webMetaData = dep.getAttachment(WebMetaData.class);
+      JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class);
       if (webMetaData != null)
       {
          ListenerMetaData listener = new ListenerMetaData();
@@ -118,7 +118,7 @@
 
    private void modifyContextParams(Deployment dep, Map<String, String> newParams)
    {
-      WebMetaData webMetaData = dep.getAttachment(WebMetaData.class);
+      JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class);
       if (webMetaData != null)
       {
          for (Map.Entry<String, String> entry : newParams.entrySet())