[jboss-cvs] JBossAS SVN: r82513 - projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 23 06:22:38 EST 2008
Author: alesj
Date: 2008-12-23 06:22:38 -0500 (Tue, 23 Dec 2008)
New Revision: 82513
Modified:
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java
Log:
Remove locator hack.
Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java 2008-12-23 11:18:17 UTC (rev 82512)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java 2008-12-23 11:22:38 UTC (rev 82513)
@@ -11,7 +11,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
-import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -60,18 +59,16 @@
return ejbs;
}
- /**
- * Discover ejbs.
+ /*
+ * Look through all EJB3 DeploymentUnits
*/
protected void discoverEjbs()
{
- /*
- * Look through all EJB3 DeploymentUnits
- */
-
// Get at the MainDeployer
- Object mainDeployer = Ejb3RegistrarLocator.locateRegistrar().lookup(MC_BEAN_NAME_MAIN_DEPLOYER);
- assert mainDeployer instanceof DeployerClient && mainDeployer instanceof MainDeployerStructure : "Obtained Main Deployer is not of expected type";
+ Object mainDeployer = lookup(MC_BEAN_NAME_MAIN_DEPLOYER, true);
+ if (mainDeployer instanceof DeployerClient == false || mainDeployer instanceof MainDeployerStructure == false)
+ throw new IllegalArgumentException("Obtained Main Deployer is not of expected type");
+
DeployerClient dc = (DeployerClient) mainDeployer;
MainDeployerStructure mds = (MainDeployerStructure) mainDeployer;
@@ -94,21 +91,18 @@
// Ensure it's an EJB3 DU (by looking for the processed metadata)
if (du.getAttachment(AttachmentNames.PROCESSED_METADATA, JBossMetaData.class) != null && du.getAttachment(JBossMetaData.class).isEJB3x())
{
- //log.trace("EJB metadata for " + du.toString());
for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : du.getAttachment(JBossMetaData.class).getEnterpriseBeans())
{
if (enterpriseBeanMetaData.isSession())
{
JBossSessionBeanMetaData sessionBeanMetaData = (JBossSessionBeanMetaData) enterpriseBeanMetaData;
EjbDescriptor<?> ejbDescriptor = new JBossSessionBeanDescriptorAdaptor<Object>(sessionBeanMetaData, du, resolver);
- //log.trace(ejbDescriptor.toString());
ejbs.add(ejbDescriptor);
}
else if (enterpriseBeanMetaData.isMessageDriven())
{
JBossMessageDrivenBeanMetaData messageDrivenBeanMetaData = (JBossMessageDrivenBeanMetaData) enterpriseBeanMetaData;
EjbDescriptor<?> ejbDescriptor = new JBossMessageDrivenBeanDescriptorAdaptor<Object>(messageDrivenBeanMetaData, du, resolver);
- //log.trace(ejbDescriptor.toString());
ejbs.add(ejbDescriptor);
}
}
More information about the jboss-cvs-commits
mailing list