[jboss-cvs] JBossAS SVN: r109531 - in trunk: ejb3/src/main/java/org/jboss/ejb3/deployers and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 29 02:50:50 EST 2010
Author: jaikiran
Date: 2010-11-29 02:50:48 -0500 (Mon, 29 Nov 2010)
New Revision: 109531
Modified:
trunk/component-matrix/pom.xml
trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
JBAS-8548 (1) Take care of null env-entry-value, as defined by JavaEE spec, for env-entry references (2) Upgrade to latest SwitchBoard and jboss-injection components
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-11-29 06:32:26 UTC (rev 109530)
+++ trunk/component-matrix/pom.xml 2010-11-29 07:50:48 UTC (rev 109531)
@@ -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-5</version.jboss.injection>
+ <version.jboss.injection>1.0.0-alpha-6</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.CR8</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-25</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-26</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>
@@ -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-11</version.org.jboss.switchboard.depchain>
+ <version.org.jboss.switchboard.depchain>1.0.0-alpha-12</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/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2010-11-29 06:32:26 UTC (rev 109530)
+++ trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2010-11-29 07:50:48 UTC (rev 109531)
@@ -45,12 +45,12 @@
import org.jboss.ejb3.javaee.JavaEEApplication;
import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin;
+import org.jboss.injection.injector.EEInjector;
import org.jboss.injection.injector.metadata.EnvironmentEntryType;
import org.jboss.injection.injector.metadata.InjectionTargetType;
import org.jboss.injection.injector.metadata.JndiEnvironmentRefsGroup;
import org.jboss.injection.manager.spi.InjectionManager;
import org.jboss.injection.manager.spi.Injector;
-import org.jboss.injection.mc.injector.LazyEEInjector;
import org.jboss.injection.mc.metadata.JndiEnvironmentImpl;
import org.jboss.kernel.Kernel;
import org.jboss.logging.Logger;
@@ -265,13 +265,13 @@
if (this.hasInjectionTargets(jndiEnvironment))
{
// create the injector
- LazyEEInjector lazyEEInjector = new LazyEEInjector(jndiEnvironment);
+ EEInjector eeInjector = new EEInjector(jndiEnvironment);
// add the injector the injection manager
- injectionManager.addInjector(lazyEEInjector);
+ injectionManager.addInjector(eeInjector);
// Deploy the Injector as a MC bean (so that the fully populated naming context (obtained via the SwitchBoard
// Barrier) gets injected.
String injectorMCBeanName = this.getInjectorMCBeanNamePrefix() + ",bean=" + ejbContainer.getEjbName();
- BeanMetaData injectorBMD = this.createInjectorBMD(injectorMCBeanName, lazyEEInjector, switchBoard);
+ BeanMetaData injectorBMD = this.createInjectorBMD(injectorMCBeanName, eeInjector, switchBoard);
this.jbossUnit.addAttachment(BeanMetaData.class + ":" + injectorMCBeanName, injectorBMD);
// Add the Injector dependency on the deployment (so that the DU doesn't
@@ -298,7 +298,7 @@
if (this.hasInjectionTargets(jndiEnvironmentForInterceptor))
{
// create the injector
- LazyEEInjector lazyEEInjector = new LazyEEInjector(jndiEnvironmentForInterceptor);
+ EEInjector lazyEEInjector = new EEInjector(jndiEnvironmentForInterceptor);
// add the injector the injection manager
injectionManager.addInjector(lazyEEInjector);
// Deploy the Injector as a MC bean (so that the fully populated naming context (obtained via the SwitchBoard
@@ -345,7 +345,7 @@
}
/**
- * Creates and returns {@link BeanMetaData} for the passed {@link LazyEEInjector injector} and sets up
+ * Creates and returns {@link BeanMetaData} for the passed {@link EEInjector injector} and sets up
* dependency on the passed {@link Barrier SwitchBoard barrier}.
*
* @param injectorMCBeanName
@@ -353,15 +353,13 @@
* @param barrier
* @return
*/
- protected BeanMetaData createInjectorBMD(String injectorMCBeanName, LazyEEInjector injector, Barrier barrier)
+ protected BeanMetaData createInjectorBMD(String injectorMCBeanName, EEInjector injector, Barrier barrier)
{
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(injectorMCBeanName, injector.getClass().getName());
builder.setConstructorValue(injector);
- // add injection dependency on INSTALLED state of SwitchBoard Barrier
- AbstractInjectionValueMetaData barrierInjection = new AbstractInjectionValueMetaData(barrier.getId());
- barrierInjection.setDependentState(ControllerState.INSTALLED);
- builder.addPropertyMetaData("barrier", barrierInjection);
+ // add dependency on INSTALLED state of SwitchBoard Barrier
+ builder.addDependency(barrier.getId());
// return the Injector BMD
return builder.getBeanMetaData();
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-29 06:32:26 UTC (rev 109530)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-11-29 07:50:48 UTC (rev 109531)
@@ -39,7 +39,6 @@
import javax.management.ObjectName;
import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -54,12 +53,12 @@
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.EEInjector;
import org.jboss.injection.injector.metadata.EnvironmentEntryType;
import org.jboss.injection.injector.metadata.InjectionTargetType;
import org.jboss.injection.injector.metadata.JndiEnvironmentRefsGroup;
import org.jboss.injection.manager.spi.InjectionManager;
import org.jboss.injection.manager.spi.Injector;
-import org.jboss.injection.mc.injector.LazyEEInjector;
import org.jboss.injection.mc.metadata.JndiEnvironmentImpl;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
@@ -779,13 +778,13 @@
if (this.hasInjectionTargets(jndiEnvironment))
{
// create the injector
- LazyEEInjector lazyEEInjector = new LazyEEInjector(jndiEnvironment);
+ EEInjector eeInjector = new EEInjector(jndiEnvironment);
// add the injector the injection manager
- injectionManager.addInjector(lazyEEInjector);
+ injectionManager.addInjector(eeInjector);
// Deploy the Injector as a MC bean (so that the fully populated naming context (obtained via the SwitchBoard
// Barrier) gets injected.
String injectorMCBeanName = this.getInjectorMCBeanName(unit);
- BeanMetaData injectorBMD = this.createInjectorBMD(injectorMCBeanName, lazyEEInjector, switchBoard);
+ BeanMetaData injectorBMD = this.createInjectorBMD(injectorMCBeanName, eeInjector, switchBoard);
unit.addAttachment(BeanMetaData.class + ":" + injectorMCBeanName, injectorBMD);
// Add the Injector dependency on the deployment (so that the DU doesn't
@@ -977,7 +976,7 @@
}
/**
- * Creates and returns {@link BeanMetaData} for the passed {@link LazyEEInjector injector} and sets up
+ * Creates and returns {@link BeanMetaData} for the passed {@link EEInjector injector} and sets up
* dependency on the passed {@link Barrier SwitchBoard barrier}.
*
* @param injectorMCBeanName
@@ -985,15 +984,13 @@
* @param barrier
* @return
*/
- protected BeanMetaData createInjectorBMD(String injectorMCBeanName, LazyEEInjector injector, Barrier barrier)
+ protected BeanMetaData createInjectorBMD(String injectorMCBeanName, EEInjector injector, Barrier barrier)
{
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(injectorMCBeanName, injector.getClass().getName());
builder.setConstructorValue(injector);
- // add injection dependency on INSTALLED state of SwitchBoard Barrier
- AbstractInjectionValueMetaData barrierInjection = new AbstractInjectionValueMetaData(barrier.getId());
- barrierInjection.setDependentState(ControllerState.INSTALLED);
- builder.addPropertyMetaData("barrier", barrierInjection);
+ // add dependency on INSTALLED state of SwitchBoard Barrier
+ builder.addDependency(barrier.getId());
// return the Injector BMD
return builder.getBeanMetaData();
More information about the jboss-cvs-commits
mailing list