From e08d421efc61979f20312acdab4fce6ffd6012aa Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Mon, 12 Aug 2019 12:06:45 +1000
Subject: [PATCH] Fixed merge of PR #3946 from
 eclipse/jetty-9.4.x-3804-Decoration-rename

Removed cdi2 module from #3946 for Issue #3804 in jetty-10

Signed-off-by: Greg Wilkins <gregw@webtide.com>
---
 .../src/main/config/etc/cdi/jetty-cdi2.xml    | 17 --------------
 .../main/config/etc/cdi/jetty-web-cdi2.xml    | 21 -----------------
 jetty-cdi/src/main/config/modules/cdi2.mod    | 23 -------------------
 .../jetty/tests/distribution/CDITests.java    |  4 +---
 4 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 jetty-cdi/src/main/config/etc/cdi/jetty-cdi2.xml
 delete mode 100644 jetty-cdi/src/main/config/etc/cdi/jetty-web-cdi2.xml
 delete mode 100644 jetty-cdi/src/main/config/modules/cdi2.mod

diff --git a/jetty-cdi/src/main/config/etc/cdi/jetty-cdi2.xml b/jetty-cdi/src/main/config/etc/cdi/jetty-cdi2.xml
deleted file mode 100644
index b2a1cfa1614..00000000000
--- a/jetty-cdi/src/main/config/etc/cdi/jetty-cdi2.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
-    <Call name="warn"><Arg>cdi2 module is deprecated!</Arg></Call>
-  </Get>
-  <Ref refid="DeploymentManager">
-    <Call name="addLifeCycleBinding">
-      <Arg>
-        <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
-          <Set name="jettyXml"><Property name="jetty.home" default="." />/etc/cdi/jetty-web-cdi2.xml
-          </Set>
-        </New>
-      </Arg>
-    </Call>
-  </Ref>
-</Configure>
diff --git a/jetty-cdi/src/main/config/etc/cdi/jetty-web-cdi2.xml b/jetty-cdi/src/main/config/etc/cdi/jetty-web-cdi2.xml
deleted file mode 100644
index 8adce7f9e18..00000000000
--- a/jetty-cdi/src/main/config/etc/cdi/jetty-web-cdi2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Get name="serverClassMatcher">
-    <Call name="add">
-      <Arg>-org.eclipse.jetty.util.Decorator</Arg>
-    </Call>
-    <Call name="add">
-      <Arg>-org.eclipse.jetty.util.DecoratedObjectFactory</Arg>
-    </Call>
-    <Call name="add">
-      <Arg>-org.eclipse.jetty.server.handler.ContextHandler.</Arg>
-    </Call>
-    <Call name="add">
-      <Arg>-org.eclipse.jetty.server.handler.ContextHandler</Arg>
-    </Call>
-    <Call name="add">
-      <Arg>-org.eclipse.jetty.servlet.ServletContextHandler</Arg>
-    </Call>
-  </Get>
-</Configure>
diff --git a/jetty-cdi/src/main/config/modules/cdi2.mod b/jetty-cdi/src/main/config/modules/cdi2.mod
deleted file mode 100644
index 48f1387d978..00000000000
--- a/jetty-cdi/src/main/config/modules/cdi2.mod
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Deprecated support for CDI integrations inside the webapp.
-This module does not provide CDI, but configures jetty so that a CDI implementation
-can enable itself as a decorator for Filters, Servlets and Listeners.
-This modules uses the deprecated technique of exposing private Jetty decorate APIs to the CDI
-implementation in the webapp.
-
-[tag]
-cdi
-
-[provides]
-cdi-mode
-
-[depend]
-deploy
-
-[lib]
-lib/apache-jsp/org.mortbay.jasper.apache-el-*.jar
-
-[xml]
-etc/cdi/jetty-cdi2.xml
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..9153d4bb76d 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
@@ -57,14 +57,12 @@ public class CDITests extends AbstractDistributionTest
 
         return Stream.of(
             // -- Weld --
-            Arguments.of("weld", "cdi2", null),
             Arguments.of("weld", "cdi-spi", null), // Weld >= 3.1.2
             Arguments.of("weld", "decorate", null), // Weld >= 3.1.2
             // 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", removeJettyWebXml)
             // Arguments.of("owb", "decorate", null), // Not supported
             // Arguments.of("owb", "cdi-decorate", null) // Not supported
         );