geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r407962 - in /geronimo/branches/1.1: configs/console-jetty/src/plan/ configs/console-tomcat/src/plan/ configs/daytrader-jetty/src/plan/ configs/daytrader-tomcat/src/plan/ configs/jetty-deployer/src/plan/ configs/jsp-examples-jetty/src/plan/...
Date Sat, 20 May 2006 07:28:11 GMT
Author: djencks
Date: Sat May 20 00:28:09 2006
New Revision: 407962

URL: http://svn.apache.org/viewvc?rev=407962&view=rev
Log:
GERONIMO-2043 remove context-priority-classloader element, add dependency element extending artifact, tweak security-builder build, upgrade upgrader to remove context-priority-classloader elements 

Added:
    geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1.xml
    geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1_result.xml
Modified:
    geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/jsp-examples-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/jsp-examples-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/ldap-demo-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/ldap-demo-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/remote-deploy-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/remote-deploy-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/servlets-examples-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/servlets-examples-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/welcome-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/welcome-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml
    geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
    geronimo/branches/1.1/modules/security-builder/project.xml
    geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
    geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd
    geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd
    geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java
    geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
    geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd

Modified: geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -24,7 +24,6 @@
         <web>framework.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <context-root>/console</context-root>
-            <context-priority-classloader>false</context-priority-classloader>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
         </web-app>
     </module>
@@ -33,7 +32,6 @@
         <web>standard.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <context-root>/console-standard</context-root>
-            <context-priority-classloader>false</context-priority-classloader>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
         </web-app>
     </module>

Modified: geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -24,7 +24,6 @@
         <web>framework.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
             <context-root>/console</context-root>
-            <context-priority-classloader>false</context-priority-classloader>
             <cross-context/>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
         </web-app>
@@ -34,7 +33,6 @@
         <web>standard.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
             <context-root>/console-standard</context-root>
-            <context-priority-classloader>false</context-priority-classloader>
             <cross-context/>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
         </web-app>

Modified: geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -4,7 +4,6 @@
     <module>
         <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
-            <context-priority-classloader>false</context-priority-classloader>
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>

Modified: geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -4,7 +4,6 @@
     <module>
         <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
-            <context-priority-classloader>false</context-priority-classloader>
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>

Modified: geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty-deployer/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -20,7 +20,6 @@
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
-        <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">?name=JettyWebContainer</attribute>
         <references name="DefaultServlets">

Modified: geronimo/branches/1.1/configs/jsp-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/jsp-examples-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -23,7 +23,6 @@
     >
 
     <context-root>/jsp-examples</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>geronimo-properties-realm</security-realm-name>
     <security>
         <default-principal>

Modified: geronimo/branches/1.1/configs/jsp-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/jsp-examples-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jsp-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jsp-examples-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -23,7 +23,6 @@
         >
 
     <context-root>/jsp-examples</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>geronimo-properties-realm</security-realm-name>
     <security>
         <default-principal>

Modified: geronimo/branches/1.1/configs/ldap-demo-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/ldap-demo-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -4,7 +4,6 @@
 
     >
     <context-root>/ldap-demo</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>ldap-realm</security-realm-name>
     <security>
         <default-principal realm-name="ldap-realm">

Modified: geronimo/branches/1.1/configs/ldap-demo-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/ldap-demo-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-demo-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/ldap-demo-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -3,7 +3,6 @@
     xmlns:sec="http://geronimo.apache.org/xml/ns/security">
     
     <context-root>/ldap-demo</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>ldap-realm</security-realm-name>
     <security>
         <default-principal realm-name="ldap-realm">

Modified: geronimo/branches/1.1/configs/remote-deploy-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/remote-deploy-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/remote-deploy-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -25,7 +25,6 @@
     >
 
     <context-root>/remote-deploy</context-root>
-    <context-priority-classloader>true</context-priority-classloader>
     <security-realm-name>geronimo-properties-realm</security-realm-name>
     <sec:security>
         <sec:default-principal>

Modified: geronimo/branches/1.1/configs/remote-deploy-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/remote-deploy-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/remote-deploy-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/remote-deploy-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -25,7 +25,6 @@
     >
 
     <context-root>/remote-deploy</context-root>
-    <context-priority-classloader>true</context-priority-classloader>
     <security-realm-name>geronimo-properties-realm</security-realm-name>
     <sec:security>
         <sec:default-principal>

Modified: geronimo/branches/1.1/configs/servlets-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/servlets-examples-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -23,7 +23,6 @@
     >
 
     <context-root>/servlets-examples</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>geronimo-properties-realm</security-realm-name>
     <security>
         <default-principal>

Modified: geronimo/branches/1.1/configs/servlets-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/servlets-examples-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/servlets-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/servlets-examples-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -23,7 +23,6 @@
     >
 
     <context-root>/servlets-examples</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>geronimo-properties-realm</security-realm-name>
     <security>
         <default-principal>

Modified: geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/tomcat-deployer/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -21,7 +21,6 @@
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
-        <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="tomcatContainerName">?name=TomcatWebContainer</attribute>
         <references name="WebServiceBuilder">
             <pattern>

Modified: geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/uddi-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -25,7 +25,6 @@
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
 
             <context-root>/juddi</context-root>
-            <context-priority-classloader>false</context-priority-classloader>
 
             <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
                 <!-- copies uddi derby db files into specified location -->

Modified: geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/uddi-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -26,7 +26,6 @@
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
 
             <context-root>/juddi</context-root>
-            <context-priority-classloader>false</context-priority-classloader>
             <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
                 <!-- copies uddi derby db files into specified location -->
                 <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>

Modified: geronimo/branches/1.1/configs/welcome-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/welcome-jetty/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/welcome-jetty/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -23,5 +23,4 @@
     >
 
     <context-root>/</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
 </web-app>

Modified: geronimo/branches/1.1/configs/welcome-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/configs/welcome-tomcat/src/plan/plan.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/welcome-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/welcome-tomcat/src/plan/plan.xml Sat May 20 00:28:09 2006
@@ -23,5 +23,4 @@
     >
 
     <context-root>/</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
 </web-app>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Sat May 20 00:28:09 2006
@@ -130,7 +130,6 @@
     private final Collection defaultFilters;
     private final Collection defaultFilterMappings;
     private final GBeanData pojoWebServiceTemplate;
-    private final boolean defaultContextPriorityClassloader;
 
     private final SingleElementCollection webServiceBuilder;
 
@@ -141,7 +140,6 @@
 
     public JettyModuleBuilder(Environment defaultEnvironment,
             Integer defaultSessionTimeoutSeconds,
-            boolean defaultContextPriorityClassloader,
             List defaultWelcomeFiles,
             AbstractNameQuery jettyContainerName,
             Collection defaultServlets,
@@ -153,7 +151,6 @@
         super(kernel);
         this.defaultEnvironment = defaultEnvironment;
         this.defaultSessionTimeoutSeconds = (defaultSessionTimeoutSeconds == null) ? new Integer(30 * 60) : defaultSessionTimeoutSeconds;
-        this.defaultContextPriorityClassloader = defaultContextPriorityClassloader;
         this.jettyContainerObjectName = jettyContainerName;
         this.defaultServlets = defaultServlets;
         this.defaultFilters = defaultFilters;
@@ -232,12 +229,6 @@
             warName = warName.substring(0, warName.lastIndexOf('.'));
         }
         idBuilder.resolve(environment, warName, "war");
-        boolean contextPriorityClassLoader = defaultContextPriorityClassloader;
-        if (jettyWebApp.isSetContextPriorityClassloader()) {
-            contextPriorityClassLoader = jettyWebApp.getContextPriorityClassloader();
-        }
-        //TODO decide if we should eliminate this flag as redundant w/environment setting.
-        environment.setInverseClassLoading(contextPriorityClassLoader);
 
         Map servletNameToPathMap = buildServletNameToPathMap(webApp, contextRoot);
 
@@ -307,7 +298,6 @@
     private JettyWebAppType createDefaultPlan(String contextRoot) {
         JettyWebAppType jettyWebApp = JettyWebAppType.Factory.newInstance();
         jettyWebApp.setContextRoot(contextRoot);
-        jettyWebApp.setContextPriorityClassloader(defaultContextPriorityClassloader);
         return jettyWebApp;
     }
 
@@ -936,7 +926,6 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JettyModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
         infoBuilder.addAttribute("defaultSessionTimeoutSeconds", Integer.class, true, true);
-        infoBuilder.addAttribute("defaultContextPriorityClassloader", boolean.class, true, true);
         infoBuilder.addAttribute("defaultWelcomeFiles", List.class, true, true);
         infoBuilder.addAttribute("jettyContainerObjectName", AbstractNameQuery.class, true, true);
         infoBuilder.addReference("DefaultServlets", JettyDefaultServletHolder.class, NameFactory.SERVLET_TEMPLATE);
@@ -950,7 +939,6 @@
         infoBuilder.setConstructor(new String[]{
                 "defaultEnvironment",
                 "defaultSessionTimeoutSeconds",
-                "defaultContextPriorityClassloader",
                 "defaultWelcomeFiles",
                 "jettyContainerObjectName",
                 "DefaultServlets",

Modified: geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/schema/geronimo-jetty-1.1.xsd Sat May 20 00:28:09 2006
@@ -39,7 +39,7 @@
             <xs:element ref="sys:environment" minOccurs="0"/>
 
             <xs:element name="context-root" type="xs:string" minOccurs="0"/>
-            <xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>
+            <!--<xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>-->
 
             <xs:element ref="naming:web-container" minOccurs="0"/>
 

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml Sat May 20 00:28:09 2006
@@ -28,7 +28,6 @@
     </environment>
 
     <jetty:context-root>/test</jetty:context-root>
-    <jetty:context-priority-classloader>false</jetty:context-priority-classloader>
     <!--
         <jetty:security>
             <sec:default-principal>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml Sat May 20 00:28:09 2006
@@ -29,7 +29,6 @@
     </environment>
                                                               
     <context-root>/test</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <login-domain-name>demo-properties-realm</login-domain-name>
     <sec:security>
         <sec:auto-map-roles security-realm="demo-properties-realm"/>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml Sat May 20 00:28:09 2006
@@ -29,7 +29,6 @@
     </environment>
                                                               
     <context-root>/test</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <resource-ref>
         <ref-name>jdbc/DB1</ref-name>
         <resource-link>DefaultDatabase</resource-link>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1.xml Sat May 20 00:28:09 2006
@@ -10,7 +10,6 @@
         </moduleId>
     </environment>
 
-    <context-priority-classloader>false</context-priority-classloader>
     <resource-ref>
         <ref-name>jdbc/DB1</ref-name>
         <resource-link>DefaultDatabase</resource-link>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1A.xml Sat May 20 00:28:09 2006
@@ -8,7 +8,6 @@
             <type>car</type>
         </moduleId>
     </environment>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>public-properties-realm</security-realm-name>
     <security default-role="UNASSIGNED" doas-current-caller="true">
         <default-principal>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1B.xml Sat May 20 00:28:09 2006
@@ -8,7 +8,6 @@
             <type>car</type>
         </moduleId>
     </environment>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>public-properties-realm</security-realm-name>
     <security default-role="UNASSIGNED" doas-current-caller="true">
         <default-principal>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan1C.xml Sat May 20 00:28:09 2006
@@ -9,7 +9,6 @@
         </moduleId>
     </environment>
 
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>public-properties-realm</security-realm-name>
     <security default-role="UNASSIGNED" doas-current-caller="true">
         <default-principal>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan2.xml Sat May 20 00:28:09 2006
@@ -8,7 +8,6 @@
             <type>car</type>
         </moduleId>
     </environment>
-    <context-priority-classloader>false</context-priority-classloader>
     <resource-ref>
         <ref-name>jdbc/DB1</ref-name>
         <resource-link>DefaultDatabase</resource-link>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml Sat May 20 00:28:09 2006
@@ -10,7 +10,6 @@
             <dep:type>car</dep:type>
         </dep:moduleId>
     </dep:environment>
-    <context-priority-classloader>true</context-priority-classloader>
 
     <virtual-host>foo</virtual-host>
     <virtual-host>bar</virtual-host>

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml Sat May 20 00:28:09 2006
@@ -9,7 +9,6 @@
         </moduleId>
     </environment>
 
-    <context-priority-classloader>true</context-priority-classloader>
 
     <container-config>
         <jetty xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0/config">

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Sat May 20 00:28:09 2006
@@ -316,7 +316,7 @@
 
         defaultEnvironment.addDependency(baseId, ImportType.ALL);
         defaultEnvironment.setConfigId(webModuleArtifact);
-        builder = new JettyModuleBuilder(defaultEnvironment, new Integer(1800), false, Collections.EMPTY_LIST, new AbstractNameQuery(containerName), defaultServlets, defaultFilters, defaultFilterMappings, pojoWebServiceTemplate, Collections.singleton(webServiceBuilder), kernel);
+        builder = new JettyModuleBuilder(defaultEnvironment, new Integer(1800), Collections.EMPTY_LIST, new AbstractNameQuery(containerName), defaultServlets, defaultFilters, defaultFilterMappings, pojoWebServiceTemplate, Collections.singleton(webServiceBuilder), kernel);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java Sat May 20 00:28:09 2006
@@ -48,7 +48,7 @@
     private JettyModuleBuilder builder;
 
     public PlanParsingTest() throws Exception {
-        builder = new JettyModuleBuilder(defaultEnvironment, new Integer(1800), false, null, jettyContainerObjectName, new HashSet(), new HashSet(), new HashSet(), pojoWebServiceTemplate, Collections.singleton(webServiceBuilder), null);
+        builder = new JettyModuleBuilder(defaultEnvironment, new Integer(1800), null, jettyContainerObjectName, new HashSet(), new HashSet(), new HashSet(), pojoWebServiceTemplate, Collections.singleton(webServiceBuilder), null);
     }
 
     public void testContents() throws Exception {
@@ -113,7 +113,6 @@
         JettyWebAppDocument jettyWebAppDoc = JettyWebAppDocument.Factory.newInstance();
         JettyWebAppType webApp = jettyWebAppDoc.addNewWebApp();
         addEnvironment(webApp);
-        webApp.setContextPriorityClassloader(false);
         GerResourceRefType ref = webApp.addNewResourceRef();
         ref.setRefName("ref");
         ref.setResourceLink("target");
@@ -131,23 +130,6 @@
         configId.setType("car");
     }
 
-    public void testContextPriorityClassloader() throws Exception {
-        URL resourcePlan = classLoader.getResource("plans/plan3.xml");
-        assertTrue(resourcePlan != null);
-
-        JettyWebAppType jettyWebApp = builder.getJettyWebApp(new File(resourcePlan.getFile()), null, false, null, null);
-        assertFalse(jettyWebApp.getContextPriorityClassloader());
-    }
-
-    public void testContextPriorityClassloaderTrue() throws Exception {
-        URL resourcePlan = classLoader.getResource("plans/plan4.xml");
-        assertTrue(resourcePlan != null);
-
-        JettyWebAppType jettyWebApp = builder.getJettyWebApp(new File(resourcePlan.getFile()), null, false, null, null);
-        assertTrue(jettyWebApp.getContextPriorityClassloader());
-
-    }
-
     /** This test has 2 purposes: one the obvious one explicitly tested,
      * the other that passing a JettyWebAppType XmlObject in works.  This latter
      * models a web-app element inside an ear plan.
@@ -160,7 +142,6 @@
         JettyWebAppType webApp = jettyWebAppDoc.addNewWebApp();
         addEnvironment(webApp);
         webApp.setContextRoot("myContextRoot");
-        webApp.setContextPriorityClassloader(false);
 
         URL war = classLoader.getResource("deployables/war2.war");
         assertTrue(war != null);

Modified: geronimo/branches/1.1/modules/security-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/security-builder/project.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security-builder/project.xml (original)
+++ geronimo/branches/1.1/modules/security-builder/project.xml Sat May 20 00:28:09 2006
@@ -79,8 +79,7 @@
             <version>${pom.currentVersion}</version>
         </dependency>
 
-        <!--needed only because security schema references j2ee 1.4 schema for description element -->
-<!--
+        <!--needed only because security schema references xml.xsd schema for description element -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
@@ -89,7 +88,6 @@
                 <xmlbeans>true</xmlbeans>
             </properties>
         </dependency>
--->
 
         <!--pattern element in login config ref -->
         <dependency>

Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java Sat May 20 00:28:09 2006
@@ -36,6 +36,7 @@
 import org.apache.geronimo.deployment.xbeans.EnvironmentDocument;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.deployment.xbeans.ImportType;
+import org.apache.geronimo.deployment.xbeans.DependencyType;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Dependency;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -58,7 +59,7 @@
             }
 
             if (environmentType.isSetDependencies()) {
-                ArtifactType[] dependencyArray = environmentType.getDependencies().getDependencyArray();
+                DependencyType[] dependencyArray = environmentType.getDependencies().getDependencyArray();
                 LinkedHashSet dependencies = toDependencies(dependencyArray);
                 environment.setDependencies(dependencies);
             }
@@ -100,10 +101,10 @@
             environmentType.setModuleId(configId);
         }
 
-        List dependencies = toArtifactTypes(environment.getDependencies());
-        ArtifactType[] artifactTypes = (ArtifactType[]) dependencies.toArray(new ArtifactType[dependencies.size()]);
+        List dependencies = toDependencyTypes(environment.getDependencies());
+        DependencyType[] dependencyTypes = (DependencyType[]) dependencies.toArray(new DependencyType[dependencies.size()]);
         DependenciesType dependenciesType = environmentType.addNewDependencies();
-        dependenciesType.setDependencyArray(artifactTypes);
+        dependenciesType.setDependencyArray(dependencyTypes);
         if (environment.isInverseClassLoading()) {
             environmentType.addNewInverseClassloading();
         }
@@ -122,11 +123,11 @@
         return classFilter;
     }
 
-    private static List toArtifactTypes(Collection artifacts) {
+    private static List toDependencyTypes(Collection artifacts) {
         List dependencies = new ArrayList();
         for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
             Dependency dependency = (Dependency) iterator.next();
-            ArtifactType artifactType = toArtifactType(dependency);
+            ArtifactType artifactType = toDependencyType(dependency);
             dependencies.add(artifactType);
         }
         return dependencies;
@@ -134,6 +135,11 @@
 
     private static ArtifactType toArtifactType(Artifact artifact) {
         ArtifactType artifactType = ArtifactType.Factory.newInstance();
+        fillArtifactType(artifact, artifactType);
+        return artifactType;
+    }
+
+    private static void fillArtifactType(Artifact artifact, ArtifactType artifactType) {
         if (artifact.getGroupId() != null) {
             artifactType.setGroupId(artifact.getGroupId());
         }
@@ -146,20 +152,20 @@
         if (artifact.getType() != null) {
             artifactType.setType(artifact.getType());
         }
-        return artifactType;
     }
 
-    private static ArtifactType toArtifactType(Dependency dependency) {
-        ArtifactType artifactType = toArtifactType(dependency.getArtifact());
+    private static DependencyType toDependencyType(Dependency dependency) {
+        DependencyType dependencyType = DependencyType.Factory.newInstance();
+        fillArtifactType(dependency.getArtifact(), dependencyType);
 
         org.apache.geronimo.kernel.repository.ImportType importType = dependency.getImportType();
         if (importType == org.apache.geronimo.kernel.repository.ImportType.CLASSES) {
-            artifactType.setImport(ImportType.CLASSES);
+            dependencyType.setImport(ImportType.CLASSES);
         } else if (importType == org.apache.geronimo.kernel.repository.ImportType.SERVICES) {
-            artifactType.setImport(ImportType.SERVICES);
+            dependencyType.setImport(ImportType.SERVICES);
         }
 
-        return artifactType;
+        return dependencyType;
     }
 
     private static Set toFilters(ClassFilterType filterType) {
@@ -185,31 +191,30 @@
         return artifacts;
     }
 
-    private static LinkedHashSet toDependencies(ArtifactType[] dependencyArray) {
+    private static LinkedHashSet toDependencies(DependencyType[] dependencyArray) {
         LinkedHashSet dependencies = new LinkedHashSet();
         for (int i = 0; i < dependencyArray.length; i++) {
-            ArtifactType artifactType = dependencyArray[i];
+            DependencyType artifactType = dependencyArray[i];
             Dependency dependency = toDependency(artifactType);
             dependencies.add(dependency);
         }
         return dependencies;
     }
 
-    private static Dependency toDependency(ArtifactType artifactType) {
-        Artifact artifact = toArtifact(artifactType, null);
-        if (ImportType.CLASSES.equals(artifactType.getImport())) {
+    private static Dependency toDependency(DependencyType dependencyType) {
+        Artifact artifact = toArtifact(dependencyType, null);
+        if (ImportType.CLASSES.equals(dependencyType.getImport())) {
             return new Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.CLASSES);
-        } else if (ImportType.SERVICES.equals(artifactType.getImport())) {
+        } else if (ImportType.SERVICES.equals(dependencyType.getImport())) {
             return new Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.SERVICES);
-        } else if (artifactType.getImport() == null) {
+        } else if (dependencyType.getImport() == null) {
             return new Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.ALL);
         } else {
-            throw new IllegalArgumentException("Unknown import type: " + artifactType.getImport());
+            throw new IllegalArgumentException("Unknown import type: " + dependencyType.getImport());
         }
     }
 
-    //TODO make private
-    static Artifact toArtifact(ArtifactType artifactType, String defaultType) {
+    private static Artifact toArtifact(ArtifactType artifactType, String defaultType) {
         String groupId = artifactType.isSetGroupId() ? trim(artifactType.getGroupId()) : null;
         String type = artifactType.isSetType() ? trim(artifactType.getType()) : defaultType;
         String artifactId = trim(artifactType.getArtifactId());

Modified: geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd Sat May 20 00:28:09 2006
@@ -156,7 +156,7 @@
 
     <xs:complexType name="dependenciesType">
         <xs:sequence>
-            <xs:element name="dependency" type="sys:artifactType" minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="dependency" type="sys:dependencyType" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
                     <xs:documentation>
                         "dependency" holds an artifact locating an artifact in a repository.
@@ -234,9 +234,19 @@
                 <xs:element name="artifactId" type="xs:string"/>
                 <xs:element name="version" type="xs:string" minOccurs="0"/>
                 <xs:element name="type" type="xs:string" minOccurs="0"/>
-                <xs:element name="import" type="sys:importType" minOccurs="0"/>
 
             </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="dependencyType">
+        <xs:complexContent>
+            <xs:extension base="sys:artifactType">
+                <xs:sequence>
+                    <xs:element name="import" type="sys:importType" minOccurs="0"/>
+                </xs:sequence>
+
+            </xs:extension>
+        </xs:complexContent>
     </xs:complexType>
 
     <xs:simpleType name="importType">

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Sat May 20 00:28:09 2006
@@ -99,7 +99,6 @@
     private static final Log log = LogFactory.getLog(TomcatModuleBuilder.class);
 
     private final Environment defaultEnvironment;
-    private final boolean defaultContextPriorityClassloader;
     private final AbstractNameQuery tomcatContainerName;
 
     private final SingleElementCollection webServiceBuilder;
@@ -107,14 +106,12 @@
     private static final String TOMCAT_NAMESPACE = TomcatWebAppDocument.type.getDocumentElementName().getNamespaceURI();
 
     public TomcatModuleBuilder(Environment defaultEnvironment,
-                               boolean defaultContextPriorityClassloader,
-                               AbstractNameQuery tomcatContainerName,
-                               Collection webServiceBuilder,
-                               Kernel kernel) {
+            AbstractNameQuery tomcatContainerName,
+            Collection webServiceBuilder,
+            Kernel kernel) {
         super(kernel);
         this.defaultEnvironment = defaultEnvironment;
 
-        this.defaultContextPriorityClassloader = defaultContextPriorityClassloader;
         this.tomcatContainerName = tomcatContainerName;
         this.webServiceBuilder = new SingleElementCollection(webServiceBuilder);
     }
@@ -178,12 +175,6 @@
             warName = warName.substring(0, warName.lastIndexOf('.'));
         }
         idBuilder.resolve(environment, warName, "war");
-        boolean contextPriorityClassLoader = defaultContextPriorityClassloader;
-        if (tomcatWebApp.isSetContextPriorityClassloader()) {
-            contextPriorityClassLoader = tomcatWebApp.getContextPriorityClassloader();
-        }
-        //TODO decide if we should eliminate this flag as redundant w/environment setting.
-        environment.setInverseClassLoading(contextPriorityClassLoader);
 
         Map servletNameToPathMap = buildServletNameToPathMap(webApp, contextRoot);
 
@@ -254,7 +245,6 @@
     private TomcatWebAppType createDefaultPlan(String path) {
         TomcatWebAppType tomcatWebApp = TomcatWebAppType.Factory.newInstance();
         tomcatWebApp.setContextRoot("/" + path);
-        tomcatWebApp.setContextPriorityClassloader(defaultContextPriorityClassloader);
         return tomcatWebApp;
     }
 
@@ -484,7 +474,6 @@
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(TomcatModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoBuilder.addAttribute("defaultContextPriorityClassloader", boolean.class, true, true);
         infoBuilder.addAttribute("tomcatContainerName", AbstractNameQuery.class, true, true);
         infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("kernel", Kernel.class, false);
@@ -492,7 +481,6 @@
 
         infoBuilder.setConstructor(new String[]{
             "defaultEnvironment",
-            "defaultContextPriorityClassloader",
             "tomcatContainerName",
             "WebServiceBuilder",
             "kernel"});

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd Sat May 20 00:28:09 2006
@@ -39,7 +39,7 @@
             <xs:element ref="sys:environment" minOccurs="0"/>
 
             <xs:element name="context-root" type="xs:string" minOccurs="0"/>
-            <xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>
+            <!--<xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>-->
 
             <xs:element ref="naming:web-container" minOccurs="0"/>
 

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml Sat May 20 00:28:09 2006
@@ -19,7 +19,6 @@
 <tomcat:web-app
     xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
     <tomcat:context-root>/test</tomcat:context-root>
-    <tomcat:context-priority-classloader>false</tomcat:context-priority-classloader>
     <!--
         <tomcat:security>
             <sec:default-principal>

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml Sat May 20 00:28:09 2006
@@ -21,7 +21,6 @@
     xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
 
     <context-root>/test</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <login-domain-name>demo-properties-realm</login-domain-name>
     <sec:security>
         <sec:auto-map-roles security-realm="demo-properties-realm"/>

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml Sat May 20 00:28:09 2006
@@ -28,7 +28,6 @@
     </environment>
 
     <context-root>/test</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
     <container-config>
         <tomcat xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0/tomcat">
 <!--            <host>tomcathost</host>-->

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml Sat May 20 00:28:09 2006
@@ -8,7 +8,6 @@
             <type>car</type>
         </moduleId>
     </environment>
-    <context-priority-classloader>false</context-priority-classloader>
     <security-realm-name>public-properties-realm</security-realm-name>
     <security default-role="UNASSIGNED" doas-current-caller="true">
         <default-principal>

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java Sat May 20 00:28:09 2006
@@ -35,7 +35,7 @@
     private TomcatModuleBuilder builder;
 
     protected void setUp() throws Exception {
-        builder = new TomcatModuleBuilder(defaultEnvironment, false, tomcatContainerObjectName, Collections.singleton(webServiceBuilder), null);
+        builder = new TomcatModuleBuilder(defaultEnvironment, tomcatContainerObjectName, Collections.singleton(webServiceBuilder), null);
     }
 
     public void testResourceRef() throws Exception {
@@ -53,7 +53,6 @@
         ArtifactType artifactType = environmentType.addNewModuleId();
         artifactType.setArtifactId("foo");
 
-        tomcatWebAppType.setContextPriorityClassloader(false);
         GerResourceRefType ref = tomcatWebAppType.addNewResourceRef();
         ref.setRefName("ref");
         ref.setResourceLink("target");

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Sat May 20 00:28:09 2006
@@ -376,7 +376,7 @@
 
         defaultEnvironment.addDependency(baseId, ImportType.ALL);
         defaultEnvironment.setConfigId(webModuleArtifact);
-        builder = new TomcatModuleBuilder(defaultEnvironment, true, new AbstractNameQuery(containerName), Collections.singleton(webServiceBuilder), null);
+        builder = new TomcatModuleBuilder(defaultEnvironment, new AbstractNameQuery(containerName), Collections.singleton(webServiceBuilder), null);
     }
 
     protected void tearDown() throws Exception {

Modified: geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java (original)
+++ geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java Sat May 20 00:28:09 2006
@@ -121,6 +121,7 @@
 
                     insertEnvironment(configId, parentId, cursor, ENVIRONMENT_QNAME, suppressDefaultEnvironment);
                 } else {
+                    cleanContextPriorityClassLoader(cursor);
                     cleanRef(cursor);
                 }
                 checkInvalid(cursor);
@@ -129,20 +130,30 @@
         return xmlObject;
     }
 
+    private void cleanContextPriorityClassLoader(XmlCursor cursor) {
+        String localName = getLocalName(cursor);
+        if ("context-priority-classloader".equals(localName)) {
+            String value = cursor.getTextValue();
+            if ("false".equals(value)) {
+                cursor.removeXml();
+            } else if ("true".equals("true")) {
+                cursor.removeXml();
+                cursor.insertComment("YOU MUST INSERT THE ELEMENT <inverse-classloading/> INTO THE ENVIRONMENT ELEMENT FOR THIS MODULE");
+            }
+        }
+    }
+
     private static void checkInvalid(XmlCursor cursor) throws XmlException {
-        QName name = cursor.getName();
-        if (name != null) {
-            String localName = name.getLocalPart();
-            if ("gbean".equals(localName)) {
-                if (cursor.getAttributeText(GBEAN_NAME_QNAME) != null) {
-                    throw new XmlException("You must replace the gbeanName attribute manually: " + cursor.getAttributeText(GBEAN_NAME_QNAME));
-                }
+        String localName = getLocalName(cursor);
+        if ("gbean".equals(localName)) {
+            if (cursor.getAttributeText(GBEAN_NAME_QNAME) != null) {
+                throw new XmlException("You must replace the gbeanName attribute manually: " + cursor.getAttributeText(GBEAN_NAME_QNAME));
             }
         }
     }
 
     private static void cleanRef(XmlCursor cursor) throws XmlException {
-        String localName = cursor.getName().getLocalPart();
+        String localName = getLocalName(cursor);
         if ("ejb-ref".equals(localName)) {
             cursor.toFirstChild();
             String application = null;
@@ -232,6 +243,11 @@
         }
     }
 
+    private static String getLocalName(XmlCursor cursor) {
+        QName name = cursor.getName();
+        return name == null ? null : name.getLocalPart();
+    }
+
     private static void insertEnvironment(Artifact configId, Artifact parentId, XmlCursor cursor, QName environmentQname, boolean suppressDefaultEnvironment) {
         positionEnvironment(cursor);
         Environment environment = new Environment();
@@ -257,7 +273,7 @@
             return;
         }
         do {
-            String localPart = cursor.getName().getLocalPart();
+            String localPart = getLocalName(cursor);
             if (localPart.equals("dependency") || localPart.equals("import")) {
                 extractDependency(cursor, environment);
             } else {

Added: geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1.xml?rev=407962&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1.xml (added)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1.xml Sat May 20 00:28:09 2006
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+    configId="servlet_1"
+    parentId="${pom.groupId}/server-security/${pom.currentVersion}/car">
+
+    <module>
+        <web>servlet_deploy_ejblink_single_web.war</web>
+        <web-app
+            xmlns="http://geronimo.apache.org/xml/ns/web"
+            configId="servlet_1_web_1">
+
+            <context-priority-classloader>false</context-priority-classloader>
+
+            <ejb-ref>
+                <ref-name>ejb/StatelessBean_ExternalJAR</ref-name>
+                <ejb-link>Stateless</ejb-link>
+            </ejb-ref>
+        </web-app>
+    </module>
+    <module>
+        <web>servlet_deploy_ejblink_single_web.war</web>
+        <web-app
+            xmlns="http://geronimo.apache.org/xml/ns/web"
+            configId="servlet_1_web_2">
+
+            <context-priority-classloader>true</context-priority-classloader>
+
+            <ejb-ref>
+                <ref-name>ejb/StatelessBean_ExternalJAR</ref-name>
+                <ejb-link>Stateless</ejb-link>
+            </ejb-ref>
+        </web-app>
+    </module>
+    <module>
+        <web>servlet_deploy_ejblink_single_web.war</web>
+        <web-app
+            xmlns="http://geronimo.apache.org/xml/ns/web"
+            configId="servlet_1_web_3">
+
+            <context-priority-classloader>false</context-priority-classloader>
+        </web-app>
+    </module>
+    <module>
+        <web>servlet_deploy_ejblink_single_web.war</web>
+        <web-app
+            xmlns="http://geronimo.apache.org/xml/ns/web"
+            configId="servlet_1_web_4">
+
+            <context-priority-classloader>true</context-priority-classloader>
+        </web-app>
+    </module>
+
+
+</application>

Added: geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1_result.xml?rev=407962&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1_result.xml (added)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/servlet_1_result.xml Sat May 20 00:28:09 2006
@@ -0,0 +1,94 @@
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <dep:moduleId>
+      <dep:groupId>default</dep:groupId>
+      <dep:artifactId>servlet_1</dep:artifactId>
+      <dep:version>1-default</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>${pom.groupId}</dep:groupId>
+        <dep:artifactId>server-security</dep:artifactId>
+        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <module>
+    <web>servlet_deploy_ejblink_single_web.war</web>
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:moduleId>
+          <dep:groupId>default</dep:groupId>
+          <dep:artifactId>servlet_1_web_1</dep:artifactId>
+          <dep:version>1-default</dep:version>
+          <dep:type>car</dep:type>
+        </dep:moduleId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+      </dep:environment>
+      <ejb-ref>
+        <ref-name>ejb/StatelessBean_ExternalJAR</ref-name>
+        <ejb-link>Stateless</ejb-link>
+      </ejb-ref>
+    </web-app>
+  </module>
+  <module>
+    <web>servlet_deploy_ejblink_single_web.war</web>
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:moduleId>
+          <dep:groupId>default</dep:groupId>
+          <dep:artifactId>servlet_1_web_2</dep:artifactId>
+          <dep:version>1-default</dep:version>
+          <dep:type>car</dep:type>
+        </dep:moduleId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+      </dep:environment>
+      <!--YOU MUST INSERT THE ELEMENT <inverse-classloading/> INTO THE ENVIRONMENT ELEMENT FOR THIS MODULE-->
+      <ejb-ref>
+        <ref-name>ejb/StatelessBean_ExternalJAR</ref-name>
+        <ejb-link>Stateless</ejb-link>
+      </ejb-ref>
+    </web-app>
+  </module>
+    <module>
+      <web>servlet_deploy_ejblink_single_web.war</web>
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+        <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+          <dep:moduleId>
+            <dep:groupId>default</dep:groupId>
+            <dep:artifactId>servlet_1_web_3</dep:artifactId>
+            <dep:version>1-default</dep:version>
+            <dep:type>car</dep:type>
+          </dep:moduleId>
+          <dep:dependencies/>
+          <dep:hidden-classes/>
+          <dep:non-overridable-classes/>
+        </dep:environment>
+      </web-app>
+    </module>
+    <module>
+      <web>servlet_deploy_ejblink_single_web.war</web>
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+        <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+          <dep:moduleId>
+            <dep:groupId>default</dep:groupId>
+            <dep:artifactId>servlet_1_web_4</dep:artifactId>
+            <dep:version>1-default</dep:version>
+            <dep:type>car</dep:type>
+          </dep:moduleId>
+          <dep:dependencies/>
+          <dep:hidden-classes/>
+          <dep:non-overridable-classes/>
+        </dep:environment>
+        <!--YOU MUST INSERT THE ELEMENT <inverse-classloading/> INTO THE ENVIRONMENT ELEMENT FOR THIS MODULE-->
+      </web-app>
+    </module>
+</application>
\ No newline at end of file

Modified: geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java Sat May 20 00:28:09 2006
@@ -69,6 +69,10 @@
         }
     }
 
+    public void test7() throws Exception {
+        test("servlet_1");
+    }
+
     private void test(String testName) throws Exception {
         InputStream srcXml = classLoader.getResourceAsStream(testName + ".xml");
         try {

Modified: geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java (original)
+++ geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java Sat May 20 00:28:09 2006
@@ -61,27 +61,6 @@
         getWebApp().setContextRoot(contextRoot);
     }
 
-    /**
-     * getContextPriorityClassLoader.
-     *
-     * @return True if this context should give web application class in preference over the containers
-     *         classes, as per the servlet specification recommendations.
-     */
-    public boolean getContextPriorityClassLoader() {
-        return getWebApp().getContextPriorityClassloader();
-    }
-
-    /**
-     * setContextPriorityClassLoader.
-     *
-     * @param contextPriority True if this context should give web application class in preference over the containers
-     * classes, as per the servlet specification recommendations.
-     */
-    public void setContextPriorityClassLoader(boolean contextPriority) {
-        pcs.firePropertyChange("contextPriorityClassLoader", getContextPriorityClassLoader(), contextPriority);
-        getWebApp().setContextPriorityClassloader(contextPriority);
-    }
-
     public DConfigBean getDConfigBean(DDBean ddBean) throws ConfigurationException {
         return encHelper.getDConfigBean(ddBean);
     }

Modified: geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd?rev=407962&r1=407961&r2=407962&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd Sat May 20 00:28:09 2006
@@ -39,7 +39,7 @@
             <xs:element ref="sys:environment" minOccurs="0"/>
 
             <xs:element name="context-root" type="xs:string" minOccurs="0"/>
-            <xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>
+            <!--<xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>-->
             <xs:element ref="naming:web-container" minOccurs="0"/>
             <xs:element name="container-config" type="web:container-configType" minOccurs="0"/>
 



Mime
View raw message