[jboss-cvs] JBossAS SVN: r85848 - in projects/webbeans-ri-int/trunk: jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 14 21:46:54 EDT 2009
Author: petemuir
Date: 2009-03-14 21:46:54 -0400 (Sat, 14 Mar 2009)
New Revision: 85848
Removed:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/plugins/JBossEjbDiscoveryVDFConnector.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbDiscovery.java
Modified:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
Log:
WBRI-175, WBRI-178
Deleted: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -1,88 +0,0 @@
-package org.jboss.webbeans.integration.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
-import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.webbeans.integration.vdf.DeploymentUnitAware;
-
-/**
- * EjbDiscoveryEnvironment.
- *
- * @author <a href="mailto:alr at jboss.com">ALR</a>
- * @author Pete Muir
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class JBossEjbDiscovery implements EjbDiscovery, DeploymentUnitAware
-{
- private EjbReferenceResolver resolver;
- private List<EjbDescriptor<?>> ejbs = new ArrayList<EjbDescriptor<?>>();
-
- public void setResolver(EjbReferenceResolver resolver)
- {
- this.resolver = resolver;
- }
-
- /**
- * Initialize.
- *
- * @param du the deployment unit
- */
- public void setDeploymentUnit(DeploymentUnit du)
- {
- if (du == null)
- throw new IllegalArgumentException("Null deployment unit.");
-
- discoverEjbs(du.getTopLevel());
- }
-
- /**
- * Discover ejbs.
- *
- * @param du the deployment unit
- */
- protected void discoverEjbs(DeploymentUnit du)
- {
- // 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())
- {
- for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : du.getAttachment(JBossMetaData.class).getEnterpriseBeans())
- {
- if (enterpriseBeanMetaData.isSession())
- {
- JBossSessionBeanMetaData sessionBeanMetaData = (JBossSessionBeanMetaData) enterpriseBeanMetaData;
- EjbDescriptor<?> ejbDescriptor = new JBossSessionBeanDescriptorAdaptor<Object>(sessionBeanMetaData, du, resolver);
- ejbs.add(ejbDescriptor);
- }
- else if (enterpriseBeanMetaData.isMessageDriven())
- {
- JBossMessageDrivenBeanMetaData messageDrivenBeanMetaData = (JBossMessageDrivenBeanMetaData) enterpriseBeanMetaData;
- EjbDescriptor<?> ejbDescriptor = new JBossMessageDrivenBeanDescriptorAdaptor<Object>(messageDrivenBeanMetaData, du, resolver);
- ejbs.add(ejbDescriptor);
- }
- }
- }
-
- List<DeploymentUnit> children = du.getChildren();
- if (children != null && children.isEmpty() == false)
- {
- for (DeploymentUnit childDu : children)
- {
- discoverEjbs(childDu);
- }
- }
- }
-
- public Iterable<EjbDescriptor<?>> discoverEjbs()
- {
- return ejbs;
- }
-}
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -3,6 +3,8 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Resource;
import javax.ejb.EJB;
@@ -17,7 +19,10 @@
import org.jboss.jpa.deployment.PersistenceUnitDeployment;
import org.jboss.jpa.injection.InjectedEntityManagerFactory;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webbeans.ejb.spi.EjbDescriptor;
import org.jboss.webbeans.ejb.spi.EjbServices;
@@ -40,6 +45,7 @@
protected EjbReferenceResolver resolver;
protected PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
protected JBossEjb jbossEjb;
+ private List<EjbDescriptor<?>> ejbs = new ArrayList<EjbDescriptor<?>>();
public void setDeploymentUnit(DeploymentUnit du)
{
@@ -47,6 +53,8 @@
throw new IllegalArgumentException("Null deployment unit.");
topLevelDeploymentUnit = du.getTopLevel();
+
+ discoverEjbs(du.getTopLevel());
}
public void setResolver(EjbReferenceResolver resolver)
@@ -227,5 +235,48 @@
String className = injectionPoint.getMember().getDeclaringClass().getName();
return RESOURCE_LOOKUP_PREFIX + "/" + className + "/" + propertyName;
}
+
+
+ /**
+ * Discover ejbs.
+ *
+ * @param du the deployment unit
+ */
+ protected void discoverEjbs(DeploymentUnit du)
+ {
+ // 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())
+ {
+ for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : du.getAttachment(JBossMetaData.class).getEnterpriseBeans())
+ {
+ if (enterpriseBeanMetaData.isSession())
+ {
+ JBossSessionBeanMetaData sessionBeanMetaData = (JBossSessionBeanMetaData) enterpriseBeanMetaData;
+ EjbDescriptor<?> ejbDescriptor = new JBossSessionBeanDescriptorAdaptor<Object>(sessionBeanMetaData, du, resolver);
+ ejbs.add(ejbDescriptor);
+ }
+ else if (enterpriseBeanMetaData.isMessageDriven())
+ {
+ JBossMessageDrivenBeanMetaData messageDrivenBeanMetaData = (JBossMessageDrivenBeanMetaData) enterpriseBeanMetaData;
+ EjbDescriptor<?> ejbDescriptor = new JBossMessageDrivenBeanDescriptorAdaptor<Object>(messageDrivenBeanMetaData, du, resolver);
+ ejbs.add(ejbDescriptor);
+ }
+ }
+ }
+ List<DeploymentUnit> children = du.getChildren();
+ if (children != null && children.isEmpty() == false)
+ {
+ for (DeploymentUnit childDu : children)
+ {
+ discoverEjbs(childDu);
+ }
+ }
+ }
+
+ public Iterable<EjbDescriptor<?>> discoverEjbs()
+ {
+ return ejbs;
+ }
+
}
Deleted: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossEjbDiscovery.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -1,33 +0,0 @@
-package org.jboss.webbeans.integration.jbossas.bootstrap;
-
-import javax.servlet.ServletContext;
-
-import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
-import org.jboss.webbeans.bootstrap.spi.helpers.ForwardingEjbDiscovery;
-import org.jboss.webbeans.integration.jbossas.vdf.plugins.JBossEjbDiscoveryVDFConnector;
-
-/**
- * WB 2 EjbDiscovery bridge.
- *
- * @author Pete Muir
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ServletJBossEjbDiscovery extends ForwardingEjbDiscovery
-{
- private final EjbDiscovery delegate;
-
- public ServletJBossEjbDiscovery(ServletContext servletContext)
- {
- JBossEjbDiscoveryVDFConnector connector = new JBossEjbDiscoveryVDFConnector(servletContext);
- if (connector.isValid() == false)
- throw new IllegalArgumentException("No such bean: " + connector);
-
- this.delegate = connector.getUtility();
- }
-
- @Override
- public EjbDiscovery delegate()
- {
- return delegate;
- }
-}
Deleted: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/plugins/JBossEjbDiscoveryVDFConnector.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/plugins/JBossEjbDiscoveryVDFConnector.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/plugins/JBossEjbDiscoveryVDFConnector.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.webbeans.integration.jbossas.vdf.plugins;
-
-import javax.servlet.ServletContext;
-
-import org.jboss.webbeans.integration.ejb.JBossEjbDiscovery;
-import org.jboss.webbeans.integration.jbossas.vdf.AbstractBeanFactoryInitializerVDFConnector;
-
-/**
- * JBossEjbDiscoveryVDFConnector.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class JBossEjbDiscoveryVDFConnector extends AbstractBeanFactoryInitializerVDFConnector<JBossEjbDiscovery>
-{
- public JBossEjbDiscoveryVDFConnector(ServletContext servletContext)
- {
- super(servletContext);
- }
-
- protected Object getBeanKey()
- {
- return "JBossEjbDiscovery";
- }
-
- protected Class<JBossEjbDiscovery> getUnwrappedType()
- {
- return JBossEjbDiscovery.class;
- }
-}
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -58,7 +58,6 @@
String bootstrapName = unitName + "_WebBeansBootstrap";
BeanMetaDataBuilder bootstrap = BeanMetaDataBuilder.createBuilder(bootstrapName, "org.jboss.webbeans.bootstrap.WebBeansBootstrap");
bootstrap.addPropertyMetaData("webBeanDiscovery", bootstrap.createInject(envName));
- bootstrap.addPropertyMetaData("ejbDiscovery", createEjbConnector("JBossEjbDiscovery", "org.jboss.webbeans.integration.ejb.JBossEjbDiscovery", unit));
bootstrap.addPropertyMetaData("ejbServices", createEjbConnector("JBossEjbServices", "org.jboss.webbeans.integration.ejb.JBossEjbServices", unit));
bootstrap.addPropertyMetaData("transactionServices", bootstrap.createInject("JBossTransactionServices"));
bootstrap.addPropertyMetaData("applicationContext", createBeanStore());
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockBootDeployer.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -59,7 +59,6 @@
String bootstrapName = unitName + "_WebBeansBootstrap";
BeanMetaDataBuilder bootstrap = BeanMetaDataBuilder.createBuilder(bootstrapName, "org.jboss.test.webbeans.deployers.support.MockWBBootstrap");
bootstrap.addPropertyMetaData("webBeanDiscovery", bootstrap.createInject(envName));
- bootstrap.addPropertyMetaData("ejbDiscovery", createEjbConnector("JBossEjbDiscovery", "org.jboss.test.webbeans.deployers.support.MockEjbDiscovery", unit));
bootstrap.addPropertyMetaData("ejbServices", createEjbConnector("JBossEjbServices", "org.jboss.test.webbeans.deployers.support.MockEjbServices", unit));
bootstrap.addPropertyMetaData("transactionServices", bootstrap.createInject("JBossTransactionServices"));
bootstrap.addPropertyMetaData("applicationContext", createBeanStore());
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbDiscovery.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbDiscovery.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.webbeans.deployers.support;
-
-import java.util.Collections;
-
-import org.jboss.webbeans.bootstrap.spi.EjbDiscovery;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class MockEjbDiscovery implements EjbDiscovery
-{
- public void setDeploymentUnit(DeploymentUnit unit)
- {
- }
-
- public Iterable<EjbDescriptor<?>> discoverEjbs()
- {
- return Collections.emptySet();
- }
-}
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java 2009-03-15 01:46:54 UTC (rev 85848)
@@ -22,6 +22,7 @@
package org.jboss.test.webbeans.deployers.support;
import java.lang.annotation.Annotation;
+import java.util.Collections;
import javax.inject.manager.InjectionPoint;
@@ -79,6 +80,9 @@
return null;
}
+ public Iterable<EjbDescriptor<?>> discoverEjbs()
+ {
+ return Collections.emptySet();
+ }
-
}
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml 2009-03-15 00:12:52 UTC (rev 85847)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/BootDeployerTestCase.xml 2009-03-15 01:46:54 UTC (rev 85848)
@@ -13,8 +13,6 @@
<beanfactory name="JBossEjbServices" class="org.jboss.test.webbeans.deployers.support.MockEjbServices"/>
- <beanfactory name="JBossEjbDiscovery" class="org.jboss.test.webbeans.deployers.support.MockEjbDiscovery"/>
-
<bean name="JBossTransactionServices" class="org.jboss.test.webbeans.deployers.support.MockTransactionServices"/>
<bean name="RealTransactionManager" class="java.lang.Object"/>
More information about the jboss-cvs-commits
mailing list