Issue #1900
This commit is contained in:
Jan Bartel
parent
1b7cfbbf2c
commit
15a08f2095
|
|
@ -0,0 +1,36 @@
|
|||
<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.cdi</groupId>
|
||||
<artifactId>jetty-cdi-parent</artifactId>
|
||||
<version>9.4.8-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>cdi-2</artifactId>
|
||||
<name>Jetty :: CDI 2</name>
|
||||
<url>http://www.eclipse.org/jetty</url>
|
||||
<packaging>jar</packaging>
|
||||
<properties>
|
||||
<bundle-symbolic-name>${project.groupId}.cdi2</bundle-symbolic-name>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>config</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Mixin the Weld / CDI classes to the class loader -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<Configure id="Server" class="org.eclipse.jetty.server.Server">
|
||||
<Ref refid="DeploymentManager">
|
||||
<Call name="addLifeCycleBinding">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
|
||||
<Set name="jettyXml"><Property name="jetty.home" default="."/>/etc/cdi2/jetty-web-cdi2.xml</Set>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
</Ref>
|
||||
</Configure>
|
||||
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
|
||||
|
||||
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
|
||||
|
||||
<Call name="prependServerClass">
|
||||
<Arg>-org.eclipse.jetty.util.Decorator</Arg>
|
||||
</Call>
|
||||
<Call name="prependServerClass">
|
||||
<Arg>-org.eclipse.jetty.util.DecoratedObjectFactory</Arg>
|
||||
</Call>
|
||||
<Call name="prependServerClass">
|
||||
<Arg>-org.eclipse.jetty.server.handler.ContextHandler.</Arg>
|
||||
</Call>
|
||||
<Call name="prependServerClass">
|
||||
<Arg>-org.eclipse.jetty.server.handler.ContextHandler</Arg>
|
||||
</Call>
|
||||
<Call name="prependServerClass">
|
||||
<Arg>-org.eclipse.jetty.servlet.ServletContextHandler</Arg>
|
||||
</Call>
|
||||
|
||||
</Configure>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
[description]
|
||||
Jetty setup to support Weld/CDI2 with WELD inside the webapp
|
||||
|
||||
[depend]
|
||||
deploy
|
||||
|
||||
[xml]
|
||||
etc/cdi2/jetty-cdi2.xml
|
||||
|
||||
[license]
|
||||
Weld is an open source project hosted on Github and released under the Apache 2.0 license.
|
||||
http://weld.cdi-spec.org/
|
||||
http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
|
|
@ -28,6 +28,7 @@ import javax.enterprise.context.spi.Contextual;
|
|||
import org.eclipse.jetty.util.log.Log;
|
||||
import org.eclipse.jetty.util.log.Logger;
|
||||
|
||||
@Deprecated
|
||||
public class SimpleBeanStore
|
||||
{
|
||||
private static final Logger LOG = Log.getLogger(SimpleBeanStore.class);
|
||||
|
|
|
|||
|
|
@ -2,35 +2,4 @@
|
|||
Experimental CDI/Weld integration
|
||||
|
||||
[depend]
|
||||
deploy
|
||||
annotations
|
||||
plus
|
||||
# JSP (and EL) are requirements for CDI and Weld
|
||||
jsp
|
||||
|
||||
[files]
|
||||
lib/cdi/
|
||||
maven://javax.enterprise/cdi-api/1.2|lib/cdi/javax.enterprise.cdi-api-1.2.jar
|
||||
maven://javax.interceptor/javax.interceptor-api/1.2|lib/cdi/javax.interceptor-api-1.2.jar
|
||||
maven://javax.inject/javax.inject/1|lib/cdi/javax.inject-1.0.jar
|
||||
maven://org.jboss.weld.servlet/weld-servlet-core/2.4.3.Final|lib/cdi/weld-servlet-core-2.4.3.Final.jar
|
||||
maven://org.jboss.weld.environment/weld-environment-common/2.4.3.Final|lib/cdi/weld-environment-common-2.4.3.Final.jar
|
||||
maven://org.jboss.weld/weld-core-impl/2.4.3.Final|lib/cdi/weld-core-impl-2.4.3.Final.jar
|
||||
maven://org.jboss.classfilewriter/jboss-classfilewriter/1.1.2.Final|lib/cdi/jboss-classfilewriter-1.1.2.Final.jar
|
||||
maven://org.jboss.weld/weld-spi/2.4.SP1|lib/cdi/weld-spi-2.4.SP1.jar
|
||||
maven://org.jboss.weld/weld-api/2.4.SP1|lib/cdi/weld-api-2.4.SP1.jar
|
||||
maven://org.jboss.logging/jboss-logging/3.2.1.Final|lib/cdi/jboss-logging-3.2.1.Final.jar
|
||||
|
||||
|
||||
[lib]
|
||||
lib/cdi/*.jar
|
||||
lib/cdi-core-${jetty.version}.jar
|
||||
lib/cdi-servlet-${jetty.version}.jar
|
||||
|
||||
[xml]
|
||||
etc/jetty-cdi.xml
|
||||
|
||||
[license]
|
||||
Weld is an open source project hosted on Github and released under the Apache 2.0 license.
|
||||
http://weld.cdi-spec.org/
|
||||
http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
cdi1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
[description]
|
||||
Experimental CDI/Weld integration
|
||||
Deprecated in favour of cdi2 module.
|
||||
|
||||
[depend]
|
||||
deploy
|
||||
annotations
|
||||
plus
|
||||
# JSP (and EL) are requirements for CDI and Weld
|
||||
jsp
|
||||
|
||||
[files]
|
||||
lib/cdi/
|
||||
maven://javax.enterprise/cdi-api/1.2|lib/cdi/javax.enterprise.cdi-api-1.2.jar
|
||||
maven://javax.interceptor/javax.interceptor-api/1.2|lib/cdi/javax.interceptor-api-1.2.jar
|
||||
maven://javax.inject/javax.inject/1|lib/cdi/javax.inject-1.0.jar
|
||||
maven://org.jboss.weld.servlet/weld-servlet-core/2.4.3.Final|lib/cdi/weld-servlet-core-2.4.3.Final.jar
|
||||
maven://org.jboss.weld.environment/weld-environment-common/2.4.3.Final|lib/cdi/weld-environment-common-2.4.3.Final.jar
|
||||
maven://org.jboss.weld/weld-core-impl/2.4.3.Final|lib/cdi/weld-core-impl-2.4.3.Final.jar
|
||||
maven://org.jboss.classfilewriter/jboss-classfilewriter/1.1.2.Final|lib/cdi/jboss-classfilewriter-1.1.2.Final.jar
|
||||
maven://org.jboss.weld/weld-spi/2.4.SP1|lib/cdi/weld-spi-2.4.SP1.jar
|
||||
maven://org.jboss.weld/weld-api/2.4.SP1|lib/cdi/weld-api-2.4.SP1.jar
|
||||
maven://org.jboss.logging/jboss-logging/3.2.1.Final|lib/cdi/jboss-logging-3.2.1.Final.jar
|
||||
|
||||
|
||||
[lib]
|
||||
lib/cdi/*.jar
|
||||
lib/cdi-core-${jetty.version}.jar
|
||||
lib/cdi-servlet-${jetty.version}.jar
|
||||
|
||||
[xml]
|
||||
etc/jetty-cdi.xml
|
||||
|
||||
[license]
|
||||
Weld is an open source project hosted on Github and released under the Apache 2.0 license.
|
||||
http://weld.cdi-spec.org/
|
||||
http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
|
|
@ -27,6 +27,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
|
|||
/**
|
||||
* Perform some basic weld configuration of WebAppContext
|
||||
*/
|
||||
@Deprecated
|
||||
public class WeldDeploymentBinding implements AppLifeCycle.Binding
|
||||
{
|
||||
public String[] getBindingTargets()
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import org.eclipse.jetty.util.component.LifeCycle;
|
|||
/**
|
||||
* Abstract implementation of listener that needs both Container events and LifeCycle events
|
||||
*/
|
||||
@Deprecated
|
||||
public abstract class AbstractContainerListener implements LifeCycle.Listener, Container.InheritedListener
|
||||
{
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import org.eclipse.jetty.util.log.Logger;
|
|||
/**
|
||||
* Producer of {@link javax.websocket.Session} instances
|
||||
*/
|
||||
@Deprecated
|
||||
public class JavaWebSocketSessionProducer
|
||||
{
|
||||
private static final Logger LOG = Log.getLogger(JavaWebSocketSessionProducer.class);
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import org.eclipse.jetty.websocket.api.Session;
|
|||
/**
|
||||
* Producer of {@link org.eclipse.jetty.websocket.api.Session} instances
|
||||
*/
|
||||
@Deprecated
|
||||
public class JettyWebSocketSessionProducer
|
||||
{
|
||||
private static final Logger LOG = Log.getLogger(JettyWebSocketSessionProducer.class);
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
|
|||
import org.eclipse.jetty.util.component.ContainerLifeCycle;
|
||||
import org.eclipse.jetty.util.thread.ThreadClassLoaderScope;
|
||||
|
||||
@Deprecated
|
||||
public class WebSocketCdiInitializer implements ServletContainerInitializer
|
||||
{
|
||||
public static void configureContext(ServletContextHandler context) throws ServletException
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ import org.eclipse.jetty.websocket.api.Session;
|
|||
import org.eclipse.jetty.websocket.common.scopes.WebSocketContainerScope;
|
||||
import org.eclipse.jetty.websocket.common.scopes.WebSocketSessionScope;
|
||||
|
||||
@Deprecated
|
||||
public class WebSocketCdiListener extends AbstractContainerListener
|
||||
{
|
||||
static final Logger LOG = Log.getLogger(WebSocketCdiListener.class);
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ import org.eclipse.jetty.websocket.api.Session;
|
|||
* <p>
|
||||
* A CDI Context definition for how CDI will use objects defined to belong to the WebSocketScope
|
||||
*/
|
||||
@Deprecated
|
||||
public class WebSocketScopeContext implements Context
|
||||
{
|
||||
private static final Logger LOG = Log.getLogger(WebSocketScopeContext.class);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import org.eclipse.jetty.util.log.Logger;
|
|||
/**
|
||||
* Register the various WebSocket specific components for CDI
|
||||
*/
|
||||
@Deprecated
|
||||
public class WebSocketScopeExtension implements Extension
|
||||
{
|
||||
private static final Logger LOG = Log.getLogger(WebSocketScopeExtension.class);
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import javax.inject.Scope;
|
|||
@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD })
|
||||
@Inherited
|
||||
@Documented
|
||||
@Deprecated
|
||||
public @interface WebSocketScope
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
<module>cdi-servlet</module>
|
||||
<module>cdi-full-servlet</module>
|
||||
<module>cdi-websocket</module>
|
||||
<module>cdi-2</module>
|
||||
<module>test-cdi-webapp</module>
|
||||
<!-- needs to be fixed still
|
||||
<module>test-cdi-it</module>
|
||||
|
|
|
|||
|
|
@ -474,6 +474,11 @@
|
|||
<artifactId>cdi-servlet</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.cdi</groupId>
|
||||
<artifactId>cdi-2</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-jaas</artifactId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue