Jetty Issue #3804 WELD-2587

Remove DecoratingListener tests from test-jetty-webapp Signed-off-by: Greg Wilkins <[email protected]>
jetty · Jul 1, 2019 · 597dcc5 · 597dcc5
1 parent b9f70a0
commit 597dcc5
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 78 deletions.
diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml
@@ -175,12 +175,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-annotations</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>

diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java
@@ -69,7 +69,6 @@ public class Dump extends HttpServlet
      */
     private static final String ZWSP = "&#8203;";
     boolean fixed;
-    boolean decorated;
     Timer _timer;
 
     @Override
@@ -441,7 +440,7 @@ else if (pi.startsWith("/ex3/"))
         try
         {
             pout.write("<html>\n<body>\n");
-            pout.write("<h1>Dump Servlet (decorated=" + decorated + ")</h1>\n");
+            pout.write("<h1>Dump Servlet</h1>\n");
             pout.write("<table width=\"95%\">");
             pout.write("<tr>\n");
             pout.write("<th align=\"right\">getContentLength:&nbsp;</th>");
@@ -925,11 +924,6 @@ public synchronized void destroy()
         _timer.cancel();
     }
 
-    public void setDecorated(boolean b)
-    {
-        decorated = b;
-    }
-
     private String getURI(HttpServletRequest request)
     {
         String uri = (String)request.getAttribute(RequestDispatcher.FORWARD_REQUEST_URI);

diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestDecoratingSCI.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/TestDecoratingSCI.java
diff --git a/...tty-webapp/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/...tty-webapp/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -15,13 +15,4 @@ org.eclipse.jetty.servlet.WebApplicationContext object
   <Get class="org.eclipse.jetty.util.log.Log" name="rootLogger">
     <Call name="warn"><Arg>test webapp is deployed. DO NOT USE IN PRODUCTION!</Arg></Call>
   </Get>
-
-  <Call name="addEventListener">
-    <Arg>
-      <New class="org.eclipse.jetty.webapp.DecoratingListener">
-        <Arg type="String">test.decorator.attribute.name</Arg>
-      </New>
-    </Arg>
-  </Call>
-
 </Configure>
diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
@@ -51,7 +51,6 @@
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.log.StdErrLog;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.junit.jupiter.api.Disabled;
 
@@ -79,16 +78,6 @@ public static void main(String[] args) throws Exception
         Server server = new Server(threadPool);
         server.manage(threadPool);
 
-        // Setup JNDI and annotations
-        Configuration.ClassList classlist = Configuration.ClassList
-            .setServerDefault(server);
-        classlist.addAfter("org.eclipse.jetty.webapp.FragmentConfiguration",
-            "org.eclipse.jetty.plus.webapp.EnvConfiguration",
-            "org.eclipse.jetty.plus.webapp.PlusConfiguration");
-        classlist.addBefore(
-            "org.eclipse.jetty.webapp.JettyWebXmlConfiguration",
-            "org.eclipse.jetty.annotations.AnnotationConfiguration");
-
         // Setup JMX
         MBeanContainer mbContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer());
         server.addBean(mbContainer);