[jboss-cvs] JBossAS SVN: r82733 - projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata.

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

Author: alesj
Date: 2009-01-09 09:21:03 -0500 (Fri, 09 Jan 2009)
New Revision: 82733

Modified:
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
Log:
Use better deployer helper.

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-01-09 13:26:36 UTC (rev 82732)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-01-09 14:21:03 UTC (rev 82733)
@@ -23,7 +23,6 @@
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.metadata.ejb.jboss.JBossAssemblyDescriptorMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
@@ -34,6 +33,7 @@
 import org.jboss.metadata.ejb.spec.InterceptorClassesMetaData;
 import org.jboss.metadata.ejb.spec.InterceptorMetaData;
 import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
+import org.jboss.virtual.VirtualFile;
 import org.jboss.webbeans.integration.microcontainer.deployer.DeployersUtils;
 
 /**
@@ -42,19 +42,19 @@
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
 @SuppressWarnings("deprecation")
-public class WBEjbInterceptorMetadataDeployer extends AbstractVFSRealDeployer
+public class WBEjbInterceptorMetadataDeployer extends WebBeansAwareMetadataDeployer<JBossMetaData>
 {
    private static final String INTERCEPTOR_CLASS_NAME = "org.jboss.webbeans.ejb.SessionBeanInterceptor";
-   
+
    private InterceptorMetaData SBI;
    private InterceptorBindingMetaData IBMD;
 
    public WBEjbInterceptorMetadataDeployer()
    {
-      addInput(JBossMetaData.class);
-      addOutput(JBossMetaData.class);
+      super(JBossMetaData.class);
+      
       addInput(DeployersUtils.WEB_BEANS_FILES);
-      addInput("merged." + JBossMetaData.class.getName()); 
+      addInput("merged." + JBossMetaData.class.getName());
       setStage(DeploymentStages.POST_CLASSLOADER);
 
       // create interceptor metadata instance
@@ -69,39 +69,35 @@
       IBMD.setEjbName("*");
    }
 
-   public void deploy(VFSDeploymentUnit unit) throws DeploymentException
+   protected void internalDeploy(VFSDeploymentUnit unit, JBossMetaData jbmd, VirtualFile wbXml) throws DeploymentException
    {
-      JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class);
-      if (jbmd != null && unit.getMetaDataFile("web-beans.xml") != null)
+      InterceptorsMetaData interceptors = jbmd.getInterceptors();
+      if (interceptors == null)
       {
-         InterceptorsMetaData interceptors = jbmd.getInterceptors();
-         if (interceptors == null)
-         {
-            InterceptorsMetaData imd = new InterceptorsMetaData();
-            imd.add(SBI);
-            EjbJar3xMetaData ejmd = new EjbJar30MetaData();
-            ejmd.setInterceptors(imd);
-            
-            jbmd.merge(null, ejmd);
-         }
-         else
-         {
-            interceptors.add(SBI); // clone?
-         }
-         
-         JBossAssemblyDescriptorMetaData assemblyDescriptor = jbmd.getAssemblyDescriptor();
-         if (assemblyDescriptor == null)
-         {
-            assemblyDescriptor = new JBossAssemblyDescriptorMetaData();
-            jbmd.setAssemblyDescriptor(assemblyDescriptor);
-         }
-         InterceptorBindingsMetaData interceptorBindings = assemblyDescriptor.getInterceptorBindings();
-         if (interceptorBindings == null)
-         {
-            interceptorBindings = new InterceptorBindingsMetaData();
-            assemblyDescriptor.setInterceptorBindings(interceptorBindings);
-         }
-         interceptorBindings.add(IBMD); // clone?
+         InterceptorsMetaData imd = new InterceptorsMetaData();
+         imd.add(SBI);
+         EjbJar3xMetaData ejmd = new EjbJar30MetaData();
+         ejmd.setInterceptors(imd);
+
+         jbmd.merge(null, ejmd);
       }
+      else
+      {
+         interceptors.add(SBI); // clone?
+      }
+
+      JBossAssemblyDescriptorMetaData assemblyDescriptor = jbmd.getAssemblyDescriptor();
+      if (assemblyDescriptor == null)
+      {
+         assemblyDescriptor = new JBossAssemblyDescriptorMetaData();
+         jbmd.setAssemblyDescriptor(assemblyDescriptor);
+      }
+      InterceptorBindingsMetaData interceptorBindings = assemblyDescriptor.getInterceptorBindings();
+      if (interceptorBindings == null)
+      {
+         interceptorBindings = new InterceptorBindingsMetaData();
+         assemblyDescriptor.setInterceptorBindings(interceptorBindings);
+      }
+      interceptorBindings.add(IBMD); // clone?
    }
 }
\ No newline at end of file