[jboss-cvs] JBossAS SVN: r109351 - in trunk: server/src/etc/deployers and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 16 23:15:43 EST 2010
Author: jaikiran
Date: 2010-11-16 23:15:43 -0500 (Tue, 16 Nov 2010)
New Revision: 109351
Modified:
trunk/component-matrix/pom.xml
trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
trunk/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
JBAS-8548 (1) Disable EJB resource provider till we have a fix for dependency issue (2) Upgrade to latest switchboard and jboss-injection to bring in some bug fixes (3) Fix some failing tests
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-11-16 18:37:06 UTC (rev 109350)
+++ trunk/component-matrix/pom.xml 2010-11-17 04:15:43 UTC (rev 109351)
@@ -49,7 +49,7 @@
<version.javax.faces>2.0.3-b05</version.javax.faces>
<version.javax.validation>1.0.0.GA</version.javax.validation>
<version.jaxws-httpserver-httpspi>1.0.0.GA</version.jaxws-httpserver-httpspi>
- <version.jboss.injection>1.0.0-alpha-2</version.jboss.injection>
+ <version.jboss.injection>1.0.0-alpha-3</version.jboss.injection>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.13.1.Final</version.jboss.jbossts>
<version.jboss.jbossws-native>3.4.0.CR3</version.jboss.jbossws-native>
@@ -85,7 +85,7 @@
<version.org.jboss.cluster.cache.ispn>1.0.0.CR7</version.org.jboss.cluster.cache.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-alpha-19</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-20</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -113,7 +113,7 @@
<version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
<version.org.jboss.metadata.common>2.0.0.Alpha19</version.org.jboss.metadata.common>
<version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
- <version.org.jboss.metadata.ejb>2.0.0-alpha-23</version.org.jboss.metadata.ejb>
+ <version.org.jboss.metadata.ejb>2.0.0-alpha-22</version.org.jboss.metadata.ejb>
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
<version.org.jboss.metadata.war>2.0.0.Alpha15</version.org.jboss.metadata.war>
<version.org.jboss.mod_cluster>1.1.0.Final</version.org.jboss.mod_cluster>
@@ -133,7 +133,7 @@
<version.org.jboss.shrinkwrap>1.0.0-alpha-11</version.org.jboss.shrinkwrap>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
<version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
- <version.org.jboss.switchboard.depchain>1.0.0-alpha-8</version.org.jboss.switchboard.depchain>
+ <version.org.jboss.switchboard.depchain>1.0.0-alpha-9</version.org.jboss.switchboard.depchain>
<version.org.jboss.threads>2.0.0.CR7</version.org.jboss.threads>
<version.org.jboss.threads-metadata>2.0.0.CR4</version.org.jboss.threads-metadata>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
Modified: trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-16 18:37:06 UTC (rev 109350)
+++ trunk/server/src/etc/deployers/switchboard-clustered-jboss-beans.xml 2010-11-17 04:15:43 UTC (rev 109351)
@@ -5,11 +5,12 @@
<bean name="org.jboss.switchboard.WebEnvironmentSwitchBoardDeployer" class="org.jboss.switchboard.mc.deployer.WebEnvironmentSwitchBoardDeployer">
<constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
</bean>
-
+ <!-- Disabled till we have EJB3 containers integrated with switchboard
<bean name="org.jboss.switchboard.EJBEnvironmentSwitchBoardDeployer" class="org.jboss.switchboard.mc.deployer.EJBEnvironmentSwitchBoardDeployer">
<constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
</bean>
-
+ -->
+
<!-- Resource providers -->
<!-- processes env-entry resources (EE.5.4 of Java EE6 spec) -->
@@ -58,9 +59,11 @@
<inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
<inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
<inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
+ <!-- Disabled till we resolve the transient failures with EJB jndi dependencies
<inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
<inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
+ -->
<!-- Disabled till container themselves stop binding into java:comp
<inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-16 18:37:06 UTC (rev 109350)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-11-17 04:15:43 UTC (rev 109351)
@@ -5,11 +5,12 @@
<bean name="org.jboss.switchboard.WebEnvironmentSwitchBoardDeployer" class="org.jboss.switchboard.mc.deployer.WebEnvironmentSwitchBoardDeployer">
<constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
</bean>
-
+ <!-- Disabled till we have EJB3 containers integrated with switchboard
<bean name="org.jboss.switchboard.EJBEnvironmentSwitchBoardDeployer" class="org.jboss.switchboard.mc.deployer.EJBEnvironmentSwitchBoardDeployer">
<constructor><parameter class="org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer"><inject/></parameter></constructor>
</bean>
-
+ -->
+
<!-- Resource providers -->
<!-- processes env-entry resources (EE.5.4 of Java EE6 spec) -->
@@ -54,9 +55,11 @@
<inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
<inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
<inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
+ <!-- Disabled till we resolve the transient failures with EJB jndi dependencies
<inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
<inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
+ -->
<!-- Disabled till container themselves stop binding into java:comp
<inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
-->
Modified: trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-11-16 18:37:06 UTC (rev 109350)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-11-17 04:15:43 UTC (rev 109351)
@@ -52,6 +52,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerInternals;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.ejb3.ejbref.resolver.spi.EjbReference;
import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
import org.jboss.injection.injector.metadata.EnvironmentEntryType;
import org.jboss.injection.injector.metadata.InjectionTargetType;
@@ -73,7 +74,13 @@
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.Environment;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
@@ -791,6 +798,63 @@
}
}
+ // TODO: We haven't yet integrated PU/PC and EJB reference providers in SwitchBoard.
+ // The following sections will be removed after the RPs are made available
+
+ // JBAS-6795 Add dependency on PersistenceUnit references
+ PersistenceUnitReferencesMetaData puRefs = metaData.getPersistenceUnitRefs();
+ if (puRefs != null)
+ {
+ for (PersistenceUnitReferenceMetaData puRef : metaData.getPersistenceUnitRefs())
+ {
+ // TODO: this is a duplication of the logic in PersistenceUnitHandler
+ String persistenceUnitName = puRef.getPersistenceUnitName();
+ String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
+ ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
+ sdmd.setIDependOn(beanName);
+ dependencies.add(sdmd);
+ }
+ }
+
+ // JBAS-6795 Add dependency on PersistenceContext references
+ PersistenceContextReferencesMetaData pcRefs = metaData.getPersistenceContextRefs();
+ if (pcRefs != null)
+ {
+ for (PersistenceContextReferenceMetaData pcRef : metaData.getPersistenceContextRefs())
+ {
+ // TODO: this is a duplication of the logic in PersistenceContextHandler
+ String persistenceUnitName = pcRef.getPersistenceUnitName();
+ String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
+ ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
+ sdmd.setIDependOn(beanName);
+ dependencies.add(sdmd);
+ }
+ }
+
+ // JBAS-8406 Add dependency on @EJB(s). This is a bit of duplicacy, since the TomcatInjectionContainer
+ // through various handler would also do the same. But since the TomcatInjectionContainer comes too late
+ // in the picture and since we already have similar duplicacy for @PersistenceContext and @PersistenceUnit (see few lines
+ // above) and more importantly, since this works, let's just have it here.
+ if (metaData.getJndiEnvironmentRefsGroup() != null)
+ {
+ AnnotatedEJBReferencesMetaData annotatedEjbRefs = metaData.getJndiEnvironmentRefsGroup().getAnnotatedEjbReferences();
+ if (annotatedEjbRefs != null && !annotatedEjbRefs.isEmpty())
+ {
+ for (AnnotatedEJBReferenceMetaData annotatedEjbRef : annotatedEjbRefs)
+ {
+ // Note: @EJB(beanName="") is set as "link" in AnnotatedEJBReferenceMetadata.
+ // Hence, we use the getLink() method to get hold of the beanName during resolution.
+ String beanName = annotatedEjbRef.getLink();
+ EjbReference ejbReference = new EjbReference(beanName, annotatedEjbRef.getBeanInterface().getName(), annotatedEjbRef.getMappedName());
+ String jndiName = this.ejbRefResolver.resolveEjb(unit, ejbReference);
+ if (jndiName != null)
+ {
+ ServiceDependencyMetaData sdmd = this.createJNDIDependency(jndiName);
+ dependencies.add(sdmd);
+ }
+ }
+ }
+ }
webModule.setDependencies(dependencies);
Modified: trunk/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java 2010-11-16 18:37:06 UTC (rev 109350)
+++ trunk/testsuite/src/main/org/jboss/test/jsf/managed/ENCAnnotationsManagedBean.java 2010-11-17 04:15:43 UTC (rev 109351)
@@ -63,7 +63,7 @@
mappedName="jbosstest/ejbs/UnsecuredEJB")
StatelessSessionHome sshome;
@EJB(name="ejb/CtsBmp", beanInterface=EntityHome.class,
- mappedName="jbosstest/ejbs/CtsBmp")
+ mappedName="ejbcts/BMPBean")
EntityHome entityHome;
@EJB(name="ejb/local/bean3", beanInterface=StatelessSessionLocalHome.class,
mappedName="jbosstest/ejbs/local/ENCBean1")
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-11-16 18:37:06 UTC (rev 109350)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-11-17 04:15:43 UTC (rev 109351)
@@ -72,6 +72,7 @@
import org.jboss.reloaded.naming.spi.JavaEEComponent;
import org.jboss.web.WebApplication;
import org.jboss.web.tomcat.service.injection.TomcatInjectionUtils;
+import org.jboss.web.tomcat.service.injection.WebEJBHandler;
/**
* The TomcatInjectionContainer.
@@ -567,6 +568,16 @@
{
// TODO injection handlers should be pluggable from XML
handlers = new ArrayList<InjectionHandler<Environment>>();
+ try
+ {
+ InjectionHandler<Environment> webEjbHandler = new WebEJBHandler<Environment>(webDD, deploymentEndpointResolver, endpointMap, unit.getRelativePath());
+ handlers.add(webEjbHandler);
+ }
+ catch (NoClassDefFoundError e)
+ {
+ log.debug("EJB injection disabled", e);
+ }
+
handlers.add(new DependsHandler<Environment>());
try
{
More information about the jboss-cvs-commits
mailing list