[jboss-cvs] JBossAS SVN: r74216 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-06-05 19:44:55 -0400 (Thu, 05 Jun 2008)
New Revision: 74216

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
Log:
Fix compile errors in JBossAS due to introduction of jboss-metadata.Beta18

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-06-05 23:15:40 UTC (rev 74215)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-06-05 23:44:55 UTC (rev 74216)
@@ -41,8 +41,8 @@
 import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry;
 import org.jboss.kernel.Kernel;
 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;
 
@@ -92,17 +92,18 @@
    @Override
    public void deploy(VFSDeploymentUnit unit) throws DeploymentException
    {
-      deploy(unit, unit.getAttachment(JBossMetaData.class), unit.getAttachment(PersistenceUnitsMetaData.class));
+      deploy(unit, unit.getAttachment(JBossMetaData.class), unit.getAttachment(PersistenceMetaData.class));
    }
    
-   public void deploy(VFSDeploymentUnit unit, JBossMetaData metaData, PersistenceUnitsMetaData persistenceUnitsMetaData) throws DeploymentException
+   public void deploy(VFSDeploymentUnit unit, JBossMetaData metaData, PersistenceMetaData persistenceMetaData)
+         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";
+            assert persistenceMetaData == null : "Found persistence units in legacy deployment";
             
             log.debug("Ignoring legacy EJB deployment " + unit);
             return;
@@ -128,7 +129,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) && persistenceMetaData == null)
          {
             log.trace(this.getClass().getSimpleName() + " skipping deployment \"" + unit.getSimpleName()
                   + "\", jar: \"" + jar.getName()
@@ -162,7 +163,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, persistenceMetaData);
          if(initScopeDeployment)
          {
             scope.setDeployment(deployment);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-06-05 23:15:40 UTC (rev 74215)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-06-05 23:44:55 UTC (rev 74216)
@@ -25,24 +25,27 @@
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
 import javax.security.jacc.PolicyConfiguration;
 
 import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
 import org.jboss.deployment.MappedReferenceMetaDataResolverDeployer;
 import org.jboss.deployment.dependency.ContainerDependencyMetaData;
-import org.jboss.ejb3.*;
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.DeploymentScope;
+import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.MCDependencyPolicy;
 import org.jboss.ejb3.javaee.JavaEEComponent;
-import org.jboss.ejb3.javaee.JavaEEModule;
-import org.jboss.ejb3.javaee.JavaEEApplication;
 import org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin;
-import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
 import org.jboss.kernel.Kernel;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 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
@@ -57,9 +60,11 @@
    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, DeploymentScope deploymentScope, JBossMetaData metaData, PersistenceUnitsMetaData persistenceUnitsMetaData)
+   public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer mbeanServer,
+         org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, DeploymentScope deploymentScope,
+         JBossMetaData metaData, PersistenceMetaData persistenceMetaData)
    {
-      super(ejb3Unit, deploymentScope, metaData, persistenceUnitsMetaData);
+      super(ejb3Unit, deploymentScope, metaData, persistenceMetaData);
       this.jbossUnit = jbossUnit;
       kernelAbstraction = new JBossASKernel(kernel, mbeanServer);