diff --git a/jetty-embedded-10/src/main/java/org/jboss/arquillian/container/jetty/embedded_10/JettyEmbeddedContainer.java b/jetty-embedded-10/src/main/java/org/jboss/arquillian/container/jetty/embedded_10/JettyEmbeddedContainer.java index 5c5f58d..39de28f 100644 --- a/jetty-embedded-10/src/main/java/org/jboss/arquillian/container/jetty/embedded_10/JettyEmbeddedContainer.java +++ b/jetty-embedded-10/src/main/java/org/jboss/arquillian/container/jetty/embedded_10/JettyEmbeddedContainer.java @@ -262,7 +262,11 @@ public ProtocolMetaData deploy(final Archive archive) throws DeploymentExcept HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort); ServletHandler servletHandler = webAppContext.getServletHandler(); for (ServletHolder servlet : servletHandler.getServlets()) { - httpContext.add(new Servlet(servlet.getName(), servlet.getContextPath())); + if(servlet.getServletContext() == null) { + httpContext.add(new Servlet(servlet.getName(), "/")); + } else { + httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath())); + } } return new ProtocolMetaData().addContext(httpContext); } catch (Exception e) { diff --git a/jetty-embedded-11/src/main/java/org/jboss/arquillian/container/jetty/embedded_11/JettyEmbeddedContainer.java b/jetty-embedded-11/src/main/java/org/jboss/arquillian/container/jetty/embedded_11/JettyEmbeddedContainer.java index 86266ac..eb13439 100644 --- a/jetty-embedded-11/src/main/java/org/jboss/arquillian/container/jetty/embedded_11/JettyEmbeddedContainer.java +++ b/jetty-embedded-11/src/main/java/org/jboss/arquillian/container/jetty/embedded_11/JettyEmbeddedContainer.java @@ -264,7 +264,11 @@ public ProtocolMetaData deploy(final Archive archive) throws DeploymentExcept HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort); ServletHandler servletHandler = webAppContext.getServletHandler(); for (ServletHolder servlet : servletHandler.getServlets()) { - httpContext.add(new Servlet(servlet.getName(), servlet.getContextPath())); + if(servlet.getServletContext() == null) { + httpContext.add(new Servlet(servlet.getName(), "/")); + } else { + httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath())); + } } return new ProtocolMetaData().addContext(httpContext); } catch (Exception e) { diff --git a/jetty-embedded-12-ee10/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java b/jetty-embedded-12-ee10/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java index 9d3bccf..7df3adb 100644 --- a/jetty-embedded-12-ee10/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java +++ b/jetty-embedded-12-ee10/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java @@ -277,7 +277,11 @@ public ProtocolMetaData deploy(final Archive archive) throws DeploymentExcept HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort); ServletHandler servletHandler = webAppContext.getServletHandler(); for (ServletHolder servlet : servletHandler.getServlets()) { - httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath())); + if(servlet.getServletContext() == null) { + httpContext.add(new Servlet(servlet.getName(), "/")); + } else { + httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath())); + } } return new ProtocolMetaData().addContext(httpContext); } catch (Exception e) { diff --git a/jetty-embedded-12-ee11/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee11/JettyEmbeddedContainer.java b/jetty-embedded-12-ee11/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee11/JettyEmbeddedContainer.java index 98db667..ee2cad1 100644 --- a/jetty-embedded-12-ee11/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee11/JettyEmbeddedContainer.java +++ b/jetty-embedded-12-ee11/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee11/JettyEmbeddedContainer.java @@ -277,7 +277,11 @@ public ProtocolMetaData deploy(final Archive archive) throws DeploymentExcept HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort); ServletHandler servletHandler = webAppContext.getServletHandler(); for (ServletHolder servlet : servletHandler.getServlets()) { - httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath())); + if(servlet.getServletContext() == null) { + httpContext.add(new Servlet(servlet.getName(), "/")); + } else { + httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath())); + } } return new ProtocolMetaData().addContext(httpContext); } catch (Exception e) { diff --git a/jetty-embedded-12-ee9/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java b/jetty-embedded-12-ee9/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java index 1d4bc47..3398148 100644 --- a/jetty-embedded-12-ee9/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java +++ b/jetty-embedded-12-ee9/src/main/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java @@ -277,10 +277,11 @@ public ProtocolMetaData deploy(final Archive archive) throws DeploymentExcept HTTPContext httpContext = new HTTPContext(listeningHost, listeningPort); ServletHandler servletHandler = webAppContext.getServletHandler(); for (ServletHolder servlet : servletHandler.getServlets()) { - if(servlet.getServletContext() != null) { + if(servlet.getServletContext() == null) { + httpContext.add(new Servlet(servlet.getName(), "/")); + } else { httpContext.add(new Servlet(servlet.getName(), servlet.getServletContext().getContextPath())); } - } return new ProtocolMetaData().addContext(httpContext); } catch (Exception e) {