From 68206ce880a334d02fa381adf03fe01e2e5b2015 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Fri, 15 Jul 2022 11:20:52 +1000
Subject: [PATCH] fix some filtering of files for ee9 to ee8 conversion (#8311)

* restore ee8-quickstart
* use our special resources filtering
* do not filter some extensions

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 jetty-ee8/jetty-ee8-bom/pom.xml               | 10 +--
 jetty-ee8/jetty-ee8-home/pom.xml              |  9 ++-
 jetty-ee8/jetty-ee8-plus/pom.xml              |  2 -
 jetty-ee8/jetty-ee8-quickstart/pom.xml        | 67 +++++++++++++++++++
 .../main/config/etc/jetty-ee8-quickstart.xml  | 18 +++++
 .../main/config/modules/ee8-quickstart.mod    | 24 +++++++
 jetty-ee8/pom.xml                             | 60 ++++++++++++++++-
 .../jetty/ee9/quickstart/TestQuickStart.java  | 10 +--
 8 files changed, 182 insertions(+), 18 deletions(-)
 create mode 100644 jetty-ee8/jetty-ee8-quickstart/pom.xml
 create mode 100644 jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
 create mode 100644 jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod

diff --git a/jetty-ee8/jetty-ee8-bom/pom.xml b/jetty-ee8/jetty-ee8-bom/pom.xml
index 731fcbcf730..1a04794533f 100644
--- a/jetty-ee8/jetty-ee8-bom/pom.xml
+++ b/jetty-ee8/jetty-ee8-bom/pom.xml
@@ -118,11 +118,11 @@
 <!--        <artifactId>jetty-ee8-proxy</artifactId>-->
 <!--        <version>${project.version}</version>-->
 <!--      </dependency>-->
-<!--      <dependency>-->
-<!--        <groupId>org.eclipse.jetty.ee8</groupId>-->
-<!--        <artifactId>jetty-ee8-quickstart</artifactId>-->
-<!--        <version>${project.version}</version>-->
-<!--      </dependency>-->
+      <dependency>
+        <groupId>org.eclipse.jetty.ee8</groupId>
+        <artifactId>jetty-ee8-quickstart</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.ee8</groupId>
         <artifactId>jetty-ee8-nested</artifactId>
diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml
index a6cb468edc5..37f74bd49da 100644
--- a/jetty-ee8/jetty-ee8-home/pom.xml
+++ b/jetty-ee8/jetty-ee8-home/pom.xml
@@ -370,11 +370,10 @@
       <artifactId>asm-analysis</artifactId>
     </dependency>
 
-
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty.ee8</groupId>-->
-<!--      <artifactId>jetty-ee8-quickstart</artifactId>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-quickstart</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-servlet</artifactId>
diff --git a/jetty-ee8/jetty-ee8-plus/pom.xml b/jetty-ee8/jetty-ee8-plus/pom.xml
index 7fcf7d9f6e4..daa74c8bc49 100644
--- a/jetty-ee8/jetty-ee8-plus/pom.xml
+++ b/jetty-ee8/jetty-ee8-plus/pom.xml
@@ -14,8 +14,6 @@
     <ee9.module>jetty-ee9-plus</ee9.module>
     <bundle-symbolic-name>${project.groupId}.plus</bundle-symbolic-name>
     <spotbugs.onlyAnalyze>org.eclipse.jetty.plus.*</spotbugs.onlyAnalyze>
-    <!-- see issue #8209 -->
-    <skipTests>true</skipTests>
   </properties>
 
   <build>
diff --git a/jetty-ee8/jetty-ee8-quickstart/pom.xml b/jetty-ee8/jetty-ee8-quickstart/pom.xml
new file mode 100644
index 00000000000..8f0b54ac5a9
--- /dev/null
+++ b/jetty-ee8/jetty-ee8-quickstart/pom.xml
@@ -0,0 +1,67 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.ee8</groupId>
+    <artifactId>jetty-ee8</artifactId>
+    <version>12.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-ee8-quickstart</artifactId>
+  <name>EE8 :: Jetty :: Quick Start</name>
+  <description>Jetty Quick Start</description>
+
+  <properties>
+    <ee9.module>jetty-ee9-quickstart</ee9.module>
+    <bundle-symbolic-name>${project.groupId}.quickstart</bundle-symbolic-name>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-webapp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-plus</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml b/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
new file mode 100644
index 00000000000..1dd6e943f55
--- /dev/null
+++ b/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Call class="org.eclipse.jetty.ee8.quickstart.QuickStartConfiguration" name="configureMode">
+    <Arg><Ref refid="Server"/></Arg>
+    <Arg><Property name="jetty.quickstart.mode"/></Arg>
+  </Call>
+
+  <Ref refid="WebAppProvider">
+      <Get name="properties">
+        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
+        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
+        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
+      </Get>
+  </Ref>
+
+</Configure>
diff --git a/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod
new file mode 100644
index 00000000000..e999a138e89
--- /dev/null
+++ b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod
@@ -0,0 +1,24 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications.
+
+[environment]
+ee8
+
+[depend]
+server
+ee8-deploy
+
+[lib]
+lib/jetty-ee8-quickstart-${jetty.version}.jar
+
+[xml]
+etc/jetty-ee8-quickstart.xml
+
+[ini-template]
+
+# Modes are AUTO, GENERATE, QUICKSTART
+# jetty.quickstart.mode=AUTO
+# jetty.quickstart.origin=origin
+# jetty.quickstart.xml=
diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml
index c53a0848cb4..ca8d955742b 100644
--- a/jetty-ee8/pom.xml
+++ b/jetty-ee8/pom.xml
@@ -22,6 +22,7 @@
     <checkstyle.skip>true</checkstyle.skip>
     <sonar.skip>true</sonar.skip>
     <ee9.module></ee9.module>
+    <modify-sources-plugin.version>1.0.0-SNAPSHOT</modify-sources-plugin.version>
   </properties>
 
   <modules>
@@ -35,6 +36,7 @@
     <module>jetty-ee8-jndi</module>
     <module>jetty-ee8-annotations</module>
     <module>jetty-ee8-websocket</module>
+    <module>jetty-ee8-quickstart</module>
     <module>jetty-ee8-bom</module>
     <module>jetty-ee8-demos</module>
     <module>jetty-ee8-home</module>
@@ -48,7 +50,7 @@
         <plugin>
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>jetty-modify-sources-maven-plugin</artifactId>
-          <version>1.0.0-SNAPSHOT</version>
+          <version>${modify-sources-plugin.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -56,6 +58,38 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
+        <configuration>
+          <nonFilteredFileExtensions>
+            <nonFilteredFileExtension>p12</nonFilteredFileExtension>
+            <nonFilteredFileExtension>raw</nonFilteredFileExtension>
+            <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+            <nonFilteredFileExtension>war</nonFilteredFileExtension>
+            <nonFilteredFileExtension>jks</nonFilteredFileExtension>
+            <nonFilteredFileExtension>tga</nonFilteredFileExtension>
+            <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+            <nonFilteredFileExtension>gz</nonFilteredFileExtension>
+            <nonFilteredFileExtension>tif</nonFilteredFileExtension>
+            <nonFilteredFileExtension>tiff</nonFilteredFileExtension>
+            <nonFilteredFileExtension>svgz</nonFilteredFileExtension>
+            <nonFilteredFileExtension>jp2</nonFilteredFileExtension>
+            <nonFilteredFileExtension>rar</nonFilteredFileExtension>
+            <nonFilteredFileExtension>bz2</nonFilteredFileExtension>
+            <nonFilteredFileExtension>br</nonFilteredFileExtension>
+            <nonFilteredFileExtension>xcf</nonFilteredFileExtension>
+          </nonFilteredFileExtensions>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-filtering</artifactId>
+            <version>3.3.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.eclipse.jetty.toolchain</groupId>
+            <artifactId>jetty-modify-sources-maven-plugin</artifactId>
+            <version>${modify-sources-plugin.version}</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <id>copy-ee8-resources</id>
@@ -72,6 +106,26 @@
               </resources>
             </configuration>
           </execution>
+          <!-- TODO this would be nice to reuse mod files from ee9 but the mod file name need to be changed as well as the content -->
+<!--          <execution>-->
+<!--            <id>copy-ee8-modules-resources</id>-->
+<!--            <phase>generate-resources</phase>-->
+<!--            <goals>-->
+<!--              <goal>copy-resources</goal>-->
+<!--            </goals>-->
+<!--            <configuration>-->
+<!--              <mavenFilteringHints>-->
+<!--                <mavenFilteringHint>ee9-to-ee8</mavenFilteringHint>-->
+<!--              </mavenFilteringHints>-->
+<!--              <outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>-->
+<!--              <resources>-->
+<!--                <resource>-->
+<!--                  <filtering>true</filtering>-->
+<!--                  <directory>${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}/src/main/config</directory>-->
+<!--                </resource>-->
+<!--              </resources>-->
+<!--            </configuration>-->
+<!--          </execution>-->
           <execution>
             <id>copy-ee8-test-resources</id>
             <phase>generate-test-resources</phase>
@@ -79,9 +133,13 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
+              <mavenFilteringHints>
+                <mavenFilteringHint>ee9-to-ee8</mavenFilteringHint>
+              </mavenFilteringHints>
               <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
               <resources>
                 <resource>
+                  <filtering>true</filtering>
                   <directory>${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}/src/test/resources</directory>
                 </resource>
               </resources>
diff --git a/jetty-ee9/jetty-ee9-quickstart/src/test/java/org/eclipse/jetty/ee9/quickstart/TestQuickStart.java b/jetty-ee9/jetty-ee9-quickstart/src/test/java/org/eclipse/jetty/ee9/quickstart/TestQuickStart.java
index f2dde07d2ac..08153758a5e 100644
--- a/jetty-ee9/jetty-ee9-quickstart/src/test/java/org/eclipse/jetty/ee9/quickstart/TestQuickStart.java
+++ b/jetty-ee9/jetty-ee9-quickstart/src/test/java/org/eclipse/jetty/ee9/quickstart/TestQuickStart.java
@@ -124,7 +124,7 @@ public class TestQuickStart
         quickstart.addConfiguration(new QuickStartConfiguration());
         quickstart.setAttribute(QuickStartConfiguration.MODE, QuickStartConfiguration.Mode.GENERATE);
         quickstart.setAttribute(QuickStartConfiguration.ORIGIN_ATTRIBUTE, "origin");
-        quickstart.setDescriptor(MavenTestingUtils.getTestResourceFile("web.xml").getAbsolutePath());
+        quickstart.setDescriptor(MavenTestingUtils.getTargetFile("test-classes/web.xml").getAbsolutePath());
         quickstart.setContextPath("/foo");
         server.setHandler(quickstart);
         server.setDryRun(true);
@@ -167,7 +167,7 @@ public class TestQuickStart
         quickstart.addConfiguration(new QuickStartConfiguration());
         quickstart.setAttribute(QuickStartConfiguration.MODE, QuickStartConfiguration.Mode.GENERATE);
         quickstart.setAttribute(QuickStartConfiguration.ORIGIN_ATTRIBUTE, "origin");
-        quickstart.setDescriptor(MavenTestingUtils.getTestResourceFile("web.xml").getAbsolutePath());
+        quickstart.setDescriptor(MavenTestingUtils.getTargetFile("test-classes/web.xml").getAbsolutePath());
         quickstart.setContextPath("/foo");
         server.setHandler(quickstart);
         server.setDryRun(true);
@@ -237,10 +237,10 @@ public class TestQuickStart
         quickstart.addConfiguration(new QuickStartConfiguration());
         quickstart.setWar(testDir.toURI().toURL().toExternalForm());
         quickstart.setAttribute(QuickStartConfiguration.MODE, QuickStartConfiguration.Mode.GENERATE);
-        quickstart.setDescriptor(MavenTestingUtils.getTestResourceFile("web.xml").getAbsolutePath());
+        quickstart.setDescriptor(MavenTestingUtils.getTargetFile("test-classes/web.xml").getAbsolutePath());
 
         //apply the context xml file
-        XmlConfiguration xmlConfig = new XmlConfiguration(Resource.newResource(MavenTestingUtils.getTestResourceFile("context.xml").toPath()));
+        XmlConfiguration xmlConfig = new XmlConfiguration(Resource.newResource(MavenTestingUtils.getTargetFile("test-classes/context.xml").toPath()));
         xmlConfig.configure(quickstart);
 
         //generate the quickstart
@@ -258,7 +258,7 @@ public class TestQuickStart
         quickstart.getServerClassMatcher().exclude("org.eclipse.jetty.ee9.quickstart.");
         quickstart.addConfiguration(new QuickStartConfiguration());
         quickstart.setWar(testDir.toURI().toURL().toExternalForm());
-        quickstart.setDescriptor(MavenTestingUtils.getTestResourceFile("web.xml").getAbsolutePath());
+        quickstart.setDescriptor(MavenTestingUtils.getTargetFile("test-classes/web.xml").getAbsolutePath());
         quickstart.setAttribute(QuickStartConfiguration.MODE, QuickStartConfiguration.Mode.AUTO);
         server.setHandler(quickstart);