svn commit: r1615973 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Aug  5 18:27:27 2014
New Revision: 1615973

URL: http://svn.apache.org/r1615973
Log:
fixing context.xml digester (tomcat 8 upgrade)

Modified:
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1615973&r1=1615972&r2=1615973&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Tue Aug  5 18:27:27 2014
@@ -45,10 +45,9 @@ import org.apache.catalina.loader.Webapp
 import org.apache.catalina.session.StandardManager;
 import org.apache.catalina.startup.Constants;
 import org.apache.catalina.startup.ContextConfig;
+import org.apache.catalina.startup.ContextRuleSet;
 import org.apache.catalina.startup.HostConfig;
-import org.apache.catalina.startup.RealmRuleSet;
-import org.apache.catalina.startup.SetAllPropertiesRule;
-import org.apache.catalina.startup.SetNextNamingRule;
+import org.apache.catalina.startup.NamingRuleSet;
 import org.apache.catalina.users.MemoryUserDatabase;
 import org.apache.catalina.webresources.DirResourceSet;
 import org.apache.naming.ContextAccessController;
@@ -414,25 +413,17 @@ public class TomcatWebAppBuilder impleme
             return CONTEXT_DIGESTER;
         }
 
+        final Map<Class<?>, List<String>> fakeAttributes = new HashMap<>();
+        final List<String> attrs = new ArrayList<>();
+        attrs.add("className");
+        fakeAttributes.put(Object.class, attrs);
+
         final Digester digester = new Digester();
         digester.setValidating(false);
-        digester.addObjectCreate("Context", "org.apache.catalina.core.StandardContext", "className");
-        digester.addSetProperties("Context");
-        digester.addObjectCreate("Context/Loader", "org.apache.catalina.loader.WebappLoader", "className");
-        digester.addSetProperties("Context/Loader");
-        digester.addSetNext("Context/Loader", "setLoader", "org.apache.catalina.Loader");
-        digester.addObjectCreate("Context/Manager", "org.apache.catalina.session.StandardManager", "className");
-        digester.addSetProperties("Context/Manager");
-        digester.addSetNext("Context/Manager", "setManager", "org.apache.catalina.Manager");
-        digester.addObjectCreate("Context/Manager/Store", null, "className");
-        digester.addSetProperties("Context/Manager/Store");
-        digester.addSetNext("Context/Manager/Store", "setStore", "org.apache.catalina.Store");
-        digester.addRuleSet(new RealmRuleSet("Context/"));
-        digester.addCallMethod("Context/WatchedResource", "addWatchedResource", 0);
-        digester.addObjectCreate("Context/Resource", "org.apache.catalina.deploy.ContextResource");
-        digester.addRule("Context/Resource", new SetAllPropertiesRule());
-        digester.addRule("Context/Resource", new SetNextNamingRule("addResource", "org.apache.catalina.deploy.ContextResource"));
-
+        digester.setRulesValidation(false);
+        digester.setFakeAttributes(fakeAttributes);
+        digester.addRuleSet(new ContextRuleSet(""));
+        digester.addRuleSet(new NamingRuleSet("Context/"));
         return digester;
     }