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

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

Author: thomas.diesler at jboss.com
Date: 2007-11-09 12:10:25 -0500 (Fri, 09 Nov 2007)
New Revision: 66928

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
Log:
[JBWS-4940] Deployment.types not propagated

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java	2007-11-09 17:08:59 UTC (rev 66927)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java	2007-11-09 17:10:25 UTC (rev 66928)
@@ -23,19 +23,13 @@
 
 //$Id: AbstractDeployerHookJSE.java 3772 2007-07-01 19:29:13Z thomas.diesler at jboss.com $
 
-import java.io.File;
-import java.io.IOException;
 import java.util.List;
 
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.metadata.javaee.spec.ParamValueMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.ServletMetaData;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
 
 /**
  * An abstract deployer for JSE Endpoints
@@ -48,25 +42,8 @@
    public boolean isWebServiceDeployment(DeploymentUnit unit)
    {
       JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
-      boolean isGenerated = unit.getTypes().contains(WebAppDesciptorModifier.PROPERTY_GENERATED_WEBAPP);
-      
-      // Workaround for [JBAS-4940] Deployment.types not propagated
-      try
-      {
-         SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-         ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
-         String tempDir = serverConfig.getServerTempDir().getCanonicalPath();
-         
-         String depName = unit.getName();
-         if (depName.contains(tempDir) && !depName.contains(tempDir + "/jsr88"))
-            isGenerated = true;
-      }
-      catch (Exception ex)
-      {
-         // ignore
-      }
-      
-      return isGenerated == false && webMetaData != null;
+      boolean isGenerated = Boolean.TRUE.equals(unit.getAttachment(WebAppDesciptorModifier.PROPERTY_GENERATED_WEBAPP));
+      return webMetaData != null && isGenerated == false;
    }
 
    protected String getTargetBean(ServletMetaData servlet)

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java	2007-11-09 17:08:59 UTC (rev 66927)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java	2007-11-09 17:10:25 UTC (rev 66928)
@@ -25,11 +25,10 @@
 
 import java.net.URL;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
 import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
 import org.jboss.logging.Logger;
 import org.jboss.virtual.VFS;
@@ -75,15 +74,9 @@
          webXMLRewriter.rewriteWebXml(dep);
          org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(warURL);
          
-         // Mark the deployment as generated web app 
-         // so the JSE deployer hook can ignore it 
-         Set<String> types = deployment.getTypes();
-         if (types == null)
-         {
-            types = new HashSet<String>();
-            deployment.setTypes(types);
-         }
-         types.add(WebAppDesciptorModifier.PROPERTY_GENERATED_WEBAPP);
+         // Mark the deployment as generated web app so the JSE deployer hook can ignore it 
+         MutableAttachments attach = (MutableAttachments)deployment.getPredeterminedManagedObjects();
+         attach.addAttachment(WebAppDesciptorModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
 
          mainDeployer.deploy(deployment);