[jboss-cvs] JBossAS SVN: r110389 - in trunk: ejb3/src/resources/META-INF and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 17 09:39:21 EST 2011
Author: smarlow at redhat.com
Date: 2011-01-17 09:39:21 -0500 (Mon, 17 Jan 2011)
New Revision: 110389
Modified:
trunk/component-matrix/pom.xml
trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
trunk/ejb3/src/resources/standard/jpa-deployers-jboss-beans.xml
trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
JBAS-8563 switchboard persistence context resource provider support. Also includes fix for JBAS-8733 XPC not available in postconstruct method of sfsb
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2011-01-17 13:31:15 UTC (rev 110388)
+++ trunk/component-matrix/pom.xml 2011-01-17 14:39:21 UTC (rev 110389)
@@ -87,7 +87,7 @@
<version.org.jboss.cluster.cache.ispn>1.0.0.Final</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.GA</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-alpha-44</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-45</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-4</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -98,11 +98,11 @@
<version.org.jboss.javaee.specs.bom>1.0.1.Final</version.org.jboss.javaee.specs.bom>
<version.org.jboss.jbossxb>2.0.3.GA</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.SP2</version.org.jboss.jopr>
- <version.org.jboss.jpa.deployers>1.0.2-alpha-3</version.org.jboss.jpa.deployers>
- <version.org.jboss.jpa.vfs3>1.0.2-alpha-2</version.org.jboss.jpa.vfs3>
- <version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
- <version.org.jboss.jpa.mcint>1.0.0-alpha-2</version.org.jboss.jpa.mcint>
- <version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
+ <version.org.jboss.jpa.deployers>3.0.0-alpha-4</version.org.jboss.jpa.deployers>
+ <version.org.jboss.jpa.vfs3>3.0.0-alpha-4</version.org.jboss.jpa.vfs3>
+ <version.org.jboss.jpa.impl>3.0.0-alpha-4</version.org.jboss.jpa.impl>
+ <version.org.jboss.jpa.mcint>3.0.0-alpha-4</version.org.jboss.jpa.mcint>
+ <version.org.jboss.jpa.spi>3.0.0-alpha-4</version.org.jboss.jpa.spi>
<version.org.jboss.kernel>2.2.0.GA</version.org.jboss.kernel>
<version.org.jboss.logging>3.0.0.Beta4</version.org.jboss.logging>
<version.org.jboss.logging-service-metadata>1.0.0.CR10</version.org.jboss.logging-service-metadata>
Modified: trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2011-01-17 13:31:15 UTC (rev 110388)
+++ trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2011-01-17 14:39:21 UTC (rev 110389)
@@ -143,4 +143,19 @@
<parameter><inject bean="PersistenceUnitDependencyResolver"/></parameter>
</constructor>
</bean>
+
+ <!-- initialize the Extended Persistence EntityManager -->
+ <bean name="ExtendedEntityManager" class="org.jboss.jpa.util.ExtendedEntityManager">
+ <property name="xpcResolver">
+ <inject bean="XPCResolver"/>
+ </property>
+ </bean>
+
+ <!-- Resource provider for PersistenceContext reference -->
+ <bean name="org.jboss.switchboard.PersistenceContextResourceProvider" class="org.jboss.jpa.deployers.switchboard.PersistenceContextResourceProvider">
+ <constructor>
+ <parameter><inject bean="PersistenceUnitDependencyResolver"/></parameter>
+ </constructor>
+ </bean>
+
</deployment>
Modified: trunk/ejb3/src/resources/standard/jpa-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/standard/jpa-deployers-jboss-beans.xml 2011-01-17 13:31:15 UTC (rev 110388)
+++ trunk/ejb3/src/resources/standard/jpa-deployers-jboss-beans.xml 2011-01-17 14:39:21 UTC (rev 110389)
@@ -127,11 +127,26 @@
</map>
</property>
</bean>
+
<!-- Resource provider for PersistenceUnit reference -->
<bean name="org.jboss.switchboard.PersistenceUnitResourceProvider" class="org.jboss.jpa.deployers.switchboard.PersistenceUnitResourceProvider">
<constructor>
<parameter><inject bean="PersistenceUnitDependencyResolver"/></parameter>
</constructor>
</bean>
+
+ <!-- initialize the Extended Persistence EntityManager -->
+ <bean name="ExtendedEntityManager" class="org.jboss.jpa.util.ExtendedEntityManager">
+ <property name="xpcResolver">
+ <inject bean="XPCResolver"/>
+ </property>
+ </bean>
+
+ <!-- Resource provider for PersistenceContext reference -->
+ <bean name="org.jboss.switchboard.PersistenceContextResourceProvider" class="org.jboss.jpa.deployers.switchboard.PersistenceContextResourceProvider">
+ <constructor>
+ <parameter><inject bean="PersistenceUnitDependencyResolver"/></parameter>
+ </constructor>
+ </bean>
</deployment>
Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2011-01-17 13:31:15 UTC (rev 110388)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2011-01-17 14:39:21 UTC (rev 110389)
@@ -156,7 +156,7 @@
<inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
<inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
<inject bean="org.jboss.switchboard.PersistenceUnitResourceProvider"/>
- <!-- Disabled till we resolve the transient failures with EJB jndi dependencies -->
+ <inject bean="org.jboss.switchboard.PersistenceContextResourceProvider"/>
<inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
<inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
@@ -178,4 +178,4 @@
</bean>
-</deployment>
\ No newline at end of file
+</deployment>
Modified: trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2011-01-17 13:31:15 UTC (rev 110388)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2011-01-17 14:39:21 UTC (rev 110389)
@@ -72,8 +72,6 @@
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
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.web.jboss.ClassLoadingMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
@@ -778,25 +776,7 @@
}
}
}
-
- // TODO: We haven't yet integrated PC and EJB reference providers in SwitchBoard.
- // The following sections will be removed after the RPs are made available
- // 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);
- }
- }
-
webModule.setDependencies(dependencies);
// Here's where a bit of magic happens. By attaching the ServiceMetaData
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 2011-01-17 13:31:15 UTC (rev 110388)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2011-01-17 14:39:21 UTC (rev 110389)
@@ -60,7 +60,6 @@
import org.jboss.injection.ExtendedInjectionContainer;
import org.jboss.injection.InjectionHandler;
import org.jboss.injection.Injector;
-import org.jboss.injection.PersistenceContextHandler;
import org.jboss.injection.manager.spi.InjectionManager;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.logging.Logger;
@@ -577,25 +576,7 @@
{
// 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
- {
- handlers.add(new PersistenceContextHandler<Environment>());
- }
- catch (NoClassDefFoundError e)
- {
- log.debug("JPA injection disabled", e);
- }
ClassLoader old = Thread.currentThread().getContextClassLoader();
ClassLoader webLoader = getClassloader();
More information about the jboss-cvs-commits
mailing list