[jboss-cvs] JBossAS SVN: r94644 - branches/Branch_5_x/server/src/main/org/jboss/deployment.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-10 17:45:59 -0400 (Sat, 10 Oct 2009)
New Revision: 94644

Modified:
   branches/Branch_5_x/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java
Log:
[JBAS-7322] Disable Tomcat deployment for OSGi webapps

Modified: branches/Branch_5_x/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java
===================================================================
--- branches/Branch_5_x/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java	2009-10-10 21:43:48 UTC (rev 94643)
+++ branches/Branch_5_x/server/src/main/org/jboss/deployment/LegacyWebXmlLessDeployer.java	2009-10-10 21:45:59 UTC (rev 94644)
@@ -56,6 +56,15 @@
          if (unit instanceof VFSDeploymentUnit == false)
             return;
 
+         // Detect and ignore OSGi WAR deployments
+         // FIXME Use typed OSGiMetaData when we have it available at runtime
+         String bundleSymbolicName = (String) unit.getAttachment("org.jboss.osgi.bundle.symbolic.name");
+         if (bundleSymbolicName != null)
+         {
+            log.debug("Ignore OSGi webapp: " + bundleSymbolicName);
+       	    return;
+         }
+         
          log.debug("Web archive doesn't contain web.xml: " + unit.getName());
          unit.getTransientManagedObjects().addAttachment(JBossWebMetaData.class, new JBossWebMetaData());
       }