geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r950397 [2/4] - in /geronimo/server/trunk/plugins: activemq/ bval/geronimo-bval-builder/src/main/java/org/apache/geronimo/bval/deployment/ client/client/src/main/history/ client/geronimo-client-builder/src/main/java/org/apache/geronimo/clie...
Date Wed, 02 Jun 2010 07:35:26 GMT
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java Wed Jun  2 07:35:24 2010
@@ -37,17 +37,6 @@ public interface NamingBuilder extends A
     
     XmlObject[] NO_REFS = new XmlObject[] {};
 
-    EARContext.Key<Map<JndiKey, Map<String, Object>>> JNDI_KEY = new EARContext.Key<Map<JndiKey, Map<String, Object>>>() {
-
-        public Map<JndiKey, Map<String, Object>> get(Map<EARContext.Key, Object> context) {
-            Map<JndiKey, Map<String, Object>> result = (Map<JndiKey, Map<String, Object>>) context.get(this);
-            if (result == null) {
-                result = new HashMap<JndiKey, Map<String, Object>>();
-                context.put(this, result);
-            }
-            return result;
-        }
-    };
     EARContext.Key<Holder> INJECTION_KEY = new EARContext.Key<Holder>() {
 
         public Holder get(Map<EARContext.Key, Object> context) {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Wed Jun  2 07:35:24 2010
@@ -24,7 +24,6 @@ import org.apache.geronimo.gbean.GBeanIn
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
-import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.Naming;
@@ -147,11 +146,11 @@ public class SwitchingModuleBuilder impl
         return builder;
     }
 
-    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, Module parentModule, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         String namespace = getNamespaceFromPlan(plan);
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
         if (builder != null) {
-            return builder.createModule(plan, moduleFile, targetPath, specDDUrl, environment, moduleContextInfo, earName, naming, idBuilder);
+            return builder.createModule(plan, moduleFile, targetPath, specDDUrl, environment, moduleContextInfo, parentModule, naming, idBuilder);
         } else {
             return null;
         }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java Wed Jun  2 07:35:24 2010
@@ -22,7 +22,6 @@ import java.util.Collection;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -45,7 +44,7 @@ public class UnavailableModuleBuilder im
         return null;
     }
 
-    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, Module parentModule, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         return null;
     }
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java Wed Jun  2 07:35:24 2010
@@ -16,12 +16,14 @@
  */
 package org.apache.geronimo.j2ee.deployment;
 
+import java.util.Map;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.deployment.Deployable;
 import org.apache.geronimo.deployment.DeployableJarFile;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedWebApp;
+import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.xmlbeans.XmlObject;
@@ -33,36 +35,40 @@ public class WebModule extends Module<Xm
     private final String contextRoot;
     public static final String WEB_APP_DATA = "WEB_APP_DATA";
 
-    public WebModule(boolean standAlone, 
-                     AbstractName moduleName, 
-                     String name, 
-                     Environment environment, 
-                     JarFile moduleFile, 
-                     String targetPath, 
-                     XmlObject specDD, 
-                     XmlObject vendorDD, 
-                     String originalSpecDD, 
-                     String contextRoot, 
-                     String namespace, 
-                     AnnotatedWebApp annotatedWebApp) {
+    public WebModule(boolean standAlone,
+                     AbstractName moduleName,
+                     String name,
+                     Environment environment,
+                     JarFile moduleFile,
+                     String targetPath,
+                     XmlObject specDD,
+                     XmlObject vendorDD,
+                     String originalSpecDD,
+                     String contextRoot,
+                     String namespace,
+                     AnnotatedWebApp annotatedWebApp,
+                     Map<JndiKey, Map<String, Object>> jndiContext,
+                     Module parentModule) {
         this(standAlone, moduleName, name, environment, new DeployableJarFile(moduleFile), 
-             targetPath, specDD, vendorDD, originalSpecDD, contextRoot, namespace, annotatedWebApp);
+             targetPath, specDD, vendorDD, originalSpecDD, contextRoot, namespace, annotatedWebApp, jndiContext, parentModule);
     }
     
-    public WebModule(boolean standAlone, 
-                     AbstractName moduleName, 
-                     String name, 
-                     Environment environment, 
-                     Deployable deployable, 
-                     String targetPath, 
-                     XmlObject specDD, 
-                     XmlObject vendorDD, 
-                     String originalSpecDD, 
-                     String contextRoot, 
-                     String namespace, 
-                     AnnotatedWebApp annotatedWebApp) {
+    public WebModule(boolean standAlone,
+                     AbstractName moduleName,
+                     String name,
+                     Environment environment,
+                     Deployable deployable,
+                     String targetPath,
+                     XmlObject specDD,
+                     XmlObject vendorDD,
+                     String originalSpecDD,
+                     String contextRoot,
+                     String namespace,
+                     AnnotatedWebApp annotatedWebApp,
+                     Map<JndiKey, Map<String, Object>> jndiContext
+            , Module parentModule) {
         super(standAlone, moduleName, name, environment, deployable, 
-              targetPath, specDD, vendorDD, originalSpecDD, namespace, annotatedWebApp );
+              targetPath, specDD, vendorDD, originalSpecDD, namespace, annotatedWebApp, jndiContext, parentModule);
         this.contextRoot = contextRoot;
     }
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java Wed Jun  2 07:35:24 2010
@@ -73,6 +73,18 @@ public class AnnotatedEjbJar implements 
         }
     }
 
+    public static AnnotatedApp getAnnotatedApp(XmlObject bean) throws DeploymentException {
+        if (bean instanceof EntityBeanType) {
+            return new EntityBean((EntityBeanType) bean);
+        } else if (bean instanceof MessageDrivenBeanType) {
+            return new MessageDriveBean((MessageDrivenBeanType) bean);
+        } else if (bean instanceof SessionBeanType) {
+            return new SessionBean((SessionBeanType) bean);
+        } else {
+            throw new DeploymentException("Unrecognized XmlBeans object: " + bean);
+        }
+    }
+
     /**
      * EjbJarType methods used for the @EJB, @EJBs annotations
      */
@@ -213,6 +225,7 @@ public class AnnotatedEjbJar implements 
 
     public static class EntityBean implements AnnotatedApp {
         private final EntityBeanType bean;
+        private List<EjbRefType> ambiguousEjbRefs;
 
         public EntityBean(EntityBeanType bean) {
             this.bean = bean;
@@ -278,8 +291,21 @@ public class AnnotatedEjbJar implements 
             return bean.xmlText();
         }
 
+        /**
+         * ambiguousRefs getter
+         * <p/>
+         * <p>There is no corresponding setter method. To add a new item to the list do:
+         * <pre>
+         *    getAmbiguousEjbRefs().add(ejbRef);
+         * </pre>
+         *
+         * @return ambiguousRefs list
+         */
         public List<EjbRefType> getAmbiguousEjbRefs() {
-            throw new AssertionError("don't call this");
+            if (ambiguousEjbRefs == null) {
+                ambiguousEjbRefs = new ArrayList<EjbRefType>();
+            }
+            return this.ambiguousEjbRefs;
         }
 
         public LifecycleCallbackType[] getPostConstructArray() {
@@ -329,6 +355,7 @@ public class AnnotatedEjbJar implements 
 
     public static class MessageDriveBean implements AnnotatedApp {
         private final MessageDrivenBeanType bean;
+        private List<EjbRefType> ambiguousEjbRefs;
 
         public MessageDriveBean(MessageDrivenBeanType bean) {
             this.bean = bean;
@@ -402,8 +429,21 @@ public class AnnotatedEjbJar implements 
             return bean.xmlText();
         }
 
+        /**
+         * ambiguousRefs getter
+         * <p/>
+         * <p>There is no corresponding setter method. To add a new item to the list do:
+         * <pre>
+         *    getAmbiguousEjbRefs().add(ejbRef);
+         * </pre>
+         *
+         * @return ambiguousRefs list
+         */
         public List<EjbRefType> getAmbiguousEjbRefs() {
-            throw new AssertionError("don't call this");
+            if (ambiguousEjbRefs == null) {
+                ambiguousEjbRefs = new ArrayList<EjbRefType>();
+            }
+            return this.ambiguousEjbRefs;
         }
 
         public LifecycleCallbackType[] getPostConstructArray() {
@@ -445,6 +485,7 @@ public class AnnotatedEjbJar implements 
 
     public static class SessionBean implements AnnotatedApp {
         private final SessionBeanType bean;
+        private List<EjbRefType> ambiguousEjbRefs;
 
         public SessionBean(SessionBeanType bean) {
             this.bean = bean;
@@ -510,8 +551,21 @@ public class AnnotatedEjbJar implements 
             return bean.xmlText();
         }
 
+        /**
+         * ambiguousRefs getter
+         * <p/>
+         * <p>There is no corresponding setter method. To add a new item to the list do:
+         * <pre>
+         *    getAmbiguousEjbRefs().add(ejbRef);
+         * </pre>
+         *
+         * @return ambiguousRefs list
+         */
         public List<EjbRefType> getAmbiguousEjbRefs() {
-            throw new AssertionError("don't call this");
+            if (ambiguousEjbRefs == null) {
+                ambiguousEjbRefs = new ArrayList<EjbRefType>();
+            }
+            return this.ambiguousEjbRefs;
         }
 
         public LifecycleCallbackType[] getPostConstructArray() {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java Wed Jun  2 07:35:24 2010
@@ -29,9 +29,6 @@ import javax.ejb.EJBLocalHome;
 import javax.ejb.EJBs;
 import javax.ejb.Local;
 import javax.ejb.Remote;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.xbeans.javaee6.DescriptionType;
 import org.apache.geronimo.xbeans.javaee6.EjbLinkType;
 import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType;
@@ -41,7 +38,9 @@ import org.apache.geronimo.xbeans.javaee
 import org.apache.geronimo.xbeans.javaee6.LocalType;
 import org.apache.geronimo.xbeans.javaee6.RemoteType;
 import org.apache.geronimo.xbeans.javaee6.XsdStringType;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.AbstractFinder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Static helper class used to encapsulate all the functions related to the translation of
@@ -85,7 +84,7 @@ public final class EJBAnnotationHelper e
      *
      * @return true or false
      */
-    public static boolean annotationsPresent(ClassFinder classFinder) {
+    public static boolean annotationsPresent(AbstractFinder classFinder) {
         if (classFinder.isAnnotationPresent(EJB.class)) return true;
         if (classFinder.isAnnotationPresent(EJBs.class)) return true;
         return false;
@@ -98,7 +97,7 @@ public final class EJBAnnotationHelper e
      * @return Updated deployment descriptor
      * @throws Exception if parsing or validation error
      */
-    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder) throws Exception {
+    public static void processAnnotations(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws Exception {
         if (annotatedApp != null) {
             processEJBs(annotatedApp, classFinder);
             processEJB(annotatedApp, classFinder);
@@ -113,7 +112,7 @@ public final class EJBAnnotationHelper e
      * @param classFinder
      * @throws Exception
      */
-    private static void processEJB(AnnotatedApp annotatedApp, ClassFinder classFinder) throws Exception {
+    private static void processEJB(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws Exception {
         log.debug("processEJB(): Entry: AnnotatedApp: " + annotatedApp.toString());
 
         List<Class> classesWithEJB = classFinder.findAnnotatedClasses(EJB.class);
@@ -158,7 +157,7 @@ public final class EJBAnnotationHelper e
      * @param classFinder
      * @throws Exception
      */
-    private static void processEJBs(AnnotatedApp annotatedApp, ClassFinder classFinder) throws Exception {
+    private static void processEJBs(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws Exception {
         log.debug("processEJBs(): Entry");
 
         List<Class> classesWithEJBs = classFinder.findAnnotatedClasses(EJBs.class);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java Wed Jun  2 07:35:24 2010
@@ -25,7 +25,6 @@ import java.util.List;
 
 import javax.jws.HandlerChain;
 import javax.xml.ws.WebServiceRef;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
@@ -37,7 +36,7 @@ import org.apache.geronimo.xbeans.javaee
 import org.apache.geronimo.xbeans.javaee6.ParamValueType;
 import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
 import org.apache.geronimo.xbeans.javaee6.XsdQNameType;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.AbstractFinder;
 import org.apache.xmlbeans.XmlObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,7 +80,7 @@ public final class HandlerChainAnnotatio
      * @param classFinder ClassFinder containing classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    public static void processAnnotations(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         if ( annotatedApp != null && classFinder.isAnnotationPresent(HandlerChain.class)) {
             processHandlerChain(annotatedApp, classFinder);
         }
@@ -95,7 +94,7 @@ public final class HandlerChainAnnotatio
      * @param classFinder ClassFinder containing classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processHandlerChain(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processHandlerChain(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processHandlerChain(): Entry: AnnotatedApp: " + annotatedApp.toString());
 
         List<Method> methodswithHandlerChain = classFinder.findAnnotatedMethods(HandlerChain.class);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java Wed Jun  2 07:35:24 2010
@@ -24,12 +24,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContexts;
 import javax.persistence.PersistenceContextType;
+import javax.persistence.PersistenceContexts;
 import javax.persistence.PersistenceProperty;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
 import org.apache.geronimo.xbeans.javaee6.JndiNameType;
@@ -37,7 +34,9 @@ import org.apache.geronimo.xbeans.javaee
 import org.apache.geronimo.xbeans.javaee6.PersistenceContextTypeType;
 import org.apache.geronimo.xbeans.javaee6.PropertyType;
 import org.apache.geronimo.xbeans.javaee6.XsdStringType;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.AbstractFinder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -82,7 +81,7 @@ public final class PersistenceContextAnn
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    public static void processAnnotations(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         if (annotatedApp != null) {
             if (classFinder.isAnnotationPresent(PersistenceContexts.class)) {
                 processPersistenceContexts(annotatedApp, classFinder);
@@ -101,7 +100,7 @@ public final class PersistenceContextAnn
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processPersistenceContext(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processPersistenceContext(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processPersistenceContext(): Entry: AnnotatedApp: " + annotatedApp.toString());
 
         List<Class> classeswithPersistenceContext = classFinder.findAnnotatedClasses(PersistenceContext.class);
@@ -146,7 +145,7 @@ public final class PersistenceContextAnn
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processPersistenceContexts(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processPersistenceContexts(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processPersistenceContexts(): Entry");
 
         List<Class> classeswithPersistenceContexts = classFinder.findAnnotatedClasses(PersistenceContexts.class);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java Wed Jun  2 07:35:24 2010
@@ -25,14 +25,13 @@ import java.util.List;
 
 import javax.persistence.PersistenceUnit;
 import javax.persistence.PersistenceUnits;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
 import org.apache.geronimo.xbeans.javaee6.JndiNameType;
 import org.apache.geronimo.xbeans.javaee6.PersistenceUnitRefType;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.AbstractFinder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -77,7 +76,7 @@ public final class PersistenceUnitAnnota
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    public static void processAnnotations(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         if (annotatedApp != null) {
             if (classFinder.isAnnotationPresent(PersistenceUnits.class)) {
                 processPersistenceUnits(annotatedApp, classFinder);
@@ -96,7 +95,7 @@ public final class PersistenceUnitAnnota
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processPersistenceUnit(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processPersistenceUnit(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processPersistenceUnit(): Entry: AnnotatedApp: " + annotatedApp.toString());
 
         List<Class> classeswithPersistenceUnit = classFinder.findAnnotatedClasses(PersistenceUnit.class);
@@ -141,7 +140,7 @@ public final class PersistenceUnitAnnota
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processPersistenceUnits(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processPersistenceUnits(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processPersistenceUnits(): Entry");
 
         List<Class> classeswithPersistenceUnits = classFinder.findAnnotatedClasses(PersistenceUnits.class);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java Wed Jun  2 07:35:24 2010
@@ -25,11 +25,10 @@ import java.util.List;
 
 import javax.annotation.Resource;
 import javax.annotation.Resources;
-
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.xbean.finder.AbstractFinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.xbean.finder.ClassFinder;
 
 
 /**
@@ -71,7 +70,7 @@ public final class ResourceAnnotationHel
      * Update the deployment descriptor from Resource and Resources annotations
      * @throws Exception if parsing or validation error
      */
-    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
+    public static void processAnnotations(AnnotatedApp annotatedApp, AbstractFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
         if (annotatedApp != null) {
             if (classFinder.isAnnotationPresent(Resources.class)) {
                 processResources(annotatedApp, classFinder, resourceProcessor);
@@ -91,7 +90,7 @@ public final class ResourceAnnotationHel
      * @param resourceProcessor
      * @throws Exception
      */
-    private static void processResource(AnnotatedApp annotatedApp, ClassFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
+    private static void processResource(AnnotatedApp annotatedApp, AbstractFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
         log.debug("processResource(): Entry: AnnotatedApp: " + annotatedApp.toString());
 
         List<Class> classeswithResource = classFinder.findAnnotatedClasses(Resource.class);
@@ -137,7 +136,7 @@ public final class ResourceAnnotationHel
      * @param resourceProcessor
      * @throws Exception
      */
-    private static void processResources(AnnotatedApp annotatedApp, ClassFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
+    private static void processResources(AnnotatedApp annotatedApp, AbstractFinder classFinder, ResourceProcessor resourceProcessor) throws Exception {
         log.debug("processResources(): Entry");
 
         List<Class> classeswithResources = classFinder.findAnnotatedClasses(Resources.class);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java Wed Jun  2 07:35:24 2010
@@ -22,18 +22,15 @@ import java.util.List;
 import javax.annotation.security.DeclareRoles;
 import javax.annotation.security.RunAs;
 import javax.servlet.Servlet;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.xbeans.javaee6.RoleNameType;
 import org.apache.geronimo.xbeans.javaee6.RunAsType;
 import org.apache.geronimo.xbeans.javaee6.SecurityRoleType;
 import org.apache.geronimo.xbeans.javaee6.ServletType;
-import org.apache.geronimo.xbeans.javaee6.ServletNameType;
-import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
 import org.apache.geronimo.xbeans.javaee6.WebAppType;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.AbstractFinder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -74,7 +71,7 @@ public final class SecurityAnnotationHel
      * @param classFinder  Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    public static void processAnnotations(WebAppType webApp, ClassFinder classFinder) throws DeploymentException {
+    public static void processAnnotations(WebAppType webApp, AbstractFinder classFinder) throws DeploymentException {
         if (webApp != null && classFinder != null) {
             if (classFinder.isAnnotationPresent(DeclareRoles.class)) {
                 processDeclareRoles(webApp, classFinder);
@@ -93,7 +90,7 @@ public final class SecurityAnnotationHel
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processDeclareRoles(WebAppType webApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processDeclareRoles(WebAppType webApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processDeclareRoles(): Entry: webApp: " + webApp.toString());
 
         List<Class> classesWithDeclareRoles = classFinder.findAnnotatedClasses(DeclareRoles.class);
@@ -120,7 +117,7 @@ public final class SecurityAnnotationHel
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processRunAs(WebAppType webApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processRunAs(WebAppType webApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processRunAs(): Entry: webApp: " + webApp.toString());
 
         List<Class> classesWithRunAs = classFinder.findAnnotatedClasses(RunAs.class);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java Wed Jun  2 07:35:24 2010
@@ -27,16 +27,15 @@ import javax.jws.HandlerChain;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceRef;
 import javax.xml.ws.WebServiceRefs;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
 import org.apache.geronimo.xbeans.javaee6.JndiNameType;
 import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
 import org.apache.geronimo.xbeans.javaee6.XsdAnyURIType;
 import org.apache.geronimo.xbeans.javaee6.XsdStringType;
-import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.AbstractFinder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -81,7 +80,7 @@ public final class WebServiceRefAnnotati
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    public static void processAnnotations(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         if (annotatedApp != null) {
             if (classFinder.isAnnotationPresent(WebServiceRefs.class)) {
                 processWebServiceRefs(annotatedApp, classFinder);
@@ -100,7 +99,7 @@ public final class WebServiceRefAnnotati
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processWebServiceRef(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processWebServiceRef(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processWebServiceRef(): Entry: AnnotatedApp: " + annotatedApp.toString());
 
         List<Class> classeswithWebServiceRef = classFinder.findAnnotatedClasses(WebServiceRef.class);
@@ -145,7 +144,7 @@ public final class WebServiceRefAnnotati
      * @param classFinder Access to the classes of interest
      * @throws DeploymentException if parsing or validation error
      */
-    private static void processWebServiceRefs(AnnotatedApp annotatedApp, ClassFinder classFinder) throws DeploymentException {
+    private static void processWebServiceRefs(AnnotatedApp annotatedApp, AbstractFinder classFinder) throws DeploymentException {
         log.debug("processWebServiceRefs(): Entry");
 
         List<Class> classeswithWebServiceRefs = classFinder.findAnnotatedClasses(WebServiceRefs.class);

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder13NakedTest
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.3-naked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java Wed Jun  2 07:35:24 2010
@@ -16,8 +16,10 @@
  */
 package org.apache.geronimo.j2ee.deployment;
 
+import java.util.Map;
 import java.util.jar.JarFile;
 
+import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.util.JarUtils;
 
@@ -29,15 +31,16 @@ import org.apache.geronimo.kernel.util.J
 public class EARConfigBuilder13Test
     extends EARConfigBuilderTestSupport
 {
+
     protected void setUp() throws Exception {
         super.setUp();
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.3.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java Wed Jun  2 07:35:24 2010
@@ -33,10 +33,10 @@ public class EARConfigBuilder14AltDDTest
         super.setUp();
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.4.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java Wed Jun  2 07:35:24 2010
@@ -33,10 +33,10 @@ public class EARConfigBuilder14AltDDUnpa
         super.setUp();
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.4-unpacked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder14NakedTest
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.4-naked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder14NakedUnpa
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.4-naked-unpacked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder14Test
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.4.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder14UnpackedT
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-j2ee_1.4-unpacked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java Wed Jun  2 07:35:24 2010
@@ -33,10 +33,10 @@ public class EARConfigBuilder5AltDDTest
         super.setUp();
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-javaee_5.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java Wed Jun  2 07:35:24 2010
@@ -33,10 +33,10 @@ public class EARConfigBuilder5AltDDUnpac
         super.setUp();
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-javaee_5-unpacked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder5NakedTest
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-javaee_5-naked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "test-ejb-jar.jar", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "test-rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder5NakedUnpac
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-javaee_5-naked-unpacked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder5Test
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-javaee_5.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java Wed Jun  2 07:35:24 2010
@@ -34,10 +34,10 @@ public class EARConfigBuilder5UnpackedTe
 
         earFile = JarUtils.createJarFile(resolveFile("target/test-ear-javaee_5-unpacked.ear"));
         locations.put(null, new Artifact("org.apache.geronimo.testsupport", "test-ear-javaee_5", "3.0-SNAPSHOT", "ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, null, "ejb.jar/", null, null, null, null, jndiContext, parentModule);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, (JarFile)null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null, jndiContext, parentModule);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, null, "rar.rar/", null, null, null, null, jndiContext, parentModule);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java Wed Jun  2 07:35:24 2010
@@ -31,6 +31,7 @@ import org.apache.geronimo.deployment.Na
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.kernel.Naming;
@@ -130,6 +131,8 @@ public abstract class EARConfigBuilderTe
     private ListableRepository repository;
     protected ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, repository);
     protected Collection<? extends ArtifactResolver> artifactResolvers = Collections.singleton(new DefaultArtifactResolver(artifactManager, repository));
+    protected Map<JndiKey, Map<String, Object>> jndiContext;
+    protected Module parentModule;
 
     protected void setUp() throws Exception {
         super.setUp();

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Wed Jun  2 07:35:24 2010
@@ -52,12 +52,12 @@ public class MockConnectorConfigBuilder 
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "rar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
         AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
-        return new ConnectorModule(true, moduleName, null, null, moduleFile, "connector", null, null, null, null);
+        return new ConnectorModule(true, moduleName, null, null, moduleFile, "connector", null, null, null, null, null, null);
     }
 
-    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
-        AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
-        return new ConnectorModule(false, moduleName, null, null, moduleFile, targetPath, null, null, null, null);
+    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, Module parentModule, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+        AbstractName moduleName = naming.createChildName(parentModule.getModuleName(), "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
+        return new ConnectorModule(false, moduleName, null, null, moduleFile, targetPath, null, null, null, null, Module.share(Module.APP, parentModule.getJndiContext()), parentModule);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module connectorModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Wed Jun  2 07:35:24 2010
@@ -48,12 +48,12 @@ public class MockEJBConfigBuilder extend
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName earName = naming.createRootName(new Artifact("test", "test-ejb-jar", "", "jar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
         AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
-        return new EJBModule(true, moduleName, null, null, moduleFile, "ejb.jar", null, null, null, null);
+        return new EJBModule(true, moduleName, null, null, moduleFile, "ejb.jar", null, null, null, null, null, null);
     }
 
-    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
-        AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
-        return new EJBModule(false, moduleName, null, null, moduleFile, targetPath, null, null, null, null);
+    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, Module parentModule, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+        AbstractName moduleName = naming.createChildName(parentModule.getModuleName(), "ejb-jar", NameFactory.EJB_MODULE);
+        return new EJBModule(false, moduleName, null, null, moduleFile, targetPath, null, null, null, null, Module.share(Module.APP, parentModule.getJndiContext()), parentModule);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module ejbModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Wed Jun  2 07:35:24 2010
@@ -51,12 +51,12 @@ public class MockWARConfigBuilder extend
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "war"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
         AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
-        return new WebModule(true, moduleName, null, null, moduleFile, "war", null, null, null, contextRoot, namespace, null);
+        return new WebModule(true, moduleName, null, null, moduleFile, "war", null, null, null, contextRoot, namespace, null, null, null);
     }
 
-    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
-        AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
-        return new WebModule(false, moduleName, null, null, moduleFile, targetPath, null, null, null, contextRoot, namespace, null);
+    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, Module parentModule, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+        AbstractName moduleName = naming.createChildName(parentModule.getModuleName(), "war", NameFactory.WEB_MODULE);
+        return new WebModule(false, moduleName, null, null, moduleFile, targetPath, null, null, null, contextRoot, namespace, null, Module.share(Module.APP, parentModule.getJndiContext()), parentModule);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module webModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/annotation/Holder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/annotation/Holder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/annotation/Holder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/annotation/Holder.java Wed Jun  2 07:35:24 2010
@@ -36,12 +36,14 @@ import javax.naming.NamingException;
 import org.apache.xbean.recipe.ObjectRecipe;
 import org.apache.xbean.recipe.Option;
 import org.apache.xbean.recipe.StaticRecipe;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
  */
 public class Holder implements Serializable {
-
+    private static final Logger log = LoggerFactory.getLogger(Holder.class);
     public static final Holder EMPTY = new Holder() {
     };
 
@@ -199,6 +201,7 @@ public class Holder implements Serializa
                         objectRecipe.setProperty(injection.getTargetName(), new StaticRecipe(object));
                     }
                 } catch (NamingException e) {
+                    log.info("Could not look up " + injection.getJndiName(), e);
                     problems.add(e);
                 }
             }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Wed Jun  2 07:35:24 2010
@@ -131,6 +131,15 @@ public abstract class AbstractNamingBuil
         return NORMAL_PRIORITY;
     }
 
+    /**
+     * This accepts keys like jndi entry names in the spec dds, that is either starting with
+     * java:comp, java:module, java:app, or java:global, or in the java:comp/env space.
+     * For example, java:comp/env/foo and foo are equivalent keys.
+     *
+     * @param key jndi name, either including java:<scope> or after java:comp/env.
+     * @param value value to bind
+     * @param contexts set of scopes to bind into.
+     */
     protected void put(String key, Object value, Map<JndiKey, Map<String, Object>> contexts) {
         JndiKey jndiKey;
         if (key.startsWith("java:")) {
@@ -150,7 +159,7 @@ public abstract class AbstractNamingBuil
         scope.put(key, value);
     }
     
-    protected Object lookupJndiContextMap(Map<EARContext.Key, Object> sharedContext, String key) {
+    protected Object lookupJndiContextMap(Module module, String key) {
         JndiKey jndiKey;
         if (key.startsWith("java:")) {
             int pos = key.indexOf("/", 5);
@@ -161,14 +170,10 @@ public abstract class AbstractNamingBuil
             key = "comp/env/" + key;
             jndiKey = JndiScope.comp;
         }
-        Map<String, Object> scope = getJndiContextMap(sharedContext).get(jndiKey);
+        Map<String, Object> scope = module.getJndiScope(jndiKey);
         if (scope == null) return null;
         return scope.get(key);
     }
-    
-    protected Map<JndiKey, Map<String, Object>> getJndiContextMap(Map<EARContext.Key, Object> sharedContext) {
-        return NamingBuilder.JNDI_KEY.get(sharedContext);
-    }
 
     protected String getJndiName(String name) {
         if (name.indexOf(':') != -1) {   

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Wed Jun  2 07:35:24 2010
@@ -139,7 +139,7 @@ public class EnvironmentEntryBuilder ext
                         value = new KernelReference();
                     }
                 } else {
-                    Class typeClass;
+                    Class<?> typeClass;
                     try {
                         typeClass = bundle.loadClass(type);
                     } catch (ClassNotFoundException e) {
@@ -172,7 +172,7 @@ public class EnvironmentEntryBuilder ext
                         } else if (Class.class.equals(typeClass)) {
                             value = new ClassReference(strValue);
                         } else if (typeClass.isEnum()) {
-                            value = Enum.valueOf(typeClass, strValue);
+                            value = Enum.valueOf(typeClass.asSubclass(Enum.class), strValue);
                         } else {
                             throw new DeploymentException("Unrecognized env-entry type: " + type);
                         }
@@ -186,7 +186,7 @@ public class EnvironmentEntryBuilder ext
             // see Java EE 5 spec, section EE.5.4.1.3
             if (value != null) {
                 addInjections(name, envEntry.getInjectionTargetArray(), sharedContext);
-                put(name, value, getJndiContextMap(sharedContext));
+                put(name, value, module.getJndiContext());
             }
         }
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java?rev=950397&r1=950396&r2=950397&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java Wed Jun  2 07:35:24 2010
@@ -23,15 +23,12 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.ClassLoading;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
@@ -46,10 +43,12 @@ import org.osgi.framework.Bundle;
 /**
  * @version $Rev$ $Date$
  */
+@GBean(j2eeType = NameFactory.MODULE_BUILDER)
 public class GBeanRefBuilder extends AbstractNamingBuilder {
     private static final QName GBEAN_REF_QNAME = GerGbeanRefDocument.type.getDocumentElementName();
     private static final QNameSet GBEAN_REF_QNAME_SET = QNameSet.singleton(GBEAN_REF_QNAME);
 
+    @Override
     public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
         if (plan == null) {
             return;
@@ -90,29 +89,19 @@ public class GBeanRefBuilder extends Abs
 
             String refName = gbeanRef.getRefName();
 
-            put(refName, new GBeanReference(module.getConfigId(), queries, gBeanType), NamingBuilder.JNDI_KEY.get(sharedContext));
+            put(refName, new GBeanReference(module.getConfigId(), queries, gBeanType), module.getJndiContext());
 
         }
     }
 
+    @Override
     public QNameSet getSpecQNameSet() {
         return QNameSet.EMPTY;
     }
 
+    @Override
     public QNameSet getPlanQNameSet() {
         return GBEAN_REF_QNAME_SET;
     }
 
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(GBeanRefBuilder.class, NameFactory.MODULE_BUILDER);
-
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }



Mime
View raw message