From 8c4dd7ab05ce11bf242b1a215c06c72be823aa6b Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Tue, 13 Aug 2019 11:14:44 +1000
Subject: [PATCH] Fixed decoration changes for #3804

Fixed bad names in OWB webapp.
Don't have the owb jetty-web.xml on by default.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
---
 .../eclipse/jetty/tests/distribution/CDITests.java    | 11 ++++++-----
 .../test-cdi-common-webapp/src/main/webapp/index.html |  2 +-
 tests/test-webapps/test-owb-cdi-webapp/pom.xml        |  2 +-
 .../WEB-INF/{jetty-web.xml => jetty-web-owb.xml}      |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/{jetty-web.xml => jetty-web-owb.xml} (82%)

diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
index a0e1b988940..79570423ea6 100644
--- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
+++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
@@ -42,12 +42,13 @@ public class CDITests extends AbstractDistributionTest
     // Tests from here use these parameters
     public static Stream<Arguments> tests()
     {
-        Consumer<DistributionTester> removeJettyWebXml = d ->
+        Consumer<DistributionTester> renameJettyWebOwbXml = d ->
         {
             try
             {
+                Path jettyWebOwbXml = d.getJettyBase().resolve("webapps/demo/WEB-INF/jetty-web-owb.xml");
                 Path jettyWebXml = d.getJettyBase().resolve("webapps/demo/WEB-INF/jetty-web.xml");
-                Files.deleteIfExists(jettyWebXml);
+                Files.move(jettyWebOwbXml, jettyWebXml);
             }
             catch(IOException e)
             {
@@ -63,8 +64,8 @@ public class CDITests extends AbstractDistributionTest
             // TODO Arguments.of("weld", "cdi-decorate", null), // Weld >= 3.1.3
 
             // -- Apache OpenWebBeans --
-            Arguments.of("owb", "cdi-spi", removeJettyWebXml),
-            Arguments.of("owb", "cdi2", null)
+            Arguments.of("owb", "cdi-spi", null),
+            Arguments.of("owb", "jsp", renameJettyWebOwbXml)
             // Arguments.of("owb", "decorate", null), // Not supported
             // Arguments.of("owb", "cdi-decorate", null) // Not supported
         );
@@ -87,7 +88,7 @@ public class CDITests extends AbstractDistributionTest
         String[] args1 = {
             "--create-startd",
             "--approve-all-licenses",
-            "--add-to-start=http,deploy,annotations,jsp,"+integration
+            "--add-to-start=http,deploy,annotations,jsp" + (integration==null?"":(","+integration))
         };
         try (DistributionTester.Run run1 = distribution.start(args1))
         {
diff --git a/tests/test-webapps/test-cdi-common-webapp/src/main/webapp/index.html b/tests/test-webapps/test-cdi-common-webapp/src/main/webapp/index.html
index 9beca9836d8..a1765080059 100644
--- a/tests/test-webapps/test-cdi-common-webapp/src/main/webapp/index.html
+++ b/tests/test-webapps/test-cdi-common-webapp/src/main/webapp/index.html
@@ -1,4 +1,4 @@
-<H1>OWB CDI Test Webapp</H1>
+<H1>CDI Test Webapp</H1>
 
 <H2>CDI Info</H2>
 <iframe src="info" width="100%" height="60%"></iframe>
diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml
index c81c088d78c..d20b4db280c 100644
--- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml
+++ b/tests/test-webapps/test-owb-cdi-webapp/pom.xml
@@ -16,7 +16,7 @@
   </properties>
 
   <build>
-    <finalName>weld-owb-demo</finalName>
+    <finalName>owb-cdi-demo</finalName>
   </build>
 
   <dependencies>
diff --git a/tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web-owb.xml
similarity index 82%
rename from tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
rename to tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web-owb.xml
index 404e1bc09dc..4c5b8dcd533 100644
--- a/tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/tests/test-webapps/test-owb-cdi-webapp/src/main/webapp/WEB-INF/jetty-web-owb.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 <Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">
-  <!-- This file is only needed for cdi2 integration and should be removed if using the cdi module -->
+  <!-- Rename this file to jetty-web.xml if the cdi-spi module is not used-->
   <Get id="wal" name="classLoader"/>
   <Get id="objf" name="objectFactory">
     <Call name="addDecorator">