Issue #3162 - Updating XML (removing references that seem to be getti…

…ng in the way) Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Dec 3, 2018 · db11be0 · db11be0
1 parent 7f6add5
commit db11be0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-deployer.xml
@@ -12,10 +12,12 @@
           <Set name="contexts">
             <Ref refid="Contexts" />
           </Set>
+          <!--
           <Call name="setContextAttribute">
             <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
             <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
           </Call>
+          -->
         </New>
       </Arg>
     </Call>

diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml
@@ -12,10 +12,12 @@
           <Set name="contexts">
             <Ref refid="Contexts" />
           </Set>
+          <!--
           <Call name="setContextAttribute">
             <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
             <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
           </Call>
+           -->
         </New>
       </Arg>
     </Call>

diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
@@ -66,7 +66,7 @@
 
     <!-- =========================================================== -->
     <!-- Set up the list of default configuration classes            -->
-    <!-- =========================================================== -->    
+    <!-- =========================================================== -->
     <Call class="org.eclipse.jetty.webapp.Configurations" name="setKnown">
       <Arg>
         <Array type="String">

diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
@@ -28,13 +28,13 @@
         <Set name="handlers">
          <Array type="org.eclipse.jetty.server.Handler">
            <Item>
-             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+             <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
            </Item>
            <Item>
-             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
+             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
            </Item>
            <Item>
-             <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
+             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
            </Item>
          </Array>
         </Set>
@@ -70,7 +70,6 @@
     <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
     <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
 
-
     <Call class="org.eclipse.jetty.webapp.Configurations" name="setKnown">
       <Arg>
         <Array type="String">