[jboss-cvs] JBossAS SVN: r66761 - 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-06 04:54:34 -0500 (Tue, 06 Nov 2007)
New Revision: 66761

Modified:
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
Log:
Workaround for [JBAS-4940]

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-06 09:37:38 UTC (rev 66760)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java	2007-11-06 09:54:34 UTC (rev 66761)
@@ -23,13 +23,19 @@
 
 //$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
@@ -43,6 +49,21 @@
    {
       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();
+         if (unit.getName().contains(tempDir))
+            isGenerated = true;
+      }
+      catch (Exception ex)
+      {
+         // ignore
+      }
+      
       return isGenerated == false && webMetaData != null;
    }