From 6f286273991823611cca8733e64626a6ee90ae5f Mon Sep 17 00:00:00 2001
From: olivier lamy <olamy@apache.org>
Date: Sat, 13 May 2017 22:33:49 +1000
Subject: [PATCH] update jetty.xml file with 9.4 version

Signed-off-by: olivier lamy <olamy@apache.org>
---
 archiva-jetty/src/main/assembly/bin.xml     |  4 --
 archiva-jetty/src/main/conf/jetty.xml       | 58 +++------------------
 archiva-jetty/src/main/contexts/archiva.xml | 31 -----------
 3 files changed, 7 insertions(+), 86 deletions(-)
 delete mode 100644 archiva-jetty/src/main/contexts/archiva.xml

diff --git a/archiva-jetty/src/main/assembly/bin.xml b/archiva-jetty/src/main/assembly/bin.xml
index d10f9aa65..1e18d9f57 100644
--- a/archiva-jetty/src/main/assembly/bin.xml
+++ b/archiva-jetty/src/main/assembly/bin.xml
@@ -106,10 +106,6 @@
         <include>LICENSE</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>src/main/contexts</directory>
-      <outputDirectory>contexts</outputDirectory>
-    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml
index 63e47195d..b7e66d463 100644
--- a/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-jetty/src/main/conf/jetty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
@@ -51,9 +51,6 @@
   <!-- =========================================================== -->
   <!-- =========================================================== -->
 
-  <!-- Use this connector for many frequently idle connections
-       and for threadless continuations.
-  -->
   <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
     <Set name="secureScheme">https</Set>
     <Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set>
@@ -61,7 +58,6 @@
     <Set name="requestHeaderSize">8192</Set>
     <Set name="responseHeaderSize">8192</Set>
     <Set name="headerCacheSize">512</Set>
-
   </New>
 
   <Call name="addConnector">
@@ -84,15 +80,17 @@
     </Arg>
   </Call>
 
-  <!-- =========================================================== -->
-  <!-- Set handler Collection Structure                            -->
-  <!-- =========================================================== -->
   <Set name="handler">
     <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
       <Set name="handlers">
         <Array type="org.eclipse.jetty.server.Handler">
           <Item>
-            <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+            <New class="org.eclipse.jetty.webapp.WebAppContext">
+              <Set name="contextPath">/</Set>
+              <Set name="war"><SystemProperty name="appserver.base" default="./apps/archiva"/>/apps/archiva</Set>
+              <Set name="extractWAR">false</Set>
+              <Set name="copyWebDir">false</Set>
+            </New>
           </Item>
           <Item>
             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
@@ -116,34 +114,6 @@
     </Arg>
   </Call>
 
-  <Call name="addBean">
-    <Arg>
-      <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-        <Set name="contexts">
-          <Ref refid="Contexts" />
-        </Set>
-        <Call id="webappprovider" name="addAppProvider">
-          <Arg>
-            <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-              <Set name="monitoredDirName"><Property name="jetty.base" default="." />/apps</Set>
-              <Set name="configurationClasses">
-                <Array type="java.lang.String">
-                  <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
-                  <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
-                  <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
-                  <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
-                  <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
-                  <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
-                  <!--Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item-->
-                  <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
-                </Array>
-              </Set>
-            </New>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
 
   <!-- =========================================================== -->
   <!-- extra options                                               -->
@@ -162,24 +132,11 @@
         <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
         <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
         <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
-        <Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item>
       </Array>
     </Arg>
   </Call>
 
 
-  <!-- =========================================================== -->
-  <!-- Configurations for WebAppContexts                           -->
-  <!-- Sequence of configurations to be applied to a webapp.       -->
-  <!-- =========================================================== -->
-  <Array id="plusConfig" type="java.lang.String">
-    <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
-    <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
-    <Item>org.eclipse.jetty.webapp.Configuration</Item>
-    <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
-    <Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item>
-  </Array>
-
   <!-- ARCHIVA CONFIG -->
 
   <New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
@@ -227,5 +184,4 @@
   </New>
 
 
-
 </Configure>
diff --git a/archiva-jetty/src/main/contexts/archiva.xml b/archiva-jetty/src/main/contexts/archiva.xml
deleted file mode 100644
index 93728d8e6..000000000
--- a/archiva-jetty/src/main/contexts/archiva.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-
-  <Set name="contextPath">/</Set>
-  <Set name="war"><SystemProperty name="jetty.home" default="."/>/apps/archiva</Set>
-
-  <Set name="extractWAR">false</Set>
-  <Set name="copyWebDir">false</Set>
-
-</Configure>
\ No newline at end of file
-- 
2.39.5