[jboss-cvs] JBossAS SVN: r100146 - trunk/server/src/main/java/org/jboss/deployment.

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

Author: thomas.diesler at jboss.com
Date: 2010-01-29 17:59:14 -0500 (Fri, 29 Jan 2010)
New Revision: 100146

Modified:
   trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java
Log:
OSGi bundle deployments are metadata-complete

Modified: trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java	2010-01-29 21:15:51 UTC (rev 100145)
+++ trunk/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java	2010-01-29 22:59:14 UTC (rev 100146)
@@ -110,8 +110,7 @@
     * @param unit the unit
     * @throws DeploymentException for any error
     */
-   protected void deploy(VFSDeploymentUnit unit)
-      throws DeploymentException
+   protected void deploy(VFSDeploymentUnit unit) throws DeploymentException
    {
       /* Ignore any spec metadata complete deployments. This expects that a
        deployment unit only represents one of the client, ejb or web
@@ -129,6 +128,7 @@
          // Any ejb-jar.xml 2.1 or earlier deployment is metadata complete
          isComplete = true;         
       }
+      
       WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
       if(webMetaData != null)
       {
@@ -146,19 +146,28 @@
             isComplete = true;
          }
       }
+      
       ApplicationClientMetaData clientMetaData = unit.getAttachment(ApplicationClientMetaData.class);
       if(clientMetaData != null)
          isComplete |= clientMetaData.isMetadataComplete();
+      
+      // OSGi bundle deployments are metadata-complete
+      // [TODO] Replace with a check for OSGiMetaData once this becomes generally available in AS
+      String symbolicName = (String) unit.getAttachment("org.jboss.osgi.bundle.symbolic.name");
+  	  isComplete |= (symbolicName != null); 
+      
       if(isComplete)
       {
          log.debug("Deployment is metadata-complete, skipping annotation processing"
                + ", ejbJarMetaData="+ejbJarMetaData
                + ", jbossWebMetaData="+webMetaData
                + ", jbossClientMetaData="+clientMetaData
+               + ", bundleSymbolicName="+symbolicName
                + ", metaDataCompleteIsDefault="+metaDataCompleteIsDefault
                );
          return;
       }
+      
       VirtualFile root = unit.getRoot();
       boolean isLeaf = true;
       try