Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /tomcat/trunk:r647344,751502

Index: java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- java/org/apache/catalina/startup/ContextConfig.java	(revision 801738)
+++ java/org/apache/catalina/startup/ContextConfig.java	(working copy)
@@ -144,27 +144,21 @@
      * The <code>Digester</code> we will use to process web application
      * deployment descriptor files.
      */
-    protected static Digester webDigester = null;
+    protected Digester webDigester = null;
     
     
     /**
-     * The <code>Rule</code> used to parse the web.xml
+     * The <code>Digester</code>s available to process web application
+     * deployment descriptor files.
      */
-    protected static WebRuleSet webRuleSet = new WebRuleSet();
+    protected static Digester[] webDigesters = new Digester[4];
 
     /**
-     * Attribute value used to turn on/off XML validation
+     * The <code>Rule</code> used to parse the web.xml
      */
-     protected static boolean xmlValidation = false;
+    protected static WebRuleSet webRuleSet = new WebRuleSet();
 
-
     /**
-     * Attribute value used to turn on/off XML namespace awarenes.
-     */
-    protected static boolean xmlNamespaceAware = false;
-
-    
-    /**
      * Deployment count.
      */
     protected static long deploymentCount = 0L;
@@ -517,25 +511,37 @@
      * Create (if necessary) and return a Digester configured to process the
      * web application deployment descriptor (web.xml).
      */
-    protected static Digester createWebDigester() {
-        Digester webDigester =
-            createWebXmlDigester(xmlNamespaceAware, xmlValidation);
-        return webDigester;
-    }
-
-
-    /**
-     * Create (if necessary) and return a Digester configured to process the
-     * web application deployment descriptor (web.xml).
-     */
     public static Digester createWebXmlDigester(boolean namespaceAware,
                                                 boolean validation) {
         
-        Digester webDigester =  DigesterFactory.newDigester(xmlValidation,
-                                                            xmlNamespaceAware,
-                                                            webRuleSet);
-        return webDigester;
+        Digester digester = null;
+        if (!namespaceAware && !validation) {
+            if (webDigesters[0] == null) {
+                webDigesters[0] = DigesterFactory.newDigester(validation,
+                        namespaceAware, webRuleSet);
     }
+            digester = webDigesters[0];
+        } else if (!namespaceAware && validation) {
+            if (webDigesters[1] == null) {
+                webDigesters[1] = DigesterFactory.newDigester(validation,
+                        namespaceAware, webRuleSet);
+            }
+            digester = webDigesters[1];
+        } else if (namespaceAware && !validation) {
+            if (webDigesters[2] == null) {
+                webDigesters[2] = DigesterFactory.newDigester(validation,
+                        namespaceAware, webRuleSet);
+            }
+            digester = webDigesters[2];
+        } else {
+            if (webDigesters[3] == null) {
+                webDigesters[3] = DigesterFactory.newDigester(validation,
+                        namespaceAware, webRuleSet);
+            }
+            digester = webDigesters[3];
+        }
+        return digester;
+    }
 
     
     /**
@@ -991,11 +997,6 @@
     protected void init() {
         // Called from StandardContext.init()
 
-        if (webDigester == null){
-            webDigester = createWebDigester();
-            webDigester.getParser();
-        }
-        
         if (contextDigester == null){
             contextDigester = createContextDigester();
             contextDigester.getParser();
@@ -1040,28 +1041,36 @@
         if (log.isDebugEnabled())
             log.debug(sm.getString("contextConfig.start"));
 
-        // Set properties based on DefaultContext
+        // Process the default and application web.xml files
+        // Set properties based on default context
+        boolean useXmlValidation = context.getXmlValidation();
+        boolean useXmlNamespaceAware = context.getXmlNamespaceAware();
+
         Container container = context.getParent();
+        // Use the value from the host if:
+        // - override is false on the context
+        // - value has been set to false / not set on the context
         if( !context.getOverride() ) {
             if( container instanceof Host ) {
-                // Reset the value only if the attribute wasn't
-                // set on the context.
-                xmlValidation = context.getXmlValidation();
-                if (!xmlValidation) {
-                    xmlValidation = ((Host)container).getXmlValidation();
+                if (!useXmlValidation) {
+                    useXmlValidation = ((Host)container).getXmlValidation();
                 }
                 
-                xmlNamespaceAware = context.getXmlNamespaceAware();
-                if (!xmlNamespaceAware){
-                    xmlNamespaceAware 
+                if (!useXmlNamespaceAware){
+                    useXmlNamespaceAware 
                                 = ((Host)container).getXmlNamespaceAware();
                 }
 
-                container = container.getParent();
             }
         }
 
-        // Process the default and application web.xml files
+        if (log.isDebugEnabled()) {
+            log.debug(sm.getString("contextConfig.xmlSettings",
+                    context.getName(), Boolean.valueOf(useXmlValidation),
+                    Boolean.valueOf(useXmlNamespaceAware)));
+        }
+        webDigester = createWebXmlDigester(useXmlNamespaceAware, useXmlValidation);
+        
         defaultWebConfig();
         applicationWebConfig();
         if (!context.getIgnoreAnnotations()) {
Index: java/org/apache/catalina/startup/LocalStrings.properties
===================================================================
--- java/org/apache/catalina/startup/LocalStrings.properties	(revision 801738)
+++ java/org/apache/catalina/startup/LocalStrings.properties	(working copy)
@@ -46,6 +46,7 @@
 contextConfig.tldFileException=Exception processing TLD at resource path {0} in context {1}
 contextConfig.tldJarException=Exception processing JAR at resource path {0} in context {1}
 contextConfig.tldResourcePath=Invalid TLD resource path {0}
+contextConfig.xmlSettings=Context [{0}] will parse web.xml and web-fragment.xml files with validation:{1} and namespaceAware:{2}
 contextConfig.unavailable=Marking this application unavailable due to previous error(s)
 contextConfig.altDDNotFound=alt-dd file {0} not found
 embedded.alreadyStarted=Embedded service has already been started
Index: java/org/apache/catalina/startup/TldConfig.java
===================================================================
--- java/org/apache/catalina/startup/TldConfig.java	(revision 801738)
+++ java/org/apache/catalina/startup/TldConfig.java	(working copy)
@@ -20,12 +20,8 @@
 
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -47,7 +43,6 @@
 import javax.servlet.ServletException;
 
 import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
@@ -57,6 +52,7 @@
 import org.apache.tomcat.util.digester.Digester;
 import org.xml.sax.InputSource;
 
+
 /**
  * Startup event listener for a <b>Context</b> that configures application
  * listeners configured in any TLD files.
@@ -73,6 +69,19 @@
     private static org.apache.juli.logging.Log log=
         org.apache.juli.logging.LogFactory.getLog( TldConfig.class );
 
+    /**
+     * The string resources for this package.
+     */
+    private static final StringManager sm =
+        StringManager.getManager(Constants.Package);
+
+    /**
+     * The <code>Digester</code>s available to process tld files.
+     */
+    private static Digester[] tldDigesters = new Digester[4];
+
+    private static final TldRuleSet tldRuleSet = new TldRuleSet();
+    
     /*
      * Initializes the set of JARs that are known not to contain any TLDs
      */
@@ -124,7 +133,43 @@
         noTldJars.add("sunpkcs11.jar");
     }
 
+    /**
+     * Create (if necessary) and return a Digester configured to process the
+     * tld.
+     */
+    private static Digester createTldDigester(boolean namespaceAware,
+            boolean validation) {
 
+        Digester digester = null;
+        if (!namespaceAware && !validation) {
+            if (tldDigesters[0] == null) {
+                tldDigesters[0] = DigesterFactory.newDigester(validation,
+                        namespaceAware, tldRuleSet);
+            }
+            digester = tldDigesters[0];
+        } else if (!namespaceAware && validation) {
+            if (tldDigesters[1] == null) {
+                tldDigesters[1] = DigesterFactory.newDigester(validation,
+                        namespaceAware, tldRuleSet);
+            }
+            digester = tldDigesters[1];
+        } else if (namespaceAware && !validation) {
+            if (tldDigesters[2] == null) {
+                tldDigesters[2] = DigesterFactory.newDigester(validation,
+                        namespaceAware, tldRuleSet);
+            }
+            digester = tldDigesters[2];
+        } else {
+            if (tldDigesters[3] == null) {
+                tldDigesters[3] = DigesterFactory.newDigester(validation,
+                        namespaceAware, tldRuleSet);
+            }
+            digester = tldDigesters[3];
+        }
+        return digester;
+    }
+
+
     // ----------------------------------------------------- Instance Variables
 
     /**
@@ -134,28 +179,22 @@
 
 
     /**
-     * The string resources for this package.
-     */
-    private static final StringManager sm =
-        StringManager.getManager(Constants.Package);
-
-    /**
      * The <code>Digester</code> we will use to process tag library
      * descriptor files.
      */
-    private static Digester tldDigester = null;
+    private Digester tldDigester = null;
 
 
     /**
      * Attribute value used to turn on/off TLD validation
      */
-     private static boolean tldValidation = false;
+    private boolean tldValidation = false;
 
 
     /**
      * Attribute value used to turn on/off TLD  namespace awarenes.
      */
-    private static boolean tldNamespaceAware = false;
+    private boolean tldNamespaceAware = false;
 
     private boolean rescan=true;
 
@@ -185,7 +224,7 @@
      * @param tldValidation true to enable xml instance validation
      */
     public void setTldValidation(boolean tldValidation){
-        TldConfig.tldValidation = tldValidation;
+        this.tldValidation = tldValidation;
     }
 
     /**
@@ -194,7 +233,7 @@
      *
      */
     public boolean getTldValidation(){
-        return tldValidation;
+        return this.tldValidation;
     }
 
     /**
@@ -203,7 +242,7 @@
      *
      */
     public boolean getTldNamespaceAware(){
-        return tldNamespaceAware;
+        return this.tldNamespaceAware;
     }
 
 
@@ -213,7 +252,7 @@
      * @param tldNamespaceAware true to enable namespace awareness
      */
     public void setTldNamespaceAware(boolean tldNamespaceAware){
-        TldConfig.tldNamespaceAware = tldNamespaceAware;
+        this.tldNamespaceAware = tldNamespaceAware;
     }    
 
 
@@ -255,71 +294,33 @@
     public void execute() throws Exception {
         long t1=System.currentTimeMillis();
 
-        File tldCache=null;
-
-        if (context instanceof StandardContext) {
-            File workDir= (File)
-                ((StandardContext)context).getServletContext().getAttribute(Globals.WORK_DIR_ATTR);
-            //tldCache=new File( workDir, "tldCache.ser");
-        }
-
-        // Option to not rescan
-        if( ! rescan ) {
-            // find the cache
-            if( tldCache!= null && tldCache.exists()) {
-                // just read it...
-                processCache(tldCache);
-                return;
-            }
-        }
-
         /*
          * Acquire the list of TLD resource paths, possibly embedded in JAR
          * files, to be processed
          */
-        Set resourcePaths = tldScanResourcePaths();
-        Map jarPaths = getJarPaths();
+        Set<String> resourcePaths = tldScanResourcePaths();
+        Map<String, File> jarPaths = getJarPaths();
 
-        // Check to see if we can use cached listeners
-        if (tldCache != null && tldCache.exists()) {
-            long lastModified = getLastModified(resourcePaths, jarPaths);
-            if (lastModified < tldCache.lastModified()) {
-                processCache(tldCache);
-                return;
-            }
-        }
-
         // Scan each accumulated resource path for TLDs to be processed
-        Iterator paths = resourcePaths.iterator();
+        Iterator<String> paths = resourcePaths.iterator();
         while (paths.hasNext()) {
-            String path = (String) paths.next();
+            String path = paths.next();
             if (path.endsWith(".jar")) {
                 tldScanJar(path);
             } else {
                 tldScanTld(path);
             }
         }
+        
         if (jarPaths != null) {
-            paths = jarPaths.values().iterator();
-            while (paths.hasNext()) {
-                tldScanJar((File) paths.next());
+            Iterator<File> files  = jarPaths.values().iterator();
+            while (files.hasNext()) {
+                tldScanJar(files.next());
             }
         }
 
         String list[] = getTldListeners();
 
-        if( tldCache!= null ) {
-            log.debug( "Saving tld cache: " + tldCache + " " + list.length);
-            try {
-                FileOutputStream out=new FileOutputStream(tldCache);
-                ObjectOutputStream oos=new ObjectOutputStream( out );
-                oos.writeObject( list );
-                oos.close();
-            } catch( IOException ex ) {
-                ex.printStackTrace();
-            }
-        }
-
         if( log.isDebugEnabled() )
             log.debug( "Adding tld listeners:" + list.length);
         for( int i=0; list!=null && i<list.length; i++ ) {
@@ -335,67 +336,6 @@
 
     // -------------------------------------------------------- Private Methods
 
-    /*
-     * Returns the last modification date of the given sets of resources.
-     *
-     * @param resourcePaths
-     * @param jarPaths
-     *
-     * @return Last modification date
-     */
-    private long getLastModified(Set resourcePaths, Map jarPaths)
-            throws Exception {
-
-        long lastModified = 0;
-
-        Iterator paths = resourcePaths.iterator();
-        while (paths.hasNext()) {
-            String path = (String) paths.next();
-            URL url = context.getServletContext().getResource(path);
-            if (url == null) {
-                log.debug( "Null url "+ path );
-                break;
-            }
-            long lastM = url.openConnection().getLastModified();
-            if (lastM > lastModified) lastModified = lastM;
-            if (log.isDebugEnabled()) {
-                log.debug( "Last modified " + path + " " + lastM);
-            }
-        }
-
-        if (jarPaths != null) {
-            paths = jarPaths.values().iterator();
-            while (paths.hasNext()) {
-                File jarFile = (File) paths.next();
-                long lastM = jarFile.lastModified();
-                if (lastM > lastModified) lastModified = lastM;
-                if (log.isDebugEnabled()) {
-                    log.debug("Last modified " + jarFile.getAbsolutePath()
-                              + " " + lastM);
-                }
-            }
-        }
-
-        return lastModified;
-    }
-
-    private void processCache(File tldCache ) throws IOException {
-        // read the cache and return;
-        try {
-            FileInputStream in=new FileInputStream(tldCache);
-            ObjectInputStream ois=new ObjectInputStream( in );
-            String list[]=(String [])ois.readObject();
-            if( log.isDebugEnabled() )
-                log.debug("Reusing tldCache " + tldCache + " " + list.length);
-            for( int i=0; list!=null && i<list.length; i++ ) {
-                context.addApplicationListener(list[i]);
-            }
-            ois.close();
-        } catch( ClassNotFoundException ex ) {
-            ex.printStackTrace();
-        }
-    }
-
     /**
      * Scan the JAR file at the specified resource path for TLDs in the
      * <code>META-INF</code> subdirectory, and scan each TLD for application
@@ -449,9 +389,9 @@
 
         try {
             jarFile = new JarFile(file);
-            Enumeration entries = jarFile.entries();
+            Enumeration<JarEntry> entries = jarFile.entries();
             while (entries.hasMoreElements()) {
-                JarEntry entry = (JarEntry) entries.nextElement();
+                JarEntry entry = entries.nextElement();
                 name = entry.getName();
                 if (!name.startsWith("META-INF/")) {
                     continue;
@@ -558,11 +498,11 @@
      * @exception IOException if an input/output error occurs while
      *  accumulating the list of resource paths
      */
-    private Set tldScanResourcePaths() throws IOException {
+    private Set<String> tldScanResourcePaths() throws IOException {
         if (log.isDebugEnabled()) {
             log.debug(" Accumulating TLD resource paths");
         }
-        Set resourcePaths = new HashSet();
+        Set<String> resourcePaths = new HashSet<String>();
 
         // Accumulate resource paths explicitly listed in the web application
         // deployment descriptor
@@ -609,7 +549,7 @@
      */
     private void tldScanResourcePathsWebInf(DirContext resources,
                                             String rootPath,
-                                            Set tldPaths) 
+                                            Set<String> tldPaths) 
             throws IOException {
 
         if (log.isTraceEnabled()) {
@@ -617,9 +557,9 @@
         }
 
         try {
-            NamingEnumeration items = resources.list(rootPath);
+            NamingEnumeration<NameClassPair> items = resources.list(rootPath);
             while (items.hasMoreElements()) {
-                NameClassPair item = (NameClassPair) items.nextElement();
+                NameClassPair item = items.nextElement();
                 String resourcePath = rootPath + "/" + item.getName();
                 if (!resourcePath.endsWith(".tld")
                         && (resourcePath.startsWith("/WEB-INF/classes")
@@ -661,9 +601,9 @@
      *
      * @return Map of JAR file paths
      */
-    private Map getJarPaths() {
+    private Map<String, File> getJarPaths() {
 
-        HashMap jarPathMap = null;
+        HashMap<String, File> jarPathMap = null;
 
         ClassLoader webappLoader = Thread.currentThread().getContextClassLoader();
         ClassLoader loader = webappLoader;
@@ -709,7 +649,7 @@
                             || noTldJars == null
                             || !noTldJars.contains(file.getName())) {
                         if (jarPathMap == null) {
-                            jarPathMap = new HashMap();
+                            jarPathMap = new HashMap<String, File>();
                             jarPathMap.put(path, file);
                         } else if (!jarPathMap.containsKey(path)) {
                             jarPathMap.put(path, file);
@@ -752,7 +692,8 @@
             setTldNamespaceAware(context.getTldNamespaceAware());
     
             // (2) if the attribute wasn't defined on the context
-            //     try the host.
+            //     and override is not set on the context try the host.
+            if (!context.getOverride()) {
             if (!tldValidation) {
               setTldValidation(
                       ((StandardHost) context.getParent()).getXmlValidation());
@@ -762,11 +703,8 @@
               setTldNamespaceAware(
                       ((StandardHost) context.getParent()).getXmlNamespaceAware());
             }
-
-            tldDigester = DigesterFactory.newDigester(tldValidation, 
-                    tldNamespaceAware, 
-                    new TldRuleSet());
-            tldDigester.getParser();
         }
+            tldDigester = createTldDigester(tldNamespaceAware, tldValidation);
     }
 }
+}