[jboss-cvs] JBossAS SVN: r109619 - 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
Wed Dec 1 04:26:10 EST 2010
Author: jaikiran
Date: 2010-12-01 04:26:08 -0500 (Wed, 01 Dec 2010)
New Revision: 109619
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-8548 Integrate with persistence-unit-ref resource provider
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-12-01 08:16:28 UTC (rev 109618)
+++ trunk/component-matrix/pom.xml 2010-12-01 09:26:08 UTC (rev 109619)
@@ -96,7 +96,7 @@
<version.org.jboss.javaee.specs.bom>1.0.0.CR1</version.org.jboss.javaee.specs.bom>
<version.org.jboss.jbossxb>2.0.2.Beta9</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.GA</version.org.jboss.jopr>
- <version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
+ <version.org.jboss.jpa.deployers>1.0.2-alpha-2</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>
@@ -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.Alpha22</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-24</version.org.jboss.metadata.ejb>
+ <version.org.jboss.metadata.ejb>2.0.0-alpha-25</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>
Modified: trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2010-12-01 08:16:28 UTC (rev 109618)
+++ trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2010-12-01 09:26:08 UTC (rev 109619)
@@ -123,4 +123,11 @@
</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>
</deployment>
Modified: trunk/ejb3/src/resources/standard/jpa-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/standard/jpa-deployers-jboss-beans.xml 2010-12-01 08:16:28 UTC (rev 109618)
+++ trunk/ejb3/src/resources/standard/jpa-deployers-jboss-beans.xml 2010-12-01 09:26:08 UTC (rev 109619)
@@ -127,4 +127,11 @@
</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>
+
</deployment>
Modified: trunk/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-12-01 08:16:28 UTC (rev 109618)
+++ trunk/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-12-01 09:26:08 UTC (rev 109619)
@@ -129,6 +129,7 @@
</constructor>
</bean>
+
<!-- Resource provider registry -->
<bean name="org.jboss.switchboard.ResourceProviderRegistry" class="org.jboss.switchboard.mc.resource.provider.ResourceProviderRegistry">
<property name="resourceProviders">
@@ -138,6 +139,7 @@
<inject bean="org.jboss.switchboard.ResourceRefResourceProvider"/>
<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.EJBLocalRefResourceProvider"/>
<inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
Modified: trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-12-01 08:16:28 UTC (rev 109618)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-12-01 09:26:08 UTC (rev 109619)
@@ -78,8 +78,6 @@
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;
@@ -797,24 +795,9 @@
}
}
- // TODO: We haven't yet integrated PU/PC and EJB reference providers in SwitchBoard.
+ // 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 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)
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-12-01 08:16:28 UTC (rev 109618)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-12-01 09:26:08 UTC (rev 109619)
@@ -30,7 +30,6 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -62,7 +61,6 @@
import org.jboss.injection.InjectionHandler;
import org.jboss.injection.Injector;
import org.jboss.injection.PersistenceContextHandler;
-import org.jboss.injection.PersistenceUnitHandler;
import org.jboss.injection.manager.spi.InjectionManager;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.logging.Logger;
@@ -583,7 +581,6 @@
try
{
handlers.add(new PersistenceContextHandler<Environment>());
- handlers.add(new PersistenceUnitHandler<Environment>());
}
catch (NoClassDefFoundError e)
{
More information about the jboss-cvs-commits
mailing list