geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r826191 [1/2] - in /geronimo/server/trunk/plugins/j2ee: geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/ geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ geronimo-j2ee-builder/src/main/java/org/apache/ge...
Date Sat, 17 Oct 2009 08:06:03 GMT
Author: djencks
Date: Sat Oct 17 08:06:02 2009
New Revision: 826191

URL: http://svn.apache.org/viewvc?rev=826191&view=rev
Log:
 geronimo-j2ee-builder and geronimo-naming-builder compile.  There seem to be packaging problems in geronimo-j2ee

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/ApplicationInfo.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilderExtension.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/RemoteRefDConfigBean.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/jsr88/HasPattern.java
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java
    geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/ApplicationInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/ApplicationInfo.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/ApplicationInfo.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/ApplicationInfo.java Sat Oct 17 08:06:02 2009
@@ -31,7 +31,7 @@
  */
 public class ApplicationInfo extends Module {
     private ConfigurationModuleType type;
-    private LinkedHashSet modules;
+    private LinkedHashSet<Module> modules;
     private ModuleList moduleLocations;
 
 
@@ -51,11 +51,11 @@
         return type;
     }
 
-    public LinkedHashSet getModules() {
+    public LinkedHashSet<Module> getModules() {
         return modules;
     }
 
-    public void setModules(LinkedHashSet modules) {
+    public void setModules(LinkedHashSet<Module> modules) {
         this.modules = modules;
     }
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Sat Oct 17 08:06:02 2009
@@ -74,9 +74,9 @@
         return mainClassName;
     }
 
-    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
-        context.addClass(location, fqcn, bytes);
-    }
+//    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
+//        context.addClass(location, fqcn, bytes);
+//    }
 
     public Collection<ConnectorModule> getResourceModules() {
         return resourceModules;

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Sat Oct 17 08:06:02 2009
@@ -40,8 +40,8 @@
         return ConfigurationModuleType.RAR;
     }
 
-    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
-        context.addClass(location, fqcn, bytes);
-    }
+//    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
+//        context.addClass(location, fqcn, bytes);
+//    }
 }
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Sat Oct 17 08:06:02 2009
@@ -40,7 +40,6 @@
 import java.util.zip.ZipEntry;
 
 import javax.xml.namespace.QName;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ClassPathList;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
@@ -59,15 +58,19 @@
 import org.apache.geronimo.gbean.AbstractName;
 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.GBeanLifecycle;
 import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.gbean.SingleElementCollection;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.j2ee.ApplicationInfo;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
@@ -95,12 +98,15 @@
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
  */
+@GBean(j2eeType = NameFactory.CONFIG_BUILDER)
 public class EARConfigBuilder implements ConfigurationBuilder, CorbaGBeanNameSource, GBeanLifecycle {
 
     private static final Logger log = LoggerFactory.getLogger(EARConfigBuilder.class);
@@ -108,6 +114,7 @@
 
     private final static QName APPLICATION_QNAME = GerApplicationDocument.type.getDocumentElementName();
     private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+
     static {
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
@@ -131,6 +138,7 @@
     private final AbstractNameQuery corbaGBeanObjectName;
     private final Naming naming;
     private final Collection<? extends ArtifactResolver> artifactResolvers;
+    private final BundleContext bundleContext;
 
     public static ThreadLocal<Boolean> createPlanMode = new ThreadLocal<Boolean>() {
         @Override
@@ -146,21 +154,62 @@
         }
     };
 
-    public EARConfigBuilder(Environment defaultEnvironment,
-                            AbstractNameQuery transactionManagerAbstractName,
-                            AbstractNameQuery connectionTrackerAbstractName,
-                            AbstractNameQuery corbaGBeanAbstractName,
-                            AbstractNameQuery serverName,
-                            Collection<? extends Repository> repositories,
-                            Collection<ModuleBuilder> ejbConfigBuilder,
-                            Collection<ModuleBuilder> webConfigBuilder,
-                            Collection<ModuleBuilder> connectorConfigBuilder,
-                            Collection<ModuleBuilder> resourceReferenceBuilder,
-                            Collection<ModuleBuilder> appClientConfigBuilder,
-                            Collection<NamespaceDrivenBuilder> serviceBuilders,
-                            Collection<ModuleBuilderExtension> persistenceUnitBuilders,
-                            Collection<? extends ArtifactResolver> artifactResolvers,
-                            Kernel kernel) {
+//    static {
+//        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EARConfigBuilder.class, NameFactory.CONFIG_BUILDER);
+//        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+//        infoBuilder.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class, true);
+//        infoBuilder.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class, true);
+//        infoBuilder.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
+//        infoBuilder.addAttribute("serverName", AbstractNameQuery.class, true);
+//
+//        infoBuilder.addReference("Repositories", Repository.class, "Repository");
+//        infoBuilder.addReference("EJBConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+//        infoBuilder.addReference("WebConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+//        infoBuilder.addReference("ConnectorConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+//        infoBuilder.addReference("ActivationSpecInfoLocator", ActivationSpecInfoLocator.class, NameFactory.MODULE_BUILDER);
+//        infoBuilder.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+//        infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
+//        infoBuilder.addReference("PersistenceUnitBuilders", ModuleBuilderExtension.class, NameFactory.MODULE_BUILDER);
+//        infoBuilder.addReference("ArtifactResolvers", ArtifactResolver.class, "ArtifactResolver");
+//
+//        infoBuilder.addAttribute("kernel", Kernel.class, false);
+//
+//        infoBuilder.setConstructor(new String[]{
+//                "defaultEnvironment",
+//                "transactionManagerAbstractName",
+//                "connectionTrackerAbstractName",
+//                "corbaGBeanAbstractName",
+//                "serverName",
+//                "Repositories",
+//                "EJBConfigBuilder",
+//                "WebConfigBuilder",
+//                "ConnectorConfigBuilder",
+//                "ActivationSpecInfoLocator",
+//                "AppClientConfigBuilder",
+//                "ServiceBuilders",
+//                "PersistenceUnitBuilders",
+//                "ArtifactResolvers",
+//                "kernel"
+//        });
+//
+//    }
+
+    public EARConfigBuilder(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
+                            @ParamAttribute(name = "transactionManagerAbstractName") AbstractNameQuery transactionManagerAbstractName,
+                            @ParamAttribute(name = "connectionTrackerAbstractName") AbstractNameQuery connectionTrackerAbstractName,
+                            @ParamAttribute(name = "corbaGBeanAbstractName") AbstractNameQuery corbaGBeanAbstractName,
+                            @ParamAttribute(name = "serverName") AbstractNameQuery serverName,
+                            @ParamReference(name = "Repositories", namingType = "Repository")Collection<? extends Repository> repositories,
+                            @ParamReference(name = "EJBConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> ejbConfigBuilder,
+                            @ParamReference(name = "WebConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> webConfigBuilder,
+                            @ParamReference(name = "ConnectorConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> connectorConfigBuilder,
+                            @ParamReference(name = "ActivationSpecInfoLocator", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> resourceReferenceBuilder,
+                            @ParamReference(name = "AppClientConfigBuilder", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilder> appClientConfigBuilder,
+                            @ParamReference(name = "ServiceBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<NamespaceDrivenBuilder> serviceBuilders,
+                            @ParamReference(name = "PersistenceUnitBuilders", namingType = NameFactory.MODULE_BUILDER)Collection<ModuleBuilderExtension> persistenceUnitBuilders,
+                            @ParamReference(name = "ArtifactResolvers", namingType = "ArtifactResolver")Collection<? extends ArtifactResolver> artifactResolvers,
+                            @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
+                            @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext) throws GBeanNotFoundException {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
                 connectionTrackerAbstractName,
@@ -175,7 +224,8 @@
                 new SingleElementCollection<ModuleBuilder>(appClientConfigBuilder),
                 serviceBuilders,
                 persistenceUnitBuilders,
-                kernel.getNaming(), artifactResolvers);
+                kernel.getNaming(), artifactResolvers,
+                bundleContext);
     }
 
     public EARConfigBuilder(Environment defaultEnvironment,
@@ -192,7 +242,7 @@
                             NamespaceDrivenBuilder serviceBuilder,
                             ModuleBuilderExtension persistenceUnitBuilder,
                             Naming naming,
-                            Collection<? extends ArtifactResolver> artifactResolvers) {
+                            Collection<? extends ArtifactResolver> artifactResolvers, BundleContext bundleContext) {
         this(defaultEnvironment,
                 transactionManagerAbstractName,
                 connectionTrackerAbstractName,
@@ -208,7 +258,8 @@
                 serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet() : Collections.singleton(serviceBuilder),
                 persistenceUnitBuilder == null ? Collections.<ModuleBuilderExtension>emptySet() : Collections.singleton(persistenceUnitBuilder),
                 naming,
-                artifactResolvers);
+                artifactResolvers,
+                bundleContext);
     }
 
     private EARConfigBuilder(Environment defaultEnvironment,
@@ -226,7 +277,8 @@
                              Collection<NamespaceDrivenBuilder> serviceBuilders,
                              Collection<ModuleBuilderExtension> persistenceUnitBuilders,
                              Naming naming,
-                             Collection<? extends ArtifactResolver> artifactResolvers) {
+                             Collection<? extends ArtifactResolver> artifactResolvers,
+                             BundleContext bundleContext) {
         this.configurationManager = configurationManager;
         this.repositories = repositories;
         this.defaultEnvironment = defaultEnvironment;
@@ -238,13 +290,14 @@
         this.appClientConfigBuilder = appClientConfigBuilder;
         this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
         this.persistenceUnitBuilders = persistenceUnitBuilders;
-        
+
         this.transactionManagerObjectName = transactionManagerAbstractName;
         this.connectionTrackerObjectName = connectionTrackerAbstractName;
         this.corbaGBeanObjectName = corbaGBeanAbstractName;
         this.serverName = serverName;
         this.naming = naming;
         this.artifactResolvers = artifactResolvers;
+        this.bundleContext = bundleContext;
     }
 
     public void doStart() throws Exception {
@@ -313,7 +366,7 @@
         if (module instanceof ApplicationInfo) {
             return module;
         }
-        
+
         return new ApplicationInfo(module.getType(),
                 module.getEnvironment(),
                 module.getModuleName(),
@@ -514,7 +567,7 @@
 
             ConfigurationManager configurationManager = this.configurationManager;
             if (configurationManager == null) {
-                configurationManager = new SimpleConfigurationManager(configurationStores, artifactResolver, repositories);
+                configurationManager = new SimpleConfigurationManager(configurationStores, artifactResolver, repositories, bundleContext);
             }
 
             // Create the output ear context
@@ -524,7 +577,7 @@
                     applicationType,
                     naming,
                     configurationManager,
-                    repositories,
+                    bundleContext,
                     serverName,
                     applicationInfo.getModuleName(),
                     transactionManagerObjectName,
@@ -569,27 +622,30 @@
             GerApplicationType geronimoApplication = (GerApplicationType) applicationInfo.getVendorDD();
 
             // each module installs it's files into the output context.. this is different for each module type
-            LinkedHashSet modules = applicationInfo.getModules();
-            for (Object module2 : modules) {
-                Module module = (Module) module2;
+            for (Module module : applicationInfo.getModules()) {
                 getBuilder(module).installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);
             }
 
             earContext.flush();
+            earContext.initializeConfiguration();
+            for (Module module : applicationInfo.getModules()) {
+                if (earContext != module.getEarContext()) {
+                    module.getEarContext().initializeConfiguration();
+                }
+            }
 
             // give each module a chance to populate the earContext now that a classloader is available
-            ClassLoader cl = earContext.getClassLoader();
-            for (Object module3 : modules) {
-                Module module = (Module) module3;
+            Bundle bundle = earContext.getBundle();
+            for (Module module : applicationInfo.getModules()) {
                 if (createPlanMode.get()) {
                     try {
-                        getBuilder(module).initContext(earContext, module, cl);
+                        getBuilder(module).initContext(earContext, module, bundle);
                     } catch (Exception e) {
                         // ignore any exceptions to continue processing with the rest of the modules;
                         System.out.println("Exception during initContext() phase");
                     }
                 } else {
-                    getBuilder(module).initContext(earContext, module, cl);
+                    getBuilder(module).initContext(earContext, module, bundle);
                 }
             }
 
@@ -597,14 +653,14 @@
             if (geronimoApplication != null) {
                 serviceBuilders.build(geronimoApplication, earContext, earContext);
             }
-            
+
             if (ConfigurationModuleType.EAR == applicationType) {
                 // process persistence unit in EAR library directory
                 earContext.getGeneralData().put(ClassPathList.class, libClasspath);
-                for (ModuleBuilderExtension mbe: persistenceUnitBuilders) {
-                    mbe.initContext(earContext, applicationInfo, earContext.getClassLoader());
+                for (ModuleBuilderExtension mbe : persistenceUnitBuilders) {
+                    mbe.initContext(earContext, applicationInfo, earContext.getBundle());
                 }
-                
+
                 // Create the J2EEApplication managed object
                 GBeanData gbeanData = new GBeanData(earContext.getModuleName(), J2EEApplicationImpl.GBEAN_INFO);
                 try {
@@ -639,17 +695,16 @@
             }
 
             // each module can now add it's GBeans
-            for (Object module1 : modules) {
-                Module module = (Module) module1;
+            for (Module module : applicationInfo.getModules()) {
                 if (createPlanMode.get()) {
                     try {
-                        getBuilder(module).addGBeans(earContext, module, cl, repositories);
+                        getBuilder(module).addGBeans(earContext, module, bundle, repositories);
                     } catch (DeploymentException e) {
                         // ignore any exceptions to continue processing with the rest of the modules;
                         System.out.println("Exception during addGBeans() phase");
                     }
                 } else {
-                    getBuilder(module).addGBeans(earContext, module, cl, repositories);
+                    getBuilder(module).addGBeans(earContext, module, bundle, repositories);
                 }
             }
 
@@ -1105,51 +1160,4 @@
         throw new IllegalArgumentException("Unknown module type: " + module.getClass().getName());
     }
 
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EARConfigBuilder.class, NameFactory.CONFIG_BUILDER);
-        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoBuilder.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class, true);
-        infoBuilder.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class, true);
-        infoBuilder.addAttribute("corbaGBeanAbstractName", AbstractNameQuery.class, true);
-        infoBuilder.addAttribute("serverName", AbstractNameQuery.class, true);
-
-        infoBuilder.addReference("Repositories", Repository.class, "Repository");
-        infoBuilder.addReference("EJBConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("WebConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("ConnectorConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("ActivationSpecInfoLocator", ActivationSpecInfoLocator.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("AppClientConfigBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("PersistenceUnitBuilders", ModuleBuilderExtension.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("ArtifactResolvers", ArtifactResolver.class, "ArtifactResolver");
-
-        infoBuilder.addAttribute("kernel", Kernel.class, false);
-
-        infoBuilder.setConstructor(new String[]{
-                "defaultEnvironment",
-                "transactionManagerAbstractName",
-                "connectionTrackerAbstractName",
-                "corbaGBeanAbstractName",
-                "serverName",
-                "Repositories",
-                "EJBConfigBuilder",
-                "WebConfigBuilder",
-                "ConnectorConfigBuilder",
-                "ActivationSpecInfoLocator",
-                "AppClientConfigBuilder",
-                "ServiceBuilders",
-                "PersistenceUnitBuilders",
-                "ArtifactResolvers",
-                "kernel"
-        });
-
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java Sat Oct 17 08:06:02 2009
@@ -17,7 +17,6 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import java.io.File;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,6 +28,7 @@
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.osgi.framework.BundleContext;
 
 /**
  * @version $Rev:386276 $ $Date$
@@ -54,14 +54,14 @@
                       ConfigurationModuleType moduleType,
                       Naming naming,
                       ConfigurationManager configurationManager,
-                      Collection repositories,
+                      BundleContext bundleContext,
                       AbstractNameQuery serverName,
                       AbstractName baseName,
                       AbstractNameQuery transactionManagerObjectName,
                       AbstractNameQuery connectionTrackerObjectName,
                       AbstractNameQuery corbaGBeanObjectName
     ) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager, repositories);
+        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager, bundleContext);
 
         this.serverName = serverName;
         this.transactionManagerObjectName = transactionManagerObjectName;
@@ -70,30 +70,30 @@
         this.messageDestinations = new HashMap();
     }
 
-    public EARContext(File baseDir,
-                      File inPlaceConfigurationDir,
-                      Environment environment,
-                      ConfigurationModuleType moduleType,
-                      Naming naming,
-                      ConfigurationManager configurationManager,
-                      AbstractNameQuery serverName,
-                      AbstractName baseName,
-                      AbstractNameQuery transactionManagerObjectName,
-                      AbstractNameQuery connectionTrackerObjectName,
-                      AbstractNameQuery corbaGBeanObjectName,
-                      Map messageDestinations) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager);
-
-        this.serverName = serverName;
-
-        this.transactionManagerObjectName = transactionManagerObjectName;
-        this.connectionTrackerObjectName = connectionTrackerObjectName;
-        this.corbaGBeanObjectName = corbaGBeanObjectName;
-        this.messageDestinations = messageDestinations;
-    }
+//    public EARContext(File baseDir,
+//                      File inPlaceConfigurationDir,
+//                      Environment environment,
+//                      ConfigurationModuleType moduleType,
+//                      Naming naming,
+//                      ConfigurationManager configurationManager,
+//                      AbstractNameQuery serverName,
+//                      AbstractName baseName,
+//                      AbstractNameQuery transactionManagerObjectName,
+//                      AbstractNameQuery connectionTrackerObjectName,
+//                      AbstractNameQuery corbaGBeanObjectName,
+//                      Map messageDestinations) throws DeploymentException {
+//        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, naming, configurationManager);
+//
+//        this.serverName = serverName;
+//
+//        this.transactionManagerObjectName = transactionManagerObjectName;
+//        this.connectionTrackerObjectName = connectionTrackerObjectName;
+//        this.corbaGBeanObjectName = corbaGBeanObjectName;
+//        this.messageDestinations = messageDestinations;
+//    }
 
     public EARContext(File baseDir, File inPlaceConfigurationDir, Environment environment, ConfigurationModuleType moduleType, AbstractName baseName, EARContext parent) throws DeploymentException {
-        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, parent.getNaming(), parent.getConfigurationManager());
+        super(baseDir, inPlaceConfigurationDir, environment, baseName, moduleType, parent.getNaming(), parent.getConfigurationManager(), parent.getBundle().getBundleContext());
         this.serverName = parent.getServerName();
 
         this.transactionManagerObjectName = parent.getTransactionManagerName();

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Sat Oct 17 08:06:02 2009
@@ -42,9 +42,9 @@
         return ConfigurationModuleType.EJB;
     }
 
-    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
-        context.addClass(location, fqcn, bytes);
-    }
+//    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
+//        context.addClass(location, fqcn, bytes);
+//    }
 
     public AbstractName getModuleCmpEngineName() {
         return moduleCmpEngineName;

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java Sat Oct 17 08:06:02 2009
@@ -27,6 +27,7 @@
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev:386276 $ $Date$
@@ -38,9 +39,9 @@
 
     void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException;
 
-    void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException;
+    void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException;
 
-    void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException;
+    void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException;
 
     String getSchemaNamespace();
 }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilderExtension.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilderExtension.java Sat Oct 17 08:06:02 2009
@@ -26,6 +26,7 @@
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -35,7 +36,7 @@
 
     void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException;
 
-    void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException;
+    void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException;
 
     void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException;
 }

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -32,6 +32,7 @@
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
 
 import java.io.File;
 import java.io.IOException;
@@ -153,16 +154,16 @@
         builder.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);
     }
 
-    public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
+    public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
         String namespace = module.getNamespace();
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
-        builder.initContext(earContext, module, cl);
+        builder.initContext(earContext, module, bundle);
     }
 
-    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repositories) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repositories) throws DeploymentException {
         String namespace = module.getNamespace();
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
-        builder.addGBeans(earContext, module, cl, repositories);
+        builder.addGBeans(earContext, module, bundle, repositories);
     }
 
     public String getSchemaNamespace() {

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -30,6 +30,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -48,11 +49,11 @@
         throw new DeploymentException("Module type unavailable");
     }
 
-    public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
+    public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
         throw new DeploymentException("Module type unavailable");
     }
 
-    public void addGBeans(EARContext earContext, Module module, ClassLoader cl, Collection repository) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
         throw new DeploymentException("Module type unavailable");
     }
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigBean.java Sat Oct 17 08:06:02 2009
@@ -19,13 +19,13 @@
 
 import javax.enterprise.deploy.model.DDBean;
 
-import org.apache.geronimo.deployment.plugin.DConfigBeanSupport;
+import org.apache.geronimo.deployment.dconfigbean.DConfigBeanSupport;
 import org.apache.xmlbeans.SchemaTypeLoader;
 
 /**
  *
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date$                                                   
  */
 public class EARConfigBean extends DConfigBeanSupport {
     public EARConfigBean(DDBean ddBean) {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfiguration.java Sat Oct 17 08:06:02 2009
@@ -19,14 +19,14 @@
 
 import javax.enterprise.deploy.model.DeployableObject;
 
-import org.apache.geronimo.deployment.plugin.DeploymentConfigurationSupport;
+import org.apache.geronimo.deployment.dconfigbean.DeploymentConfigurationSupport;
 
 /**
  *
  *
  * @version $Rev$ $Date$
  */
-public class EARConfiguration extends DeploymentConfigurationSupport{
+public class EARConfiguration extends DeploymentConfigurationSupport {
     public EARConfiguration(DeployableObject deployable) {
         super(deployable, null);
     }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java Sat Oct 17 08:06:02 2009
@@ -20,12 +20,10 @@
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
-
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.jsr88.EARConfiguration;
 
 /**
  *

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for naked J2EE 1.3.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "test-ejb-jar.jar", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for J2EE 1.3.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "test-ejb-jar.jar", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for J2EE 1.4 using alt-dd..
@@ -27,17 +28,20 @@
     extends EARConfigBuilderTestSupport
 {
     protected void setUp() throws Exception {
+        super.setUp();
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
         connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null, null);
     }
 
-    protected void tearDown() {
+    protected void tearDown() throws Exception {
         DeploymentUtil.close(earFile);
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
+        super.tearDown();
     }
 }

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for J2EE 1.4 using alt-dd unpacked..
@@ -27,17 +28,20 @@
     extends EARConfigBuilderTestSupport
 {
     protected void setUp() throws Exception {
+        super.setUp();
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
         connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
-    protected void tearDown() {
+    protected void tearDown() throws Exception {
         DeploymentUtil.close(earFile);
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
+        super.tearDown();
     }
 }

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for naked J2EE 1.4.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "test-ejb-jar.jar", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for naked J2EE 1.4 unpacked.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for J2EE 1.4.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "ejb.jar", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for J2EE 1.4 unpacked.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for JAVAEE 5 using alt-dd..
@@ -27,17 +28,20 @@
     extends EARConfigBuilderTestSupport
 {
     protected void setUp() throws Exception {
+        super.setUp();
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
         connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null, null);
     }
 
-    protected void tearDown() {
+    protected void tearDown() throws Exception {
         DeploymentUtil.close(earFile);
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
+        super.tearDown();
     }
 }

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for JAVAEE 5 using alt-dd unpacked..
@@ -27,17 +28,20 @@
     extends EARConfigBuilderTestSupport
 {
     protected void setUp() throws Exception {
+        super.setUp();
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);
         connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
-    protected void tearDown() {
+    protected void tearDown() throws Exception {
         DeploymentUtil.close(earFile);
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
+        super.tearDown();
     }
 }

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for naked JAVAEE 5.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "test-ejb-jar.jar", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for naked JAVAEE 5 unpacked.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for JAVAEE 5.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "ejb.jar", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -17,6 +17,7 @@
 package org.apache.geronimo.j2ee.deployment;
 
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.kernel.repository.Artifact;
 
 /**
  * EAR config builder tests for JAVAEE 5 unpacked.
@@ -30,6 +31,7 @@
         super.setUp();
 
         earFile = DeploymentUtil.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, "ejb.jar/", null, null, null, null);
         webConfigBuilder.contextRoot = contextRoot;
         webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, WEB_NAMESPACE, null);

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.HashMap;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.common.DeploymentException;
@@ -34,9 +35,11 @@
 import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.mock.MockConfigStore;
 import org.apache.geronimo.kernel.mock.MockRepository;
+import org.apache.geronimo.kernel.mock.MockConfigurationManager;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactManager;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
@@ -103,6 +106,9 @@
     
     protected static final AbstractName raModuleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
 
+
+    protected Map<String, Artifact> locations = new HashMap<String, Artifact>();
+
     protected Environment defaultParentId;
     
     protected static String contextRoot = "test";
@@ -116,11 +122,13 @@
     protected final AbstractNameQuery corbaGBeanAbstractNameQuery = new AbstractNameQuery(serverName, null);
 
     private ListableRepository repository;
-    protected ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.singleton(repository), null);
+    protected ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, repository);
     protected Collection<? extends ArtifactResolver> artifactResolvers = Collections.singleton(new DefaultArtifactResolver(artifactManager, repository));
 
     protected void setUp() throws Exception {
         super.setUp();
+        bundleContext = new MockBundleContext(getClass().getClassLoader(), "", new HashMap<Artifact, ConfigurationData>(), locations);
+        ((MockBundleContext)bundleContext).setConfigurationManager(new MockConfigurationManager());
         Set<Artifact> repo = new HashSet<Artifact>();
         repo.add(Artifact.create("org.apache.geronimo.tests/test/1/car"));
         repository = new MockRepository(repo);
@@ -145,7 +153,9 @@
                     appClientConfigBuilder,
                     serviceBuilder,
                     persistenceUnitBuilder,
-                    naming, artifactResolvers);
+                    naming,
+                    artifactResolvers,
+                    bundleContext);
 
             Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
@@ -174,7 +184,7 @@
                 appClientConfigBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming, artifactResolvers);
+                naming, artifactResolvers, bundleContext);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -209,7 +219,7 @@
                 appClientConfigBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming, artifactResolvers);
+                naming, artifactResolvers, bundleContext);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -244,7 +254,7 @@
                 appClientConfigBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming, artifactResolvers);
+                naming, artifactResolvers, bundleContext);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -279,7 +289,7 @@
                 appClientConfigBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming, artifactResolvers);
+                naming, artifactResolvers, bundleContext);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -314,7 +324,7 @@
                 appClientConfigBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming, artifactResolvers);
+                naming, artifactResolvers, bundleContext);
 
 
         ConfigurationData configurationData = null;
@@ -350,7 +360,7 @@
                 appClientConfigBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming, artifactResolvers);
+                naming, artifactResolvers, bundleContext);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;
@@ -385,7 +395,7 @@
                 appClientConfigBuilder,
                 serviceBuilder,
                 persistenceUnitBuilder,
-                naming, artifactResolvers);
+                naming, artifactResolvers, bundleContext);
 
         ConfigurationData configurationData = null;
         DeploymentContext context = null;

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -28,6 +28,7 @@
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.osgi.framework.Bundle;
 
 import javax.management.ObjectName;
 import javax.naming.Reference;
@@ -41,7 +42,7 @@
  */
 public class MockConnectorConfigBuilder extends Assert implements ModuleBuilder, ActivationSpecInfoLocator {
     private EARContext earContext;
-    private ClassLoader cl;
+    private Bundle bundle;
     public Module connectorModule;
 
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
@@ -59,6 +60,7 @@
         assertNotNull(earFile);
         assertNotNull(earContext);
         this.earContext = earContext;
+        connectorModule.setEarContext(earContext);
 //        assertEquals(this.connectorModule, connectorModule);
 //        if ( null != this.connectorModule.getAltSpecDD() ) {
 //            assertEquals(this.connectorModule.getAltSpecDD(), connectorModule.getAltSpecDD());
@@ -68,17 +70,17 @@
 //        }
     }
 
-    public void initContext(EARContext earContext, Module connectorModule, ClassLoader cl) {
+    public void initContext(EARContext earContext, Module connectorModule, Bundle bundle) {
         assertEquals(this.earContext, earContext);
 //        assertEquals(this.connectorModule, connectorModule);
-        assertNotNull(cl);
-        this.cl = cl;
+        assertNotNull(bundle);
+        this.bundle = bundle;
     }
 
-    public void addGBeans(EARContext earContext, Module connectorModule, ClassLoader cl, Collection repository) {
+    public void addGBeans(EARContext earContext, Module connectorModule, Bundle bundle, Collection repository) {
         assertEquals(this.earContext, earContext);
 //        assertEquals(this.connectorModule, connectorModule);
-        assertEquals(this.cl, cl);
+        assertEquals(this.bundle, bundle);
     }
 
     public String getSchemaNamespace() {

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -25,6 +25,7 @@
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.osgi.framework.Bundle;
 
 import java.io.File;
 import java.net.URL;
@@ -37,7 +38,7 @@
  */
 public class MockEJBConfigBuilder extends Assert implements ModuleBuilder {
     private EARContext earContext;
-    private ClassLoader cl;
+    private Bundle bundle;
     public EJBModule ejbModule;
 
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
@@ -55,6 +56,7 @@
         assertNotNull(earFile);
         assertNotNull(earContext);
         this.earContext = earContext;
+        ejbModule.setEarContext(earContext);
 //        assertEquals(this.ejbModule, ejbModule);
 //        if ( null != this.ejbModule.getAltSpecDD() ) {
 //            assertEquals(this.ejbModule.getAltSpecDD(), ejbModule.getAltSpecDD());
@@ -64,17 +66,17 @@
 //        }
     }
 
-    public void initContext(EARContext earContext, Module ejbModule, ClassLoader cl) {
+    public void initContext(EARContext earContext, Module ejbModule, Bundle bundle) {
         assertEquals(this.earContext, earContext);
 //        assertEquals(this.ejbModule, ejbModule);
-        assertNotNull(cl);
-        this.cl = cl;
+        assertNotNull(bundle);
+        this.bundle = bundle;
     }
 
-    public void addGBeans(EARContext earContext, Module ejbModule, ClassLoader cl, Collection repository) {
+    public void addGBeans(EARContext earContext, Module ejbModule, Bundle bundle, Collection repository) {
         assertEquals(this.earContext, earContext);
 //        assertEquals(this.ejbModule, ejbModule);
-        assertEquals(this.cl, cl);
+        assertEquals(this.bundle, bundle);
     }
 
     public String getSchemaNamespace() {

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -25,6 +25,7 @@
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.osgi.framework.Bundle;
 
 import java.io.File;
 import java.net.URL;
@@ -37,7 +38,7 @@
  */
 public class MockWARConfigBuilder extends Assert implements ModuleBuilder {
     private EARContext earContext;
-    private ClassLoader cl;
+    private Bundle bundle;
     private Map portMap = null;
     private String namespace = "foo";
     public WebModule webModule;
@@ -58,6 +59,7 @@
         assertNotNull(earFile);
         assertNotNull(earContext);
         this.earContext = earContext;
+        webModule.setEarContext(earContext);
 //        assertEquals(this.webModule, webModule);
 //        if ( null != this.webModule.getAltSpecDD() ) {
 //            assertEquals(this.webModule.getAltSpecDD(), webModule.getAltSpecDD());
@@ -67,17 +69,17 @@
 //        }
     }
 
-    public void initContext(EARContext earContext, Module webModule, ClassLoader cl) {
+    public void initContext(EARContext earContext, Module webModule, Bundle bundle) {
         assertEquals(this.earContext, earContext);
 //        assertEquals(this.webModule, webModule);
-        assertNotNull(cl);
-        this.cl = cl;
+        assertNotNull(bundle);
+        this.bundle = bundle;
     }
 
-    public void addGBeans(EARContext earContext, Module webModule, ClassLoader cl, Collection repository) throws DeploymentException {
+    public void addGBeans(EARContext earContext, Module webModule, Bundle bundle, Collection repository) throws DeploymentException {
         assertEquals(this.earContext, earContext);
 //        assertEquals(this.webModule, webModule);
-        assertEquals(this.cl, cl);
+        assertEquals(this.bundle, bundle);
         assertNotNull(contextRoot);
         this.contextRoot = ((WebModule) webModule).getContextRoot();
     }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml Sat Oct 17 08:06:02 2009
@@ -41,6 +41,11 @@
             <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <!-- g-jta_1.1_spec comes from this -->
         <dependency>

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=826191&r1=826190&r2=826191&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 Sat Oct 17 08:06:02 2009
@@ -40,6 +40,7 @@
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
+import org.osgi.framework.Bundle;
 
 /**
  * @version $Rev$ $Date$
@@ -78,10 +79,10 @@
             if (interfaceTypes.isEmpty()) {
                 interfaceTypes.add(gBeanData.getGBeanInfo().getClassName());
             }
-            ClassLoader cl = module.getEarContext().getClassLoader();
+            Bundle bundle = module.getEarContext().getBundle();
             Class gBeanType;
             try {
-                gBeanType = ClassLoading.loadClass(gBeanData.getGBeanInfo().getClassName(), cl);
+                gBeanType = ClassLoading.loadClass(gBeanData.getGBeanInfo().getClassName(), bundle);
             } catch (ClassNotFoundException e) {
                 throw new DeploymentException("Cannot load GBean class", e);
             }

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java?rev=826191&r1=826190&r2=826191&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LocalRefDConfigBean.java Sat Oct 17 08:06:02 2009
@@ -19,7 +19,7 @@
 
 import javax.enterprise.deploy.model.DDBean;
 
-import org.apache.geronimo.deployment.plugin.DConfigBeanSupport;
+import org.apache.geronimo.deployment.dconfigbean.DConfigBeanSupport;
 
 import org.apache.xmlbeans.SchemaTypeLoader;
 import org.apache.xmlbeans.XmlObject;



Mime
View raw message