diff --git a/tests/test-cdi/cdi-client/pom.xml b/tests/test-cdi/cdi-client/pom.xml new file mode 100644 index 00000000000..3419c3b6f7f --- /dev/null +++ b/tests/test-cdi/cdi-client/pom.xml @@ -0,0 +1,37 @@ + + + + + org.eclipse.jetty.tests + test-cdi-parent + 9.2.4-SNAPSHOT + + 4.0.0 + cdi-client + jar + Jetty Tests :: CDI :: Clients + http://www.eclipse.org/jetty + + UTF-8 + ${project.groupId}.cdi.clients + + + + diff --git a/tests/test-cdi/cdi-tests/pom.xml b/tests/test-cdi/cdi-tests/pom.xml new file mode 100644 index 00000000000..89af2d9d686 --- /dev/null +++ b/tests/test-cdi/cdi-tests/pom.xml @@ -0,0 +1,55 @@ + + + + + org.eclipse.jetty.tests + test-cdi-parent + 9.2.4-SNAPSHOT + + 4.0.0 + cdi-tests + jar + Jetty Tests :: CDI :: Tests + http://www.eclipse.org/jetty + + UTF-8 + ${project.groupId}.cdi.tests + + + + org.eclipse.jetty.tests + cdi-webapp + ${project.version} + war + runtime + + + org.eclipse.jetty.tests + cdi-client + ${project.version} + runtime + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + diff --git a/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/DistroSetup.java b/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/DistroSetup.java new file mode 100644 index 00000000000..e60756cc257 --- /dev/null +++ b/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/DistroSetup.java @@ -0,0 +1,24 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.tests; + +public class DistroSetup +{ + +} diff --git a/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/JettyDistroRunner.java b/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/JettyDistroRunner.java new file mode 100644 index 00000000000..cd671a6d3dc --- /dev/null +++ b/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/JettyDistroRunner.java @@ -0,0 +1,24 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.tests; + +public class JettyDistroRunner +{ + +} diff --git a/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/ServletTest.java b/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/ServletTest.java new file mode 100644 index 00000000000..6607b1ae5a4 --- /dev/null +++ b/tests/test-cdi/cdi-tests/src/test/java/org/eclipse/jetty/tests/ServletTest.java @@ -0,0 +1,30 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.tests; + +import org.junit.Test; + +public class ServletTest +{ + @Test + public void testHello() + { + + } +} diff --git a/tests/test-cdi/cdi-webapp/pom.xml b/tests/test-cdi/cdi-webapp/pom.xml new file mode 100644 index 00000000000..117fe105e2c --- /dev/null +++ b/tests/test-cdi/cdi-webapp/pom.xml @@ -0,0 +1,56 @@ + + + + + org.eclipse.jetty.tests + test-cdi-parent + 9.2.4-SNAPSHOT + + 4.0.0 + cdi-webapp + war + Jetty Tests :: CDI :: WebApp + http://www.eclipse.org/jetty + + UTF-8 + ${project.groupId}.cdi.webapp + + + + javax.servlet + javax.servlet-api + provided + + + javax.enterprise + cdi-api + 1.1 + provided + + + javax.websocket + javax.websocket-api + provided + + + + cdi-webapp + + diff --git a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java b/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java new file mode 100644 index 00000000000..c401d857bbf --- /dev/null +++ b/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java @@ -0,0 +1,42 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.tests; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * The most basic servlet here, no CDI use. + */ +@SuppressWarnings("serial") +@WebServlet("/hello") +public class HelloServlet extends HttpServlet +{ + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + resp.setContentType("text/plain"); + resp.getWriter().println("Hello World"); + } +} diff --git a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java b/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java new file mode 100644 index 00000000000..6c2d4955226 --- /dev/null +++ b/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java @@ -0,0 +1,54 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.tests; + +import java.io.IOException; +import java.io.PrintWriter; + +import javax.inject.Inject; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@SuppressWarnings("serial") +@WebServlet("/serverinfo") +public class ServerInfoServlet extends HttpServlet +{ + @Inject + private ServletContext context; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + resp.setContentType("text/plain"); + + PrintWriter out = resp.getWriter(); + if (context == null) + { + out.println("context = null"); + return; + } + out.printf("context = %s%n",context); + out.printf("context.contextPath = %s%n",context.getContextPath()); + out.printf("context.effective-version = %d.%d%n",context.getEffectiveMajorVersion(),context.getEffectiveMinorVersion()); + } +} diff --git a/tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/web.xml b/tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000000..292a1677caf --- /dev/null +++ b/tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + CDI Integration Test WebApp + diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml new file mode 100644 index 00000000000..f4e85eb3d57 --- /dev/null +++ b/tests/test-cdi/pom.xml @@ -0,0 +1,35 @@ + + + + + org.eclipse.jetty.tests + tests-parent + 9.2.4-SNAPSHOT + + 4.0.0 + test-cdi-parent + pom + Jetty Tests :: CDI Parent + http://www.eclipse.org/jetty + + cdi-webapp + cdi-client + cdi-tests + +