[jboss-cvs] JBossAS SVN: r79971 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 23 07:41:49 EDT 2008
Author: wolfc
Date: 2008-10-23 07:41:49 -0400 (Thu, 23 Oct 2008)
New Revision: 79971
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
Log:
JBAS-6087: removed usage of legacy persistence deployments
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2008-10-23 11:24:49 UTC (rev 79970)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2008-10-23 11:41:49 UTC (rev 79971)
@@ -249,7 +249,7 @@
}
JBoss5DeploymentUnit du = new JBoss5DeploymentUnit(unit);
du.setDefaultPersistenceProperties(defaultPersistenceProperties);
- Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, null, null);
+ Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, null);
if (scope != null)
scope.register(deployment);
if(initScopeDeployment)
@@ -258,7 +258,7 @@
}
// create() creates initial EJB containers and initializes metadata.
deployment.create();
- if (deployment.getEjbContainers().size() == 0 && deployment.getPersistenceUnitDeployments().size() == 0)
+ if (deployment.getEjbContainers().size() == 0)
{
log.trace("EJBRegistrationDeployer no containers in scanned jar, consider adding it to the ignore list: " + jar.getName() + " url: " + jar.toURL() + " unit: " + unit.getSimpleName());
return;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2008-10-23 11:24:49 UTC (rev 79970)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2008-10-23 11:41:49 UTC (rev 79971)
@@ -42,7 +42,6 @@
import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
-import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry;
import org.jboss.ejb3.resolvers.MessageDestinationReferenceResolver;
@@ -51,7 +50,6 @@
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.jpa.spec.PersistenceMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.virtual.VirtualFile;
@@ -94,8 +92,6 @@
public Ejb3Deployer()
{
addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
- // TODO: PersistenceUnits will have it's own component deployer
- addInput(PersistenceUnitsMetaData.class);
// TODO: should we really output this
setOutput(Ejb3Deployment.class);
// JBossASKernel install output
@@ -105,18 +101,16 @@
@Override
public void deploy(VFSDeploymentUnit unit) throws DeploymentException
{
- deploy(unit, unit.getAttachment(JBossMetaData.class), unit.getAttachment(PersistenceMetaData.class));
+ deploy(unit, unit.getAttachment(JBossMetaData.class));
}
- public void deploy(VFSDeploymentUnit unit, JBossMetaData metaData, PersistenceMetaData persistenceUnitsMetaData) throws DeploymentException
+ public void deploy(VFSDeploymentUnit unit, JBossMetaData metaData) throws DeploymentException
{
try
{
// Pickup any deployment which doesn't have metaData or metaData with ejbVersion unknown or 3
if(metaData != null && (metaData.isEJB2x() || metaData.isEJB1x()))
{
- assert persistenceUnitsMetaData == null : "Found persistence units in legacy deployment";
-
log.debug("Ignoring legacy EJB deployment " + unit);
return;
}
@@ -141,7 +135,7 @@
// If DDs are required and none are present, skip deployment
// EJBTHREE-1040
- if (this.isDeploymentDescriptorRequired() && (metaData == null) && persistenceUnitsMetaData == null)
+ if (this.isDeploymentDescriptorRequired() && (metaData == null))
{
log.trace(this.getClass().getSimpleName() + " skipping deployment \"" + unit.getSimpleName()
+ "\", jar: \"" + jar.getName()
@@ -176,7 +170,7 @@
JBoss5DeploymentUnit du = new JBoss5DeploymentUnit(unit);
du.setDefaultPersistenceProperties(defaultPersistenceProperties);
- Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, metaData, persistenceUnitsMetaData);
+ Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, metaData);
if(initScopeDeployment)
{
scope.setDeployment(deployment);
@@ -193,7 +187,7 @@
scope.register(deployment);
// create() creates initial EJB containers and initializes metadata.
deployment.create();
- if (deployment.getEjbContainers().size() == 0 && deployment.getPersistenceUnitDeployments().size() == 0)
+ if (deployment.getEjbContainers().size() == 0)
{
log.trace("Found no containers in scanned jar, consider adding it to the ignore list: " + jar.getName() + " url: " + jar.toURL() + " unit: " + unit.getSimpleName());
deployment.destroy();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2008-10-23 11:24:49 UTC (rev 79970)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2008-10-23 11:41:49 UTC (rev 79971)
@@ -45,7 +45,6 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
-import org.jboss.metadata.jpa.spec.PersistenceMetaData;
/**
* JBoss 5.0 Microkernel specific implementation
@@ -60,7 +59,7 @@
private org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit;
private Map<String, ContainerDependencyMetaData> endpoints;
- public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, JBoss5DeploymentScope deploymentScope, JBossMetaData metaData, PersistenceMetaData persistenceUnitsMetaData)
+ public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, JBoss5DeploymentScope deploymentScope, JBossMetaData metaData)
{
// Either call the old constructor and do process persistence units
//super(ejb3Unit, deploymentScope, metaData, persistenceUnitsMetaData);
@@ -74,9 +73,6 @@
this.mbeanServer = mbeanServer;
org.jboss.deployers.structure.spi.DeploymentUnit topUnit = jbossUnit.getTopLevel();
endpoints = (Map<String, ContainerDependencyMetaData>) topUnit.getAttachment(MappedReferenceMetaDataResolverDeployer.ENDPOINT_MAP_KEY);
-
- // depends on the mode
- setProcessPersistenceUnits(false);
}
protected PolicyConfiguration createPolicyConfiguration() throws Exception
More information about the jboss-cvs-commits
mailing list