[jboss-cvs] JBossAS SVN: r92896 - in projects/webbeans-ri-int/trunk: deployer/src/test/java/org/jboss/test/deployers/test and 1 other directories.

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

Author: pete.muir at jboss.org
Date: 2009-08-27 19:09:04 -0400 (Thu, 27 Aug 2009)
New Revision: 92896

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
   projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEJBDescriptorAdaptor.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java
Log:
WBRI-329, big improvement to the way we track enterprise beans

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-08-27 21:10:49 UTC (rev 92895)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-08-27 23:09:04 UTC (rev 92896)
@@ -44,7 +44,7 @@
 @SuppressWarnings("deprecation")
 public class WBEjbInterceptorMetadataDeployer extends WebBeansAwareMetadataDeployer<JBossMetaData>
 {
-   private static final String INTERCEPTOR_CLASS_NAME = "org.jboss.webbeans.ejb.SessionBeanInterceptor";
+   public static final String INTERCEPTOR_CLASS_NAME = "org.jboss.webbeans.integration.ejb.SessionBeanInterceptor";
 
    private InterceptorMetaData SBI;
    private InterceptorBindingMetaData IBMD;

Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java	2009-08-27 21:10:49 UTC (rev 92895)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java	2009-08-27 23:09:04 UTC (rev 92896)
@@ -37,6 +37,7 @@
 import org.jboss.metadata.web.spec.ListenerMetaData;
 import org.jboss.virtual.AssembledDirectory;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.webbeans.integration.deployer.metadata.WBEjbInterceptorMetadataDeployer;
 
 /**
  * Test post deployers.
@@ -179,7 +180,7 @@
       assertNotNull(ejbmd);
       InterceptorsMetaData interceptors = ejbmd.getInterceptors();
       assertNotNull(interceptors);
-      InterceptorMetaData imd = interceptors.get("org.jboss.webbeans.ejb.SessionBeanInterceptor");
+      InterceptorMetaData imd = interceptors.get(WBEjbInterceptorMetadataDeployer.INTERCEPTOR_CLASS_NAME);
       assertNotNull(imd);
    }
 

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEJBDescriptorAdaptor.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEJBDescriptorAdaptor.java	2009-08-27 21:10:49 UTC (rev 92895)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEJBDescriptorAdaptor.java	2009-08-27 23:09:04 UTC (rev 92896)
@@ -67,9 +67,9 @@
    @Override
    public boolean equals(Object other)
    {
-      if (other instanceof JBossEJBDescriptorAdaptor)
+      if (other instanceof EjbDescriptor<?>)
       {
-         JBossEJBDescriptorAdaptor<T> that = (JBossEJBDescriptorAdaptor<T>) other;
+         EjbDescriptor<?> that = (EjbDescriptor<?>) other;
          return this.getEjbName().equals(that.getEjbName());
       }
       else

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java	2009-08-27 21:10:49 UTC (rev 92895)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java	2009-08-27 23:09:04 UTC (rev 92896)
@@ -27,6 +27,8 @@
    private final DeploymentUnit deploymentUnit;
    private final String ejbClassName;
    private final String jndiName;
+   
+   boolean removed = false;
     
    public JBossSessionObjectReference(EjbDescriptor<?> descriptor, Context context) throws NamingException
    {
@@ -54,7 +56,8 @@
    
    public void remove()
    {
-      getEndpoint().getSessionFactory().destroySession(id);      
+      getEndpoint().getSessionFactory().destroySession(id);
+      removed = true;
    }
    
    private Endpoint getEndpoint()
@@ -68,6 +71,12 @@
       return registrar.lookup(endpointMcBindName, Endpoint.class);
    }
    
+   public boolean isRemoved()
+   {
+      // TODO Doesn't account for the case the EJB container removes the EJB without WB!
+      return removed;
+   }
+   
    @Override
    public String toString()
    {