diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2007-10-22 20:15:20.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2008-02-15 10:49:20.000000000 +0530
@@ -92,7 +92,7 @@
private ObjectName objectName;
private DependencyPolicy dependencyPolicy = new JBoss5DependencyPolicy();
- public ClientENCInjectionContainer(org.jboss.deployers.spi.deployer.DeploymentUnit unit, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
+ public ClientENCInjectionContainer(org.jboss.deployers.structure.spi.DeploymentUnit unit, ApplicationClientDD xml, Class<?> mainClass, String applicationClientName, ClassLoader classLoader, Context encCtx) throws NamingException
{
if(mainClass == null)
throw new NullPointerException("mainClass is mandatory");
@@ -151,7 +151,7 @@
processMetaData();
}
- private String createScopeKernelName(org.jboss.deployers.spi.deployer.DeploymentUnit unit, DeploymentScope ear)
+ private String createScopeKernelName(org.jboss.deployers.structure.spi.DeploymentUnit unit, DeploymentScope ear)
{
String scopedKernelName = "";
if (ear != null) scopedKernelName += ",ear=" + ear.getShortName();
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientParsingDeployer.java 2008-02-15 10:49:20.000000000 +0530
@@ -25,7 +25,7 @@
import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.metamodel.ApplicationClientDD;
import org.jboss.ejb3.metamodel.ApplicationClientDDObjectFactory;
import org.jboss.util.xml.DOMUtils;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2008-02-15 10:49:20.000000000 +0530
@@ -23,7 +23,7 @@
import org.jboss.deployers.plugins.deployers.helpers.AbstractTypedDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.metamodel.ApplicationClientDD;
import org.jboss.virtual.VirtualFile;
@@ -50,7 +50,7 @@
}
/* (non-Javadoc)
- * @see org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer#deploy(org.jboss.deployers.spi.deployer.DeploymentUnit)
+ * @see org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer#deploy(org.jboss.deployers.structure.spi.DeploymentUnit)
*/
@Override
public void deploy(DeploymentUnit unit) throws DeploymentException
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2008-02-15 10:49:20.000000000 +0530
@@ -23,7 +23,7 @@
import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.KernelAbstraction;
import org.jboss.ejb3.MCKernelAbstraction;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2008-02-15 10:49:20.000000000 +0530
@@ -43,11 +43,11 @@
*/
public class Ejb3JBoss5Deployment extends Ejb3Deployment
{
- private org.jboss.deployers.spi.deployer.DeploymentUnit deploymentInfo;
+ private org.jboss.deployers.structure.spi.DeploymentUnit deploymentInfo;
private static final Logger log = Logger.getLogger(Ejb3JBoss5Deployment.class);
- public Ejb3JBoss5Deployment(DeploymentUnit du, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.spi.deployer.DeploymentUnit di, DeploymentScope deploymentScope)
+ public Ejb3JBoss5Deployment(DeploymentUnit du, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit di, DeploymentScope deploymentScope)
{
super(du, deploymentScope);
this.deploymentInfo = di;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2008-02-15 10:49:20.000000000 +0530
@@ -22,9 +22,9 @@
package org.jboss.ejb3.deployers;
import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentContext;
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.EJB3Deployer;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java 2008-02-15 10:49:20.000000000 +0530
@@ -23,7 +23,7 @@
import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java 2008-02-15 10:49:20.000000000 +0530
@@ -23,8 +23,8 @@
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import java.util.ArrayList;
import java.util.Collection;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2008-02-15 10:49:20.000000000 +0530
@@ -29,7 +29,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.virtual.VirtualFile;
import org.jboss.virtual.VirtualFileFilter;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java 2007-10-22 20:15:12.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java 2008-02-15 10:49:20.000000000 +0530
@@ -25,7 +25,7 @@
import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.metamodel.ApplicationClientDD;
import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory;
import org.jboss.util.xml.DOMUtils;
diff -urN jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java
--- jbossas-4.2.2.GA.orig/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java 2007-10-22 20:15:17.000000000 +0530
+++ jbossas-4.2.2.GA/ejb3/src/main/org/jboss/ejb3/security/JaccHelper.java 2008-02-15 10:49:20.000000000 +0530
@@ -47,7 +47,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.ejb3.EJBContainer;
import org.jboss.logging.Logger;
-//import org.jboss.deployers.spi.deployer.DeploymentUnit;
+//import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.security.RealmMapping;
import org.jboss.security.RunAsIdentity;