Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Greg Wilkins 2019-08-12 12:06:45 +10:00
parent b0da4468da
commit e08d421efc
4 changed files with 1 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-cdi/src/main/config/etc/cdi/jetty-cdi2.xml
View File

@ -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>

21
jetty-cdi/src/main/config/etc/cdi/jetty-web-cdi2.xml
View File

@ -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>

23
jetty-cdi/src/main/config/modules/cdi2.mod
View File

@ -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

4
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
View File

@ -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
);