geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r887511 - in /geronimo/server/trunk/plugins: ./ activemq/ connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ console/console-core/src/main/java/org/apache/geronimo/console/gbean/ console/con...
Date Sat, 05 Dec 2009 07:53:45 GMT
Author: djencks
Date: Sat Dec  5 07:53:43 2009
New Revision: 887511

URL: http://svn.apache.org/viewvc?rev=887511&view=rev
Log:
GERONIMO-4965.  Get base console to compile. Simplify how locations in car are computed slightly, this needs to be ported to openejb and probably myfaces module bundlers

Added:
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/gbean/
      - copied from r886878, geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/gbean/
Removed:
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/gbean/
Modified:
    geronimo/server/trunk/plugins/activemq/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
    geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/pluto/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Sat Dec  5 07:53:43 2009
@@ -110,6 +110,10 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>backport-util-concurrent</groupId>
+                        <artifactId>backport-util-concurrent</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sat Dec  5 07:53:43 2009
@@ -397,11 +397,10 @@
             // See AbstractWebModuleBuilder.
             earContext.addManifestClassPath(moduleFile, URI.create(module.getTargetPath()));
 
-            URI targetURI = URI.create(module.getTargetPath() + "/");
             Enumeration entries = moduleFile.entries();
             while (entries.hasMoreElements()) {
                 ZipEntry entry = (ZipEntry) entries.nextElement();
-                URI target = targetURI.resolve(entry.getName());
+                URI target = module.resolve(entry.getName());
                 if (entry.getName().endsWith(".jar")) {
                     earContext.addInclude(target, moduleFile, entry);
                 } else {
@@ -530,6 +529,8 @@
 
     public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
         //all our gbeans are added in  the initContext step
+        //in case we decide connectors should be separate bundles
+        module.addAsChildConfiguration();
     }
 
     public String getSchemaNamespace() {

Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml Sat Dec  5 07:53:43 2009
@@ -12,8 +12,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>dwr</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -23,11 +23,21 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty7</artifactId>
+        <artifactId>jetty8</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-security</artifactId>
         <type>car</type>
     </dependency>
@@ -42,8 +52,8 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.directwebremoting</groupId>
-        <artifactId>dwr</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Sat Dec  5 07:53:43 2009
@@ -37,6 +37,13 @@
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-filter</artifactId>
             <version>${version}</version>
+            <!--<scope>provided</scope>-->
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- for jspc maven plugin -->

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml Sat Dec  5 07:53:43 2009
@@ -13,11 +13,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml Sat Dec  5 07:53:43 2009
@@ -13,11 +13,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Sat Dec  5 07:53:43 2009
@@ -80,6 +80,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Sat Dec  5 07:53:43 2009
@@ -23,11 +23,13 @@
 
 import org.apache.xmlbeans.XmlObject;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
+import org.apache.geronimo.common.DeploymentException;
 import org.apache.xbean.finder.ClassFinder;
 
 /**
@@ -115,6 +117,14 @@
         return targetPathURI;
     }
 
+    public URI resolve(String path) {
+        return targetPathURI.resolve(path);
+    }
+    
+    public URI resolve(URI path) {
+        return targetPathURI.resolve(path);
+    }
+
     public XmlObject getSpecDD() {
         return specDD;
     }
@@ -219,5 +229,12 @@
     public String getRelativePath(String path) {
         return path;
     }
+
+    public void addAsChildConfiguration() throws DeploymentException {
+        if (rootEarContext != null && rootEarContext != earContext) {
+            ConfigurationData moduleConfigurationData = earContext.getConfigurationData();
+            rootEarContext.addChildConfiguration(getTargetPath(), moduleConfigurationData);
+        }
+    }
     
 }

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=887511&r1=887510&r2=887511&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 Sat Dec  5 07:53:43 2009
@@ -45,7 +45,7 @@
     }
 
     public String getRelativePath(String path) {
-        if (isStandAlone()) {
+        if (isStandAlone() || getRootEarContext() == getEarContext()) {
             return path;
         }
         if (path.startsWith(getTargetPath())) {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Sat Dec  5 07:53:43 2009
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -157,7 +156,7 @@
         this.namingBuilders = namingBuilders;
         this.resourceEnvironmentSetter = resourceEnvironmentSetter;
         this.webServiceBuilder = webServiceBuilder;
-        this.moduleBuilderExtensions = moduleBuilderExtensions == null? new ArrayList<ModuleBuilderExtension>(): moduleBuilderExtensions;
+        this.moduleBuilderExtensions = moduleBuilderExtensions == null ? new ArrayList<ModuleBuilderExtension>() : moduleBuilderExtensions;
     }
 
     static {
@@ -183,7 +182,7 @@
     }
 
     private void addDependencies(LinkedHashSet<GBeanData> dependencies, GBeanData webModuleData) {
-        for (GBeanData dependency: dependencies) {
+        for (GBeanData dependency : dependencies) {
             AbstractName dependencyName = dependency.getAbstractName();
             webModuleData.addDependency(dependencyName);
         }
@@ -210,7 +209,7 @@
     protected Map<String, String> buildServletNameToPathMap(WebAppType webApp, String contextRoot) {
         if (contextRoot == null) {
             contextRoot = "";
-        } else if (!contextRoot.startsWith("/")) {        
+        } else if (!contextRoot.startsWith("/")) {
             contextRoot = "/" + contextRoot;
         }
         Map<String, String> map = new HashMap<String, String>();
@@ -259,7 +258,8 @@
 
     public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
         EARContext moduleContext;
-        if (module.isStandAlone()) {
+        //TODO GERONIMO-4972 find a way to create working nested bundles.
+        if (true || module.isStandAlone()) {
             moduleContext = earContext;
         } else {
             Environment environment = module.getEnvironment();
@@ -298,7 +298,7 @@
             List<ZipEntry> libs = new ArrayList<ZipEntry>();
             while (entries.hasMoreElements()) {
                 ZipEntry entry = entries.nextElement();
-                URI targetPath = new URI(null, entry.getName(), null);
+                URI targetPath = module.resolve(entry.getName());
                 if (entry.getName().equals("WEB-INF/web.xml")) {
                     moduleContext.addFile(targetPath, module.getOriginalSpecDD());
                 } else if (entry.getName().startsWith("WEB-INF/lib") && entry.getName().endsWith(".jar")) {
@@ -313,12 +313,12 @@
             // always add WEB-INF/classes to the classpath regardless of whether
             // any classes exist.  This must be searched BEFORE the WEB-INF/lib jar files,
             // per the servlet specifications.
-            moduleContext.addToClassPath("WEB-INF/classes/");
+            moduleContext.addToClassPath(module.resolve("WEB-INF/classes/").getPath());
             manifestcp.add("WEB-INF/classes/");
 
             // install the libs
             for (ZipEntry entry : libs) {
-                URI targetPath = new URI(null, entry.getName(), null);
+                URI targetPath = module.resolve(entry.getName());
                 moduleContext.addInclude(targetPath, warFile, entry);
                 manifestcp.add(entry.getName());
             }
@@ -326,13 +326,14 @@
             // add the manifest classpath entries declared in the war to the class loader
             // we have to explicitly add these since we are unpacking the web module
             // and the url class loader will not pick up a manifest from an unpacked dir
+            //GERONIMO-4972 this can't be correct for one-bundle deployments.
             moduleContext.addManifestClassPath(warFile, RELATIVE_MODULE_BASE_URI);
             moduleContext.getGeneralData().put(ClassPathList.class, manifestcp);
 
         } catch (IOException e) {
             throw new DeploymentException("Problem deploying war", e);
-        } catch (URISyntaxException e) {
-            throw new DeploymentException("Could not construct URI for location of war entry", e);
+//        } catch (URISyntaxException e) {
+//            throw new DeploymentException("Could not construct URI for location of war entry", e);
         } finally {
             if (!module.isStandAlone()) {
                 try {
@@ -342,7 +343,7 @@
                 }
             }
         }
-        for (ModuleBuilderExtension mbe: moduleBuilderExtensions) {
+        for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
             mbe.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);
         }
     }
@@ -458,7 +459,7 @@
                             cursor.push();
                             if (cursor.toChild(SchemaConversionUtils.JAVAEE_NAMESPACE, "jsp-file")) {
                                 String jspFile = cursor.getTextValue();
-                                if (!jspFile.startsWith("/")){
+                                if (!jspFile.startsWith("/")) {
                                     if (is22) {
                                         cursor.setTextValue("/" + jspFile);
                                     } else {
@@ -762,184 +763,184 @@
         }
 
         public void close() throws XMLStreamException {
-                 delegate.close();
-            }
+            delegate.close();
+        }
 
-            public int getAttributeCount() {
-                return  delegate.getAttributeCount();
-            }
+        public int getAttributeCount() {
+            return delegate.getAttributeCount();
+        }
 
-            public String getAttributeLocalName(int i) {
-                return  delegate.getAttributeLocalName(i);
-            }
+        public String getAttributeLocalName(int i) {
+            return delegate.getAttributeLocalName(i);
+        }
 
-            public QName getAttributeName(int i) {
-                return  delegate.getAttributeName(i);
-            }
+        public QName getAttributeName(int i) {
+            return delegate.getAttributeName(i);
+        }
 
-            public String getAttributeNamespace(int i) {
-                return  delegate.getAttributeNamespace(i);
-            }
+        public String getAttributeNamespace(int i) {
+            return delegate.getAttributeNamespace(i);
+        }
 
-            public String getAttributePrefix(int i) {
-                return  delegate.getAttributePrefix(i);
-            }
+        public String getAttributePrefix(int i) {
+            return delegate.getAttributePrefix(i);
+        }
 
-            public String getAttributeType(int i) {
-                return  delegate.getAttributeType(i);
-            }
+        public String getAttributeType(int i) {
+            return delegate.getAttributeType(i);
+        }
 
-            public String getAttributeValue(int i) {
-                return  delegate.getAttributeValue(i);
-            }
+        public String getAttributeValue(int i) {
+            return delegate.getAttributeValue(i);
+        }
 
-            public String getAttributeValue(String s, String s1) {
-                return  delegate.getAttributeValue(s, s1);
-            }
+        public String getAttributeValue(String s, String s1) {
+            return delegate.getAttributeValue(s, s1);
+        }
 
-            public String getCharacterEncodingScheme() {
-                return  delegate.getCharacterEncodingScheme();
-            }
+        public String getCharacterEncodingScheme() {
+            return delegate.getCharacterEncodingScheme();
+        }
 
-            public String getElementText() throws XMLStreamException {
-                return  delegate.getElementText();
-            }
+        public String getElementText() throws XMLStreamException {
+            return delegate.getElementText();
+        }
 
-            public String getEncoding() {
-                return  delegate.getEncoding();
-            }
+        public String getEncoding() {
+            return delegate.getEncoding();
+        }
 
-            public int getEventType() {
-                return  delegate.getEventType();
-            }
+        public int getEventType() {
+            return delegate.getEventType();
+        }
 
-            public String getLocalName() {
-                return  delegate.getLocalName().intern();
-            }
+        public String getLocalName() {
+            return delegate.getLocalName().intern();
+        }
 
-            public Location getLocation() {
-                return  delegate.getLocation();
-            }
+        public Location getLocation() {
+            return delegate.getLocation();
+        }
 
-            public QName getName() {
-                return  delegate.getName();
-            }
+        public QName getName() {
+            return delegate.getName();
+        }
 
-            public NamespaceContext getNamespaceContext() {
-                return  delegate.getNamespaceContext();
-            }
+        public NamespaceContext getNamespaceContext() {
+            return delegate.getNamespaceContext();
+        }
 
-            public int getNamespaceCount() {
-                return  delegate.getNamespaceCount();
-            }
+        public int getNamespaceCount() {
+            return delegate.getNamespaceCount();
+        }
 
-            public String getNamespacePrefix(int i) {
-                return  delegate.getNamespacePrefix(i);
-            }
+        public String getNamespacePrefix(int i) {
+            return delegate.getNamespacePrefix(i);
+        }
 
-            public String getNamespaceURI() {
-                return  delegate.getNamespaceURI().intern();
-            }
+        public String getNamespaceURI() {
+            return delegate.getNamespaceURI().intern();
+        }
 
-            public String getNamespaceURI(int i) {
-                return  delegate.getNamespaceURI(i);
-            }
+        public String getNamespaceURI(int i) {
+            return delegate.getNamespaceURI(i);
+        }
 
-            public String getNamespaceURI(String s) {
-                return  delegate.getNamespaceURI(s);
-            }
+        public String getNamespaceURI(String s) {
+            return delegate.getNamespaceURI(s);
+        }
 
-            public String getPIData() {
-                return  delegate.getPIData();
-            }
+        public String getPIData() {
+            return delegate.getPIData();
+        }
 
-            public String getPITarget() {
-                return  delegate.getPITarget();
-            }
+        public String getPITarget() {
+            return delegate.getPITarget();
+        }
 
-            public String getPrefix() {
-                return  delegate.getPrefix();
-            }
+        public String getPrefix() {
+            return delegate.getPrefix();
+        }
 
-            public Object getProperty(String s) throws IllegalArgumentException {
-                return  delegate.getProperty(s);
-            }
+        public Object getProperty(String s) throws IllegalArgumentException {
+            return delegate.getProperty(s);
+        }
 
-            public String getText() {
-                return  delegate.getText();
-            }
+        public String getText() {
+            return delegate.getText();
+        }
 
-            public char[] getTextCharacters() {
-                return  delegate.getTextCharacters();
-            }
+        public char[] getTextCharacters() {
+            return delegate.getTextCharacters();
+        }
 
-            public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-                return  delegate.getTextCharacters(i, chars, i1, i2);
-            }
+        public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
+            return delegate.getTextCharacters(i, chars, i1, i2);
+        }
 
-            public int getTextLength() {
-                return  delegate.getTextLength();
-            }
+        public int getTextLength() {
+            return delegate.getTextLength();
+        }
 
-            public int getTextStart() {
-                return  delegate.getTextStart();
-            }
+        public int getTextStart() {
+            return delegate.getTextStart();
+        }
 
-            public String getVersion() {
-                return  delegate.getVersion();
-            }
+        public String getVersion() {
+            return delegate.getVersion();
+        }
 
-            public boolean hasName() {
-                return  delegate.hasName();
-            }
+        public boolean hasName() {
+            return delegate.hasName();
+        }
 
-            public boolean hasNext() throws XMLStreamException {
-                return  delegate.hasNext();
-            }
+        public boolean hasNext() throws XMLStreamException {
+            return delegate.hasNext();
+        }
 
-            public boolean hasText() {
-                return  delegate.hasText();
-            }
+        public boolean hasText() {
+            return delegate.hasText();
+        }
 
-            public boolean isAttributeSpecified(int i) {
-                return  delegate.isAttributeSpecified(i);
-            }
+        public boolean isAttributeSpecified(int i) {
+            return delegate.isAttributeSpecified(i);
+        }
 
-            public boolean isCharacters() {
-                return  delegate.isCharacters();
-            }
+        public boolean isCharacters() {
+            return delegate.isCharacters();
+        }
 
-            public boolean isEndElement() {
-                return  delegate.isEndElement();
-            }
+        public boolean isEndElement() {
+            return delegate.isEndElement();
+        }
 
-            public boolean isStandalone() {
-                return  delegate.isStandalone();
-            }
+        public boolean isStandalone() {
+            return delegate.isStandalone();
+        }
 
-            public boolean isStartElement() {
-                return  delegate.isStartElement();
-            }
+        public boolean isStartElement() {
+            return delegate.isStartElement();
+        }
 
-            public boolean isWhiteSpace() {
-                return  delegate.isWhiteSpace();
-            }
+        public boolean isWhiteSpace() {
+            return delegate.isWhiteSpace();
+        }
 
-            public int next() throws XMLStreamException {
-                return  delegate.next();
-            }
+        public int next() throws XMLStreamException {
+            return delegate.next();
+        }
 
-            public int nextTag() throws XMLStreamException {
-                return  delegate.nextTag();
-            }
+        public int nextTag() throws XMLStreamException {
+            return delegate.nextTag();
+        }
 
-            public void require(int i, String s, String s1) throws XMLStreamException {
-                 delegate.require(i, s, s1);
-            }
+        public void require(int i, String s, String s1) throws XMLStreamException {
+            delegate.require(i, s, s1);
+        }
 
-            public boolean standaloneSet() {
-                return  delegate.standaloneSet();
-            }
+        public boolean standaloneSet() {
+            return delegate.standaloneSet();
+        }
     }
-    
+
 }

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java Sat Dec  5 07:53:43 2009
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.LinkedHashSet;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
@@ -144,7 +145,7 @@
 
         GBeanData webAppData = (GBeanData) sharedContext.get(WebModule.WEB_APP_DATA);
 
-        AbstractName moduleName = moduleContext.getModuleName();
+        AbstractName moduleName = module.getModuleName();
         Map<NamingBuilder.Key, Object> buildingContext = new HashMap<NamingBuilder.Key, Object>();
         buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
 
@@ -192,7 +193,7 @@
     }
 
     protected ClassFinder createJspClassFinder(WebAppType webApp, WebModule webModule, Set<String> listenerNames) throws DeploymentException {
-        List<URL> urls = getTldFiles(webApp, webModule);
+        Collection<URL> urls = getTldFiles(webApp, webModule);
         List<Class> classes = getListenerClasses(webApp, webModule, urls, listenerNames);
         return new ClassFinder(classes);
     }
@@ -215,12 +216,12 @@
      * @return list of the URL(s) for the TLD files
      * @throws DeploymentException if there's a problem finding a tld file
      */
-    private List<URL> getTldFiles(WebAppType webApp, WebModule webModule) throws DeploymentException {
+    private LinkedHashSet<URL> getTldFiles(WebAppType webApp, WebModule webModule) throws DeploymentException {
         if (log.isDebugEnabled()) {
             log.debug("getTldFiles( " + webApp.toString() + "," + webModule.getName() + " ): Entry");
         }
 
-        List<URL> tldURLs = new ArrayList<URL>();
+        LinkedHashSet<URL> tldURLs = new LinkedHashSet<URL>();
 
         // 1. web.xml <taglib> entries
         JspConfigType[] jspConfigs = webApp.getJspConfigArray();
@@ -234,9 +235,9 @@
                         location = location.substring(1);
                     }
                     try {
-                        File targetFile = webModule.getEarContext().getTargetFile(createURI(location));
+                        File targetFile = webModule.getEarContext().getTargetFile(webModule.resolve(createURI(location)));
                         if (targetFile!=null) {
-                            tldURLs.add(targetFile.toURL());
+                            tldURLs.add(targetFile.toURI().toURL());
                         }
                     }
                     catch (MalformedURLException mfe) {
@@ -251,23 +252,15 @@
 
         // 2. TLD(s) in JAR files in WEB-INF/lib
         // 3. TLD(s) under WEB-INF
-        List<URL> tempURLs = scanModule(webModule);
-        for (URL webInfURL : tempURLs) {
-            tldURLs.add(webInfURL);
-        }
+        tldURLs.addAll(scanModule(webModule));
 
         // 4. All TLD files in all META-INF(s)
-        tempURLs.clear();
         try {
             Enumeration<URL> enumURLs = webModule.getEarContext().getDeploymentBundle().getResources("META-INF");
             if (enumURLs != null) {
                 while (enumURLs.hasMoreElements()) {
                     URL enumURL = enumURLs.nextElement();
-                    tempURLs = scanDirectory(enumURL);
-                    for (URL metaInfURL : tempURLs) {
-                        tldURLs.add(metaInfURL);
-                    }
-                    tempURLs.clear();
+                    tldURLs.addAll(scanDirectory(enumURL));
                 }
             }
         }
@@ -297,13 +290,13 @@
             while (entries.hasMoreElements()) {
                 JarEntry jarEntry = entries.nextElement();
                 if (jarEntry.getName().startsWith("WEB-INF/") && jarEntry.getName().endsWith(".tld")) {
-                    File targetFile = webModule.getEarContext().getTargetFile(createURI(jarEntry.getName()));
+                    File targetFile = webModule.getEarContext().getTargetFile(webModule.resolve(createURI(jarEntry.getName())));
                     if (targetFile!=null) {
                         modURLs.add(targetFile.toURL());
                     }
                 }
                 if (jarEntry.getName().startsWith("WEB-INF/lib/") && jarEntry.getName().endsWith(".jar")) {
-                    File targetFile = webModule.getEarContext().getTargetFile(createURI(jarEntry.getName()));
+                    File targetFile = webModule.getEarContext().getTargetFile(webModule.resolve(createURI(jarEntry.getName())));
                     List<URL> jarUrls = scanJAR(new JarFile(targetFile), null);
                     for (URL jarURL : jarUrls) {
                         modURLs.add(jarURL);
@@ -339,19 +332,15 @@
             Enumeration<JarEntry> entries = jarFile.entries();
             while (entries.hasMoreElements()) {
                 JarEntry jarEntry = entries.nextElement();
-                URL tempURL = null;
                 if (prefix != null) {
                     if (jarEntry.getName().endsWith(".tld") && jarEntry.getName().startsWith(prefix)) {
-                        tempURL = new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName());
+                        jarURLs.add(new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName()));
                     }
                 } else {
                     if (jarEntry.getName().endsWith(".tld")) {
-                        tempURL = new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName());
+                        jarURLs.add(new URL("jar:file:" + jarFile.getName() + "!/" + jarEntry.getName()));
                     }
                 }
-                if (tempURL != null) {
-                    jarURLs.add(tempURL);
-                }
             }
         }
         catch (MalformedURLException mfe) {
@@ -428,7 +417,7 @@
     }
 
 
-    private List<Class> getListenerClasses(WebAppType webApp, WebModule webModule, List<URL> urls, Set<String> listenerNames) throws DeploymentException {
+    private List<Class> getListenerClasses(WebAppType webApp, WebModule webModule, Collection<URL> urls, Set<String> listenerNames) throws DeploymentException {
         if (log.isDebugEnabled()) {
             log.debug("getListenerClasses( " + webApp.toString() + "," + '\n' +
                       webModule.getName() + " ): Entry");

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml Sat Dec  5 07:53:43 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jaxws-deployer</artifactId>
@@ -18,7 +18,27 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-jaxws</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jaxws-builder</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java Sat Dec  5 07:53:43 2009
@@ -373,7 +373,7 @@
 
     public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
         EARContext moduleContext = module.getEarContext();
-        AbstractName moduleName = moduleContext.getModuleName();
+        AbstractName moduleName = module.getModuleName();
         WebModule webModule = (WebModule) module;
 
         WebAppType webApp = (WebAppType) webModule.getSpecDD();
@@ -550,10 +550,7 @@
             }
             webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
 
-            if (!module.isStandAlone()) {
-                ConfigurationData moduleConfigurationData = moduleContext.getConfigurationData();
-                earContext.addChildConfiguration(module.getTargetPath(), moduleConfigurationData);
-            }
+            module.addAsChildConfiguration();
         } catch (DeploymentException de) {
             throw de;
         } catch (Exception e) {

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml Sat Dec  5 07:53:43 2009
@@ -58,6 +58,10 @@
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <!--<scope>provided</scope>-->
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>commons-digester</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml Sat Dec  5 07:53:43 2009
@@ -7,41 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-digester</groupId>
-        <artifactId>commons-digester</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>javax.xml.stream</groupId>
-        <artifactId>stax-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
@@ -171,9 +141,4 @@
         <artifactId>pax-logging-api</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Sat Dec  5 07:53:43 2009
@@ -18,7 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,214 +46,175 @@
         <plutoVersion>2.0.1-SNAPSHOT</plutoVersion>
     </properties>
 
-  <dependencyManagement>
-    <dependencies>
+    <dependencyManagement>
+        <dependencies>
 
-        <dependency>
-            <groupId>org.apache.portals</groupId>
-            <artifactId>portlet-api_2.0_spec</artifactId>
-            <version>1.0</version>
-        </dependency>
-        
-      <!-- Admin Console support -->
-      <dependency>
-          <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>pluto-portal-driver</artifactId>
-          <version>${plutoVersion}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>jstl</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>taglibs</groupId>
-                  <artifactId>standard</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>jsp-api</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>servlet-api</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>xml-apis</groupId>
-                  <artifactId>xml-apis</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-beans</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-context</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-core</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-web</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>commons-io</groupId>
-                  <artifactId>commons-io</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-
-      <dependency>
-          <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>pluto-portal-driver-impl</artifactId>
-          <version>${plutoVersion}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>jstl</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>taglibs</groupId>
-                  <artifactId>standard</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>jsp-api</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>servlet-api</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>xml-apis</groupId>
-                  <artifactId>xml-apis</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-beans</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-context</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-core</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-web</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-
-      <dependency>
-          <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>pluto-container-api</artifactId>
-          <version>${plutoVersion}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging-api</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>pluto-container-driver-api</artifactId>
-          <version>${plutoVersion}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging-api</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-
-      <dependency>
-          <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>pluto-container</artifactId>
-          <version>${plutoVersion}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging</artifactId>
-              </exclusion>
-              <exclusion>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging-api</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-
-      <dependency>
-          <groupId>org.apache.portals.pluto</groupId>
-          <artifactId>pluto-taglib</artifactId>
-          <version>${plutoVersion}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging-api</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-
-      <!--<dependency>-->
-          <!--<groupId>org.apache.portals.pluto</groupId>-->
-          <!--<artifactId>pluto-descriptor-impl</artifactId>-->
-          <!--<version>${plutoVersion}</version>-->
-          <!--<exclusions>-->
-              <!--<exclusion>-->
-                  <!--<groupId>commons-io</groupId>-->
-                  <!--<artifactId>commons-io</artifactId>-->
-              <!--</exclusion>-->
-              <!--<exclusion>-->
-                  <!--<groupId>commons-logging</groupId>-->
-                  <!--<artifactId>commons-logging</artifactId>-->
-              <!--</exclusion>-->
-              <!--<exclusion>-->
-                  <!--<groupId>commons-logging</groupId>-->
-                  <!--<artifactId>commons-logging-api</artifactId>-->
-              <!--</exclusion>-->
-              <!--<exclusion>-->
-                  <!--<groupId>xerces</groupId>-->
-                  <!--<artifactId>xercesImpl</artifactId>-->
-              <!--</exclusion>-->
-              <!--<exclusion>-->
-                  <!--<groupId>xerces</groupId>-->
-                  <!--<artifactId>xmlParserAPIs</artifactId>-->
-              <!--</exclusion>-->
-              <!--<exclusion>-->
-                  <!--<groupId>xml-apis</groupId>-->
-                  <!--<artifactId>xml-apis</artifactId>-->
-              <!--</exclusion>-->
-          <!--</exclusions>-->
-      <!--</dependency>-->
-
-      <!--<dependency>-->
-          <!--<groupId>org.apache.portals.pluto</groupId>-->
-          <!--<artifactId>pluto-descriptor-api</artifactId>-->
-          <!--<version>${plutoVersion}</version>-->
-      <!--</dependency>-->
+            <dependency>
+                <groupId>org.apache.portals</groupId>
+                <artifactId>portlet-api_2.0_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>pluto-container</artifactId>
+                <version>${plutoVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>pluto-container-api</artifactId>
+                <version>${plutoVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>pluto-container-driver-api</artifactId>
+                <version>${plutoVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>pluto-portal-driver</artifactId>
+                <version>${plutoVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>jstl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>taglibs</groupId>
+                        <artifactId>standard</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>jsp-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-beans</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-context</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-web</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                        <artifactId>commons-io</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>pluto-portal-driver-impl</artifactId>
+                <version>${plutoVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>jstl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>taglibs</groupId>
+                        <artifactId>standard</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>jsp-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-digester</groupId>
+                        <artifactId>commons-digester</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-beans</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-context</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-web</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+
+
+            <dependency>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>pluto-taglib</artifactId>
+                <version>${plutoVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
-    </dependencies>
-  </dependencyManagement>
+        </dependencies>
+    </dependencyManagement>
 </project>
 

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Sat Dec  5 07:53:43 2009
@@ -106,7 +106,7 @@
         <module>client</module>
         <module>clustering</module>
         <module>connector-1_6</module>
-        <!--<module>console</module>-->
+        <module>console</module>
         <!--<module>corba</module>-->
         <!--<module>cxf</module>-->
         <!--<module>dojo</module>-->
@@ -128,7 +128,7 @@
         <!--<module>monitoring</module>-->
         <!--<module>remote-deploy</module>-->
         <!--<module>sharedlib</module>-->
-        <!--<module>welcome</module>-->
+        <module>welcome</module>
         <!--<module>concurrent</module>-->
         <!--<module>procrun</module>-->
         <module>jetty8</module>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=887511&r1=887510&r2=887511&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Sat Dec  5 07:53:43 2009
@@ -342,7 +342,7 @@
     public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
         EARContext moduleContext = module.getEarContext();
         Bundle webBundle = moduleContext.getDeploymentBundle();
-        AbstractName moduleName = moduleContext.getModuleName();
+        AbstractName moduleName = module.getModuleName();
         WebModule webModule = (WebModule) module;
 
         WebAppType webApp = (WebAppType) webModule.getSpecDD();
@@ -578,10 +578,7 @@
 //        }
             }
 
-            if (!module.isStandAlone()) {
-                ConfigurationData moduleConfigurationData = moduleContext.getConfigurationData();
-                earContext.addChildConfiguration(module.getTargetPath(), moduleConfigurationData);
-            }
+            module.addAsChildConfiguration();
         } catch (DeploymentException de) {
             throw de;
         } catch (Exception e) {



Mime
View raw message