From d6572823b99c453c7767b051541bb96e71c50476 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Thu, 11 Feb 2021 08:04:29 -0600
Subject: [PATCH] Issue #5966 - Remove /webapps from jetty-home

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../config/webapps/test.d/override-web.xml    |  64 ---------
 .../src/main/config/webapps/test.xml          | 128 ------------------
 jetty-home/pom.xml                            |   2 +-
 3 files changed, 1 insertion(+), 193 deletions(-)
 delete mode 100644 demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml
 delete mode 100644 demos/demo-jetty-webapp/src/main/config/webapps/test.xml

diff --git a/demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml b/demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml
deleted file mode 100644
index 81d2ccc56da..00000000000
--- a/demos/demo-jetty-webapp/src/main/config/webapps/test.d/override-web.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app 
-   xmlns="http://xmlns.jcp.org/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" 
-   version="3.1"> 
-
-
-<!-- This web.xml format file is an override file that is applied to the test webapp AFTER
-     it has been configured by the default descriptor and the WEB-INF/web.xml descriptor -->
-
-  <!-- Add or override context init parameter -->
-  <context-param>
-    <param-name>context-override-example</param-name>
-    <param-value>a context value</param-value>
-  </context-param>
-
-  <!-- Add or override servlet init parameter -->
-  <servlet>
-    <servlet-name>default</servlet-name>
-    <init-param>
-      <param-name>precompressed</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </servlet>
-
-  <!-- Add or override servlet init parameter -->
-  <servlet>
-    <servlet-name>Dump</servlet-name>
-    <init-param>
-      <param-name>servlet-override-example</param-name>
-      <param-value>a servlet value</param-value>
-    </init-param>
-  </servlet>
-
-  <!-- Add servlet mapping -->
-  <servlet-mapping>
-    <servlet-name>Dump</servlet-name>
-    <url-pattern>*.more</url-pattern>
-  </servlet-mapping>
-
-  <!-- Reset servlet class and/or start order -->
-  <servlet>
-    <servlet-name>Session</servlet-name>
-    <servlet-class>com.acme.SessionDump</servlet-class>
-    <load-on-startup>5</load-on-startup>
-  </servlet>
-  
-  <!-- Allow remote access to test webapp -->
-  <!--
-  <filter>
-    <filter-name>TestFilter</filter-name>
-    <filter-class>com.acme.TestFilter</filter-class>
-    <async-supported>true</async-supported>
-    <init-param>
-      <param-name>remote</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </filter>
-  -->
-  
-</web-app>
-
-
diff --git a/demos/demo-jetty-webapp/src/main/config/webapps/test.xml b/demos/demo-jetty-webapp/src/main/config/webapps/test.xml
deleted file mode 100644
index b98b427615f..00000000000
--- a/demos/demo-jetty-webapp/src/main/config/webapps/test.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
-
-<!-- ==================================================================
-Configure and deploy the test web application in $(jetty.home)/webapps/test
-
-Note. If this file did not exist or used a context path other that /test
-then the default configuration of jetty.xml would discover the test
-webapplication with a WebAppDeployer.  By specifying a context in this
-directory, additional configuration may be specified and hot deployments
-detected.
-===================================================================== -->
-
-<Configure id="testWebapp" class="org.eclipse.jetty.webapp.WebAppContext">
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Required minimal context configuration :                        -->
-  <!--  + contextPath                                                  -->
-  <!--  + war OR resourceBase                                          -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="contextPath">/test</Set>
-  <Set name="war"><Property name="jetty.webapps" default="."/>/test.war</Set>
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Optional context configuration                                  -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="extractWAR">true</Set>
-  <Set name="copyWebDir">false</Set>
-  <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-  <Set name="overrideDescriptor"><Property name="jetty.webapps" default="."/>/test.d/override-web.xml</Set>
-  
-  <!-- Enable WebSocket container -->
-  <Call name="setAttribute">
-    <Arg>org.eclipse.jetty.websocket.javax</Arg>
-    <Arg type="Boolean">true</Arg>
-  </Call>
-  
-  <Call name="insertHandler">
-    <Arg>
-      <New class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
-        <Set name="minGzipSize">2048</Set>
-      </New>
-    </Arg>
-  </Call>
-  
-  <!-- Set Caching Classloader that improves performance on resource searching webapps -->
-  <!--
-  <Set name="classLoader">
-    <New class="org.eclipse.jetty.webapp.CachingWebAppClassLoader">
-      <Arg><Ref refid="testWebapp"/></Arg>
-    </New>
-  </Set>
-  -->
-
-  <!-- Enable symlinks 
-  <Call name="addAliasCheck">
-    <Arg><New class="org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker"/></Arg>
-  </Call>
-  -->
-  
-  <!-- virtual hosts
-  <Set name="virtualHosts">
-    <Array type="String">
-      <Item>www.MyVirtualDomain.com</Item>
-      <Item>m.MyVirtualDomain.com</Item>
-      <Item>*.OtherVirtualDomain.com</Item>
-      <Item>@ConnectorName</Item>
-      <Item>localhost</Item>
-      <Item>127.0.0.1</Item>
-    </Array>
-  </Set>
-  -->
-
-  <!-- disable cookies
-  <Get name="sessionHandler">
-    <Set name="usingCookies" type="boolean">false</Set>
-  </Get>
-  -->
-
-  <Get name="securityHandler">
-    <Set name="loginService">
-      <New class="org.eclipse.jetty.security.HashLoginService">
-        <Set name="name">Test Realm</Set>
-        <Set name="config"><SystemProperty name="jetty.base" default="."/>/etc/realm.properties</Set>
-            <!-- To enable reload of realm when properties change, uncomment the following lines -->
-            <!--
-            <Set name="hotReload">true</Set>
-            <Call name="start"></Call>
-            -->
-      </New>
-    </Set>
-    <Set name="authenticator">
-      <New class="org.eclipse.jetty.security.authentication.FormAuthenticator">
-        <Set name="alwaysSaveUri">true</Set>
-      </New>
-    </Set>
-    <Set name="checkWelcomeFiles">true</Set>
-  </Get>
-
-  <!-- Non standard error page mapping -->
-  <!--
-  <Get name="errorHandler">
-    <Call name="addErrorPage">
-      <Arg type="int">500</Arg>
-      <Arg type="int">599</Arg>
-      <Arg type="String">/dump/errorCodeRangeMapping</Arg>
-    </Call>
-  </Get>
-  -->
-
-  <!-- Add context specific logger
-  <Call name="insertHandler">
-    <Arg>
-      <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
-        <Set name="requestLog">
-          <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
-            <Set name="filename"><Property name="jetty.logs" default="./logs"/>/test-yyyy_mm_dd.request.log</Set>
-            <Set name="filenameDateFormat">yyyy_MM_dd</Set>
-            <Set name="append">true</Set>
-            <Set name="LogTimeZone">GMT</Set>
-          </New>
-        </Set>
-      </New>
-    </Arg>
-  </Call>
-  -->
-
-</Configure>
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 225f6a19511..4b99e7c0945 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -444,7 +444,7 @@
               <excludeArtifactIds>infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation</excludeArtifactIds>
               <classifier>config</classifier>
               <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
-              <excludes>META-INF/**</excludes>
+              <excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes>
               <outputDirectory>${assembly-directory}</outputDirectory>
             </configuration>
           </execution>