geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r889135 - in /geronimo/server/trunk: ./ plugins/jasper/ plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/ plugins/jasper/jasper/ plugins/jasper/jasper/src/main/history/ plugins/tomcat/ plugins/tomcat/geronimo-tomcat6-...
Date Thu, 10 Dec 2009 08:34:01 GMT
Author: xuhaihong
Date: Thu Dec 10 08:33:39 2009
New Revision: 889135

URL: http://svn.apache.org/viewvc?rev=889135&view=rev
Log:
GERONIMO-4980 Use Tomcat 7 in Geronimo 3.0

Added:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/
    geronimo/server/trunk/plugins/tomcat/tomcat7/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/tomcat6/
    geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/
    geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/
    geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/
    geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/
      - copied from r888672, geronimo/server/trunk/plugins/tomcat/tomcat6-no-ha/
Removed:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/
    geronimo/server/trunk/plugins/tomcat/tomcat6/
    geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/
    geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/
    geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/
    geronimo/server/trunk/plugins/tomcat/tomcat6-no-ha/
Modified:
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
    geronimo/server/trunk/plugins/jasper/jasper/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jasper/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatExecutorWrapper.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatServerGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java
    geronimo/server/trunk/plugins/tomcat/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java Thu Dec 10 08:33:39 2009
@@ -25,19 +25,16 @@
 import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import org.xml.sax.InputSource;
 
 import javax.servlet.ServletContext;
 
-// import org.apache.geronimo.kernel.config.MultiParentClassLoader;
-// import org.apache.geronimo.kernel.config.ChildrenConfigurationClassLoader;
 import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
 import org.apache.jasper.compiler.TldLocationsCache;
@@ -45,6 +42,7 @@
 import org.apache.jasper.xmlparser.TreeNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.xml.sax.InputSource;
 
 /**
  * A container for all tag libraries that are defined "globally"
@@ -149,7 +147,7 @@
     }
 
     public GeronimoTldLocationsCache(ServletContext ctxt) {
-        this(ctxt, true);
+        super(ctxt);
     }
 
     /** Constructor.
@@ -162,6 +160,7 @@
      * because of JDK bug 4211817 fixed in this release.
      * If redeployMode is false, a faster but less capable mode will be used.
      */
+    /*
     public GeronimoTldLocationsCache(ServletContext ctxt, boolean redeployMode) {
         super(ctxt,redeployMode);
         scannedJars = new ArrayList<String>();
@@ -170,6 +169,7 @@
         mappings = new Hashtable<String,String[]>();
         initialized = false;
     }
+    */
 
     /**
      * Sets the list of JARs that are known not to contain any TLDs.
@@ -270,11 +270,11 @@
             if (jspConfig != null) {
                 webtld = jspConfig;
             }
-            Iterator taglibs = webtld.findChildren("taglib");
+            Iterator<TreeNode> taglibs = webtld.findChildren("taglib");
             while (taglibs.hasNext()) {
 
                 // Parse the next <taglib> element
-                TreeNode taglib = (TreeNode) taglibs.next();
+                TreeNode taglib = taglibs.next();
                 String tagUri = null;
                 String tagLoc = null;
                 TreeNode child = taglib.findChild("taglib-uri");
@@ -324,9 +324,9 @@
                 conn.setUseCaches(false);
             }
             jarFile = conn.getJarFile();
-            Enumeration entries = jarFile.entries();
+            Enumeration<JarEntry> entries = jarFile.entries();
             while (entries.hasMoreElements()) {
-                JarEntry entry = (JarEntry) entries.nextElement();
+                JarEntry entry = entries.nextElement();
                 String name = entry.getName();
                 if (!name.startsWith("META-INF/")) continue;
                 if (!name.endsWith(".tld")) continue;
@@ -384,11 +384,11 @@
     private void processTldsInFileSystem(String startPath)
             throws Exception {
 
-        Set dirList = ctxt.getResourcePaths(startPath);
+        Set<String> dirList = ctxt.getResourcePaths(startPath);
         if (dirList != null) {
-            Iterator it = dirList.iterator();
+            Iterator<String> it = dirList.iterator();
             while (it.hasNext()) {
-                String path = (String) it.next();
+                String path = it.next();
                 if (path.endsWith("/")) {
                     processTldsInFileSystem(path);
                 }

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JasperServletContextCustomizer.java Thu Dec 10 08:33:39 2009
@@ -30,8 +30,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.RuntimeCustomizer;
 import org.apache.geronimo.j2ee.annotation.Holder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.InstanceManager;
+import org.apache.tomcat.InstanceManager;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/JspServletOptions.java Thu Dec 10 08:33:39 2009
@@ -21,6 +21,7 @@
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
+import javax.servlet.jsp.tagext.TagLibraryInfo;
 
 import org.apache.jasper.EmbeddedServletOptions;
 import org.apache.jasper.Options;
@@ -29,7 +30,9 @@
 import org.apache.jasper.compiler.TldLocationsCache;
 
 public class JspServletOptions implements Options {
+
     EmbeddedServletOptions delegate;
+
     TldLocationsCache tldLocationsCache;
 
     /**
@@ -45,7 +48,7 @@
         return delegate.genStringAsCharArray();
     }
 
-    public Map getCache() {
+    public Map<String, TagLibraryInfo> getCache() {
         return delegate.getCache();
     }
 
@@ -121,10 +124,6 @@
         return delegate.getScratchDir();
     }
 
-    public boolean getSendErrorToClient() {
-        return delegate.getSendErrorToClient();
-    }
-
     public TagPluginManager getTagPluginManager() {
         return delegate.getTagPluginManager();
     }

Modified: geronimo/server/trunk/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/pom.xml?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/pom.xml Thu Dec 10 08:33:39 2009
@@ -71,6 +71,10 @@
             <version>${version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
         <!--<dependency>-->
         <!--<groupId>${tomcatGroupId}</groupId>-->
         <!--<artifactId>jasper</artifactId>-->

Modified: geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml Thu Dec 10 08:33:39 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jasper</artifactId>
@@ -7,6 +7,16 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/pom.xml?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/pom.xml Thu Dec 10 08:33:39 2009
@@ -76,10 +76,6 @@
                     <!--</exclusion>-->
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-servlet_3.0_spec</artifactId>
                     </exclusion>
                     <exclusion>
@@ -92,6 +88,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+
             <dependency>
                 <groupId>${tomcatGroupId}</groupId>
                 <artifactId>jasper-el</artifactId>
@@ -108,14 +105,7 @@
             <!--<groupId>${tomcatGroupId}</groupId>-->
             <!--<artifactId>jasper-jdt</artifactId>-->
             <!--<version>${tomcatVersion}</version>-->
-            <!--</dependency>-->
-
-
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
-                <version>3.2.3_3-SNAPSHOT</version>
-            </dependency>
+            <!--</dependency>-->            
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,14 +29,14 @@
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat6-builder</artifactId>
+    <artifactId>geronimo-tomcat7-builder</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Tomcat :: Builder</name>
 
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat6</artifactId>
+            <artifactId>geronimo-tomcat7</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -85,11 +85,12 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-        <dependency>
+
+        <!--dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <scope>test</scope>
-        </dependency>
+        </dependency-->
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,14 +29,14 @@
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
+    <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-clustering-wadi</artifactId>
+            <artifactId>tomcat7-clustering-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -50,7 +50,7 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat6-builder</artifactId>
+            <artifactId>geronimo-tomcat7-builder</artifactId>
             <version>${version}</version>
             <scope>test</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,7 +29,7 @@
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
+    <artifactId>geronimo-tomcat7-clustering-wadi</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Tomcat :: Clustering over WADI Core</name>
     
@@ -42,7 +42,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-no-ha</artifactId>
+            <artifactId>tomcat7-no-ha</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,7 +29,7 @@
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat6</artifactId>
+    <artifactId>geronimo-tomcat7</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, Tomcat :: Core</name>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java Thu Dec 10 08:33:39 2009
@@ -60,7 +60,8 @@
 public class BaseGeronimoContextConfig extends ContextConfig {
     private static final String MESSAGE_LAYER = "HttpServlet";
     private static final String POLICY_CONTEXT_ID_KEY = "javax.security.jacc.PolicyContext";
-
+        
+    private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(BaseGeronimoContextConfig.class);
 
     protected void configureSecurity(StandardContext geronimoContext, String policyContextId, ConfigurationFactory configurationFactory, Subject defaultSubject, String authMethod, String realmName, String loginPage, String errorPage) {
         if (defaultSubject == null) {

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java Thu Dec 10 08:33:39 2009
@@ -134,10 +134,9 @@
             }
 
             if (mbeanServerReference != null) {
-                Registry.setServer(mbeanServerReference.getMBeanServer());
+                Registry.getRegistry(null, null).setMBeanServer(mbeanServerReference.getMBeanServer());
             }
 
-
             //Add clustering
             if (clusterGBean != null) {
                 engine.setCluster((Cluster) clusterGBean.getInternalObject());

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java Thu Dec 10 08:33:39 2009
@@ -22,7 +22,7 @@
 
 import javax.transaction.UserTransaction;
 
-import org.apache.InstanceManager;
+import org.apache.tomcat.InstanceManager;
 import org.apache.catalina.Context;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Realm;

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatExecutorWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatExecutorWrapper.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatExecutorWrapper.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatExecutorWrapper.java Thu Dec 10 08:33:39 2009
@@ -20,6 +20,8 @@
 
 package org.apache.geronimo.tomcat;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.util.LifecycleSupport;
@@ -40,6 +42,7 @@
         return executor.getName();
     }
 
+    @Override
     public void execute(Runnable runnable) {
         executor.execute(runnable);
     }
@@ -67,5 +70,9 @@
         lifecycle.fireLifecycleEvent(STOP_EVENT, null);
         lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
     }
-    
+ 
+    @Override
+    public void execute(Runnable runnable, long timeout, TimeUnit unit) {
+        // FIXME Figure out how to implement it
+    }
 }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java Thu Dec 10 08:33:39 2009
@@ -26,7 +26,7 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.InstanceManager;
+import org.apache.tomcat.InstanceManager;
 import org.apache.geronimo.j2ee.annotation.Holder;
 
 /**

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatServerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatServerGBean.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatServerGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatServerGBean.java Thu Dec 10 08:33:39 2009
@@ -99,8 +99,8 @@
         this.serverInfo = serverInfo;
         this.classLoader = classLoader;
 
-        if(mbeanServerReference != null) {
-            Registry.setServer(mbeanServerReference.getMBeanServer());
+        if (mbeanServerReference != null) {
+            Registry.getRegistry(null, null).setMBeanServer(mbeanServerReference.getMBeanServer());
         }
         
         if (catalinaHome == null){

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Thu Dec 10 08:33:39 2009
@@ -34,7 +34,7 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import org.apache.InstanceManager;
+import org.apache.tomcat.InstanceManager;
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Manager;

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/ClientCertAuthenticator.java Thu Dec 10 08:33:39 2009
@@ -20,25 +20,23 @@
 
 package org.apache.geronimo.tomcat.security.authentication;
 
-import java.security.cert.X509Certificate;
-import java.security.Principal;
 import java.io.IOException;
+import java.security.cert.X509Certificate;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.geronimo.tomcat.security.Authenticator;
-import org.apache.geronimo.tomcat.security.AuthResult;
-import org.apache.geronimo.tomcat.security.ServerAuthException;
-import org.apache.geronimo.tomcat.security.UserIdentity;
-import org.apache.geronimo.tomcat.security.LoginService;
-import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
 import org.apache.catalina.Globals;
 import org.apache.catalina.authenticator.Constants;
-import org.apache.catalina.util.StringManager;
-import org.apache.catalina.util.Base64;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
 import org.apache.coyote.ActionCode;
+import org.apache.geronimo.tomcat.security.AuthResult;
+import org.apache.geronimo.tomcat.security.Authenticator;
+import org.apache.geronimo.tomcat.security.LoginService;
+import org.apache.geronimo.tomcat.security.ServerAuthException;
+import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
+import org.apache.geronimo.tomcat.security.UserIdentity;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/authentication/FormAuthenticator.java Thu Dec 10 08:33:39 2009
@@ -22,31 +22,31 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Enumeration;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Cookie;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 
-import org.apache.geronimo.tomcat.security.Authenticator;
+import org.apache.catalina.Session;
+import org.apache.catalina.authenticator.Constants;
+import org.apache.catalina.authenticator.SavedRequest;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.coyote.ActionCode;
 import org.apache.geronimo.tomcat.security.AuthResult;
-import org.apache.geronimo.tomcat.security.ServerAuthException;
+import org.apache.geronimo.tomcat.security.Authenticator;
 import org.apache.geronimo.tomcat.security.LoginService;
-import org.apache.geronimo.tomcat.security.UserIdentity;
+import org.apache.geronimo.tomcat.security.ServerAuthException;
 import org.apache.geronimo.tomcat.security.TomcatAuthStatus;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
-import org.apache.catalina.authenticator.Constants;
-import org.apache.catalina.authenticator.SavedRequest;
-import org.apache.catalina.Session;
-import org.apache.catalina.util.StringManager;
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.buf.CharChunk;
+import org.apache.geronimo.tomcat.security.UserIdentity;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.CharChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.coyote.ActionCode;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Thu Dec 10 08:33:39 2009
@@ -38,15 +38,15 @@
     </description>
 
     <modules>
-        <module>geronimo-tomcat6</module>
-        <module>geronimo-tomcat6-builder</module>
-        <module>tomcat6</module>
-        <module>tomcat6-no-ha</module>
-        <module>tomcat6-deployer</module>
-        <module>geronimo-tomcat6-clustering-wadi</module>
-        <module>geronimo-tomcat6-clustering-builder-wadi</module>
-        <module>tomcat6-clustering-wadi</module>
-        <module>tomcat6-clustering-builder-wadi</module>
+        <module>geronimo-tomcat7</module>
+        <module>geronimo-tomcat7-builder</module>
+        <module>tomcat7</module>
+        <module>tomcat7-no-ha</module>
+        <module>tomcat7-deployer</module>
+        <module>geronimo-tomcat7-clustering-wadi</module>
+        <module>geronimo-tomcat7-clustering-builder-wadi</module>
+        <module>tomcat7-clustering-wadi</module>
+        <module>tomcat7-clustering-builder-wadi</module>
     </modules>
 
     <dependencyManagement>
@@ -57,30 +57,30 @@
                 <artifactId>jasper</artifactId>
                 <version>${tomcatVersion}</version>
                 <exclusions>
-                    <exclusion>
+                    <!--exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>servlet-api</artifactId>
-                    </exclusion>
+                    </exclusion-->
                     <exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>juli</artifactId>
                     </exclusion>
-                    <exclusion>
+                    <!--exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>jsp-api</artifactId>
-                    </exclusion>
-                    <exclusion>
+                    </exclusion-->
+                    <!--exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>el-api</artifactId>
-                    </exclusion>
+                    </exclusion-->
                     <exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>catalina</artifactId>
                     </exclusion>
-                    <exclusion>
+                    <!--exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>annotations-api</artifactId>
-                    </exclusion>
+                    </exclusion-->
                 </exclusions>
             </dependency>
             <dependency>
@@ -88,30 +88,30 @@
                 <artifactId>jasper-el</artifactId>
                 <version>${tomcatVersion}</version>
                 <exclusions>
-                    <exclusion>
+                    <!--exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>servlet-api</artifactId>
-                    </exclusion>
+                    </exclusion-->
                     <exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>juli</artifactId>
                     </exclusion>
-                    <exclusion>
+                    <!--exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>jsp-api</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>el-api</artifactId>
-                    </exclusion>
+                    </exclusion-->
                     <exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>catalina</artifactId>
                     </exclusion>
-                    <exclusion>
+                    <!--exclusion>
                         <groupId>${tomcatGroupId}</groupId>
                         <artifactId>annotations-api</artifactId>
-                    </exclusion>
+                    </exclusion-->
                 </exclusions>
             </dependency>
 
@@ -133,15 +133,19 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                        <artifactId>geronimo-ejb_3.1_spec</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                        <artifactId>geronimo-servlet_3.0_spec</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                        <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>        
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-javamail_1.4_spec</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -156,11 +160,11 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                        <artifactId>geronimo-ejb_3.1_spec</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                        <artifactId>geronimo-servlet_3.0_spec</artifactId>
                     </exclusion>
                  </exclusions>
             </dependency>
@@ -175,11 +179,11 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                        <artifactId>geronimo-ejb_3.1_spec</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                        <artifactId>geronimo-servlet_3.0_spec</artifactId>
                     </exclusion>
                  </exclusions>
             </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,7 +29,7 @@
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>tomcat6-clustering-builder-wadi</artifactId>
+    <artifactId>tomcat7-clustering-builder-wadi</artifactId>
     <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI</name>
     <packaging>car</packaging>
 
@@ -38,20 +38,20 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>tomcat7-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
+            <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-clustering-wadi</artifactId>
+            <artifactId>tomcat7-clustering-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -67,7 +67,7 @@
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>tomcat6-clustering-wadi</artifactId>
+                            <artifactId>tomcat7-clustering-wadi</artifactId>
                             <version>${version}</version>
                             <type>car</type>
                             <import>classes</import>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/history/dependencies.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/src/main/history/dependencies.xml Thu Dec 10 08:33:39 2009
@@ -2,23 +2,23 @@
 <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>tomcat6-clustering-builder-wadi</artifactId>
+        <artifactId>tomcat7-clustering-builder-wadi</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6-clustering-wadi</artifactId>
+        <artifactId>tomcat7-clustering-wadi</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6-deployer</artifactId>
+        <artifactId>tomcat7-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
+        <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,7 +29,7 @@
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>tomcat6-clustering-wadi</artifactId>
+    <artifactId>tomcat7-clustering-wadi</artifactId>
     <name>Geronimo Plugins, Tomcat :: Clustering over WADI</name>
     <packaging>car</packaging>
 
@@ -38,13 +38,13 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
+            <artifactId>geronimo-tomcat7-clustering-wadi</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-no-ha</artifactId>
+            <artifactId>tomcat7-no-ha</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/src/main/history/dependencies.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/src/main/history/dependencies.xml Thu Dec 10 08:33:39 2009
@@ -2,13 +2,13 @@
 <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>tomcat6-clustering-wadi</artifactId>
+        <artifactId>tomcat7-clustering-wadi</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6-no-ha</artifactId>
+        <artifactId>tomcat7-no-ha</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
+        <artifactId>geronimo-tomcat7-clustering-wadi</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,7 +29,7 @@
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>tomcat6-deployer</artifactId>
+    <artifactId>tomcat7-deployer</artifactId>
     <name>Geronimo Plugins, Tomcat :: Deployer</name>
     <packaging>car</packaging>
 
@@ -54,7 +54,7 @@
         <!-- import classes -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>tomcat7</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>runtime</scope>
@@ -62,7 +62,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-tomcat6-builder</artifactId>
+            <artifactId>geronimo-tomcat7-builder</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -94,7 +94,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-tomcat6-builder</artifactId>
+                                    <artifactId>geronimo-tomcat7-builder</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
@@ -111,7 +111,7 @@
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>tomcat6</artifactId>
+                            <artifactId>tomcat7</artifactId>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/history/dependencies.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/history/dependencies.xml Thu Dec 10 08:33:39 2009
@@ -2,7 +2,7 @@
 <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>tomcat6-deployer</artifactId>
+        <artifactId>tomcat7-deployer</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -18,12 +18,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6</artifactId>
+        <artifactId>tomcat7</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-tomcat6-builder</artifactId>
+        <artifactId>geronimo-tomcat7-builder</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,7 +29,7 @@
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>tomcat6-no-ha</artifactId>
+    <artifactId>tomcat7-no-ha</artifactId>
     <name>Geronimo Plugins, Tomcat :: Tomcat without HA</name>
     <packaging>car</packaging>
 
@@ -53,7 +53,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>tomcat7</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/src/main/history/dependencies.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/src/main/history/dependencies.xml Thu Dec 10 08:33:39 2009
@@ -2,7 +2,7 @@
 <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>tomcat6-no-ha</artifactId>
+        <artifactId>tomcat7-no-ha</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -13,7 +13,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6</artifactId>
+        <artifactId>tomcat7</artifactId>
         <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/pom.xml Thu Dec 10 08:33:39 2009
@@ -29,7 +29,7 @@
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>tomcat6</artifactId>
+    <artifactId>tomcat7</artifactId>
     <name>Geronimo Plugins, Tomcat :: Tomcat</name>
     <packaging>car</packaging>
 
@@ -67,7 +67,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-tomcat6</artifactId>
+            <artifactId>geronimo-tomcat7</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -94,6 +94,11 @@
             <artifactId>tribes</artifactId>
         </dependency>
 
+        <!-- Check whether we really need this dependency-->  
+        <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>                
+        </dependency>
     </dependencies>
 
     <build>
@@ -160,7 +165,7 @@
                             <config-substitution key="HTTPSPort">8443</config-substitution>
                             <config-substitution key="WebConnectorConTimeout">20000</config-substitution>
                             <config-substitution key="webcontainer">TomcatWebContainer</config-substitution>
-                            <config-substitution key="webcontainerName">tomcat6</config-substitution>
+                            <config-substitution key="webcontainerName">tomcat7</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=889135&r1=888672&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Thu Dec 10 08:33:39 2009
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6</artifactId>
+        <artifactId>tomcat7</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -42,6 +42,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.ext.tomcat</groupId>
+        <artifactId>util</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>server-security-config</artifactId>
         <type>car</type>
@@ -53,7 +58,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-tomcat6</artifactId>
+        <artifactId>geronimo-tomcat7</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -73,11 +78,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javamail_1.4_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jaxr_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=889135&r1=889134&r2=889135&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Dec 10 08:33:39 2009
@@ -63,7 +63,7 @@
         FIXME: STOP using properties for dependency versions unless you absolutly need them,
                ie. you have a hundred dependencies that all use the same version.
         -->
-        <tomcatVersion>6.0.20.1-SNAPSHOT</tomcatVersion>
+        <tomcatVersion>7.0.0.0-SNAPSHOT</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>3.1.3-SNAPSHOT</openejbVersion>
@@ -207,7 +207,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -547,6 +547,12 @@
                 <artifactId>org.apache.servicemix.bundles.ant</artifactId>
                 <version>1.7.0_1</version>
             </dependency>
+            
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
+                <version>3.2.3_3-SNAPSHOT</version>
+            </dependency>
 
             <!--
             NOTE: This is included for AMQ 4.1 support only.  Need to use 2.2 to
@@ -2031,8 +2037,31 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>1.4.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>1.4.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.foundation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>javax.servlet</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+
     <!-- todo why here?? remove -->
     <dependencies>
         <dependency>



Mime
View raw message