Return-Path: 
 <commits-return-10247-apmail-deltaspike-commits-archive=deltaspike.apache.org@deltaspike.apache.org>
X-Original-To: apmail-deltaspike-commits-archive@www.apache.org
Delivered-To: apmail-deltaspike-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1805411CCE
	for <apmail-deltaspike-commits-archive@www.apache.org>;
 Wed,  6 Aug 2014 10:55:58 +0000 (UTC)
Received: (qmail 23631 invoked by uid 500); 6 Aug 2014 10:55:58 -0000
Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org
Received: (qmail 23594 invoked by uid 500); 6 Aug 2014 10:55:58 -0000
Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@deltaspike.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@deltaspike.apache.org>
List-Post: <mailto:commits@deltaspike.apache.org>
List-Id: <commits.deltaspike.apache.org>
Reply-To: dev@deltaspike.apache.org
Delivered-To: mailing list commits@deltaspike.apache.org
Received: (qmail 23585 invoked by uid 99); 6 Aug 2014 10:55:57 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Aug 2014 10:55:57 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 7D4AC88A90C; Wed,  6 Aug 2014 10:55:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: johndament@apache.org
To: commits@deltaspike.apache.org
Message-Id: <bc1664fa87574d7f838a2f6d884d1763@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: DELTASPIKE-653 Removed individual test modules,
 only test Jetty downgraded Jetty for now.
Date: Wed,  6 Aug 2014 10:55:57 +0000 (UTC)

Repository: deltaspike
Updated Branches:
  refs/heads/master 9cb3fe2e4 -> de2686328


DELTASPIKE-653 Removed individual test modules, only test Jetty downgraded Jetty for now.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/de268632
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/de268632
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/de268632

Branch: refs/heads/master
Commit: de2686328ff0db370a7a9c7c4a7ce8a8cd987018
Parents: 9cb3fe2
Author: John D. Ament <johndament@apache.org>
Authored: Wed Aug 6 06:55:54 2014 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Wed Aug 6 06:55:54 2014 -0400

----------------------------------------------------------------------
 deltaspike/cdictrl/pom.xml                      |   2 -
 deltaspike/cdictrl/servlet-test-jetty/pom.xml   | 160 ------------------
 .../cdise/servlet/test/jetty/JettyTest.java     |  56 -------
 .../src/test/resources/META-INF/beans.xml       |  23 ---
 .../cdictrl/servlet-test-undertow/pom.xml       | 161 -------------------
 .../cdise/servlet/test/ut/UndertowTest.java     |  63 --------
 .../src/test/resources/META-INF/beans.xml       |  23 ---
 deltaspike/cdictrl/servlet/pom.xml              |  16 ++
 .../cdise/servlet/test/JettyTest.java           |  56 +++++++
 9 files changed, 72 insertions(+), 488 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
index a4f6376..127a1d8 100644
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@ -40,7 +40,5 @@
         <module>impl-weld</module>
         <module>impl-openejb</module>
         <module>servlet</module>
-        <module>servlet-test-undertow</module>
-        <module>servlet-test-jetty</module>
     </modules>
 </project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet-test-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet-test-jetty/pom.xml b/deltaspike/cdictrl/servlet-test-jetty/pom.xml
deleted file mode 100644
index 6582602..0000000
--- a/deltaspike/cdictrl/servlet-test-jetty/pom.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.deltaspike.cdictrl</groupId>
-        <artifactId>cdictrl-project</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>deltaspike-cdictrl-servlet-test-jetty</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache DeltaSpike CDI Servlet-ContainerControl-Jetty-Tests</name>
-    <properties>
-        <jetty.version>9.2.2.v20140723</jetty.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.2.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.test</groupId>
-            <artifactId>test-utils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-servlet</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-servlet</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>Weld</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-weld</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.jboss.weld.se</groupId>
-                    <artifactId>weld-se</artifactId>
-                    <version>${weld.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>OWB</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-owb</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java b/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java
deleted file mode 100644
index 3a16a52..0000000
--- a/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet.test.jetty;
-
-import org.apache.deltaspike.cdise.servlet.CdiServletRequestListener;
-import org.apache.deltaspike.cdise.servlet.test.EmbeddedServletContainer;
-import org.apache.deltaspike.cdise.servlet.test.content.RequestServlet;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
-/**
- * Jetty based tests.
- */
-public class JettyTest extends EmbeddedServletContainer
-{
-    private Server server;
-    @Override
-    protected int createServer() throws Exception
-    {
-        int port = super.getPort();
-        server = new Server(port);
-
-        ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        context.setContextPath("/");
-        server.setHandler(context);
-
-        context.addEventListener(new CdiServletRequestListener());
-        context.addServlet(new ServletHolder(new RequestServlet()),"/*");
-
-        server.start();
-        return port;
-    }
-
-    @Override
-    protected void shutdown() throws Exception
-    {
-        server.stop();
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml b/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index 4070730..0000000
--- a/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet-test-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet-test-undertow/pom.xml b/deltaspike/cdictrl/servlet-test-undertow/pom.xml
deleted file mode 100644
index a24f68f..0000000
--- a/deltaspike/cdictrl/servlet-test-undertow/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.deltaspike.cdictrl</groupId>
-        <artifactId>cdictrl-project</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>deltaspike-cdictrl-servlet-test-ut</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Apache DeltaSpike CDI Servlet-ContainerControl-Undertow-Tests</name>
-
-    <properties>
-        <undertow.version>1.1.0.Beta6</undertow.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.2.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.test</groupId>
-            <artifactId>test-utils</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.undertow</groupId>
-            <artifactId>undertow-servlet</artifactId>
-            <version>${undertow.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.undertow</groupId>
-            <artifactId>undertow-core</artifactId>
-            <version>${undertow.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-servlet</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.deltaspike.cdictrl</groupId>
-            <artifactId>deltaspike-cdictrl-servlet</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>Weld</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-weld</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.jboss.weld.se</groupId>
-                    <artifactId>weld-se</artifactId>
-                    <version>${weld.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>OWB</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.deltaspike.cdictrl</groupId>
-                    <artifactId>deltaspike-cdictrl-owb</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java b/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java
deleted file mode 100644
index 2ddf38c..0000000
--- a/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.deltaspike.cdise.servlet.test.ut;
-
-import io.undertow.Undertow;
-import io.undertow.servlet.Servlets;
-import io.undertow.servlet.api.DeploymentInfo;
-import io.undertow.servlet.api.DeploymentManager;
-import io.undertow.servlet.api.ListenerInfo;
-import io.undertow.servlet.api.ServletInfo;
-import org.apache.deltaspike.cdise.servlet.CdiServletRequestListener;
-import org.apache.deltaspike.cdise.servlet.test.EmbeddedServletContainer;
-import org.apache.deltaspike.cdise.servlet.test.content.RequestServlet;
-
-/**
- * Test execution for undertow embedded container.
- */
-public class UndertowTest extends EmbeddedServletContainer
-{
-    private Undertow server;
-
-    protected int createServer() throws Exception
-    {
-        int port = getPort();
-        ServletInfo servletInfo = Servlets.servlet("RequestServlet", RequestServlet.class).setAsyncSupported(true)
-                .setLoadOnStartup(1).addMapping("/*");
-        ListenerInfo listenerInfo = Servlets.listener(CdiServletRequestListener.class);
-        DeploymentInfo di = new DeploymentInfo()
-                .addListener(listenerInfo)
-                .setContextPath("/")
-                .addServlet(servletInfo).setDeploymentName("CdiSEServlet")
-                .setClassLoader(ClassLoader.getSystemClassLoader());
-        DeploymentManager deploymentManager = Servlets.defaultContainer().addDeployment(di);
-        deploymentManager.deploy();
-        server = Undertow.builder()
-                .addHttpListener(port, "localhost")
-                .setHandler(deploymentManager.start())
-                .build();
-        server.start();
-        return port;
-    }
-
-    protected void shutdown() throws Exception
-    {
-        server.stop();
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml b/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index 4070730..0000000
--- a/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet/pom.xml b/deltaspike/cdictrl/servlet/pom.xml
index 643eaa4..67dcd1b 100644
--- a/deltaspike/cdictrl/servlet/pom.xml
+++ b/deltaspike/cdictrl/servlet/pom.xml
@@ -31,6 +31,10 @@
 
     <name>Apache DeltaSpike CDI Servlet-ContainerControl</name>
 
+    <properties>
+        <jetty.version>8.1.9.v20130131</jetty.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -82,6 +86,18 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/de268632/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/JettyTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/JettyTest.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/JettyTest.java
new file mode 100644
index 0000000..d27be9d
--- /dev/null
+++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/JettyTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.deltaspike.cdise.servlet.test;
+
+import org.apache.deltaspike.cdise.servlet.CdiServletRequestListener;
+import org.apache.deltaspike.cdise.servlet.test.EmbeddedServletContainer;
+import org.apache.deltaspike.cdise.servlet.test.content.RequestServlet;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+
+/**
+ * Jetty based tests.
+ */
+public class JettyTest extends EmbeddedServletContainer
+{
+    private Server server;
+    @Override
+    protected int createServer() throws Exception
+    {
+        int port = super.getPort();
+        server = new Server(port);
+
+        ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        context.setContextPath("/");
+        server.setHandler(context);
+
+        context.addEventListener(new CdiServletRequestListener());
+        context.addServlet(new ServletHolder(new RequestServlet()),"/*");
+
+        server.start();
+        return port;
+    }
+
+    @Override
+    protected void shutdown() throws Exception
+    {
+        server.stop();
+    }
+}