remm 2004/09/02 03:05:00 Modified: catalina/src/share/org/apache/catalina/startup ContextRuleSet.java NamingRuleSet.java Catalina.java Log: - Remove DefaultContext elements from the digester rules. - Fix ResourceLink elements handling: apparently I removed the rule, and forgot to add it back. Oops. - Fix handling of Ejb element (which is not really implemented anyway, but now at least the right rule is used). Revision Changes Path 1.13 +8 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java Index: ContextRuleSet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ContextRuleSet.java 26 Jul 2004 16:04:01 -0000 1.12 +++ ContextRuleSet.java 2 Sep 2004 10:05:00 -0000 1.13 @@ -205,6 +205,13 @@ "setResources", "javax.naming.directory.DirContext"); + digester.addObjectCreate(prefix + "Context/ResourceLink", + "org.apache.catalina.deploy.ContextResourceLink"); + digester.addSetProperties(prefix + "Context/ResourceLink"); + digester.addRule(prefix + "Context/ResourceLink", + new SetNextNamingRule("addResourceLink", + "org.apache.catalina.deploy.ContextResourceLink")); + digester.addObjectCreate(prefix + "Context/Valve", null, // MUST be specified in the element "className"); 1.6 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java Index: NamingRuleSet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/NamingRuleSet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NamingRuleSet.java 26 Jul 2004 16:04:01 -0000 1.5 +++ NamingRuleSet.java 2 Sep 2004 10:05:00 -0000 1.6 @@ -90,9 +90,9 @@ digester.addObjectCreate(prefix + "Ejb", "org.apache.catalina.deploy.ContextEjb"); digester.addRule(prefix + "Ejb", new SetAllPropertiesRule()); - digester.addSetNext(prefix + "Ejb", - "addEjb", - "org.apache.catalina.deploy.ContextEjb"); + digester.addRule(prefix + "Ejb", + new SetNextNamingRule("addEjb", + "org.apache.catalina.deploy.ContextEjb")); digester.addObjectCreate(prefix + "Environment", "org.apache.catalina.deploy.ContextEnvironment"); 1.32 +1 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java Index: Catalina.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Catalina.java 26 Jun 2004 17:41:31 -0000 1.31 +++ Catalina.java 2 Sep 2004 10:05:00 -0000 1.32 @@ -323,10 +323,6 @@ digester.addRuleSet(new NamingRuleSet("Server/GlobalNamingResources/")); digester.addRuleSet(new EngineRuleSet("Server/Service/")); digester.addRuleSet(new HostRuleSet("Server/Service/Engine/")); - digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Default")); - digester.addRuleSet(new NamingRuleSet("Server/Service/Engine/DefaultContext/")); - digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Host/Default")); - digester.addRuleSet(new NamingRuleSet("Server/Service/Engine/Host/DefaultContext/")); digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Host/")); digester.addRuleSet(new ClusterRuleSet("Server/Service/Engine/Host/Cluster/")); digester.addRuleSet(new NamingRuleSet("Server/Service/Engine/Host/Context/"));
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]