fixt test (#79)

olamy · web-flow · commit 1021d9de6164 · 2023-07-26T12:52:01.000+02:00
Signed-off-by: Olivier Lamy &lt;olamy@apache.org&gt;
diff --git a/src/it/filtering-it/pom.xml b/src/it/filtering-it/pom.xml
@@ -33,7 +33,7 @@
             <nonFilteredFileExtension>tga</nonFilteredFileExtension>
             <nonFilteredFileExtension>zip</nonFilteredFileExtension>
             <nonFilteredFileExtension>gz</nonFilteredFileExtension>
-            <nonFilteredFileExtension>tif</nonFilteredFileExtension>
+            <nonFilteredFileExtension>gif</nonFilteredFileExtension>
             <nonFilteredFileExtension>tiff</nonFilteredFileExtension>
             <nonFilteredFileExtension>svgz</nonFilteredFileExtension>
             <nonFilteredFileExtension>jp2</nonFilteredFileExtension>
@@ -72,6 +72,10 @@
                   <filtering>true</filtering>
                   <directory>src/main/config</directory>
                 </resource>
+                <resource>
+                  <filtering>true</filtering>
+                  <directory>src/main/webapp</directory>
+                </resource>
               </resources>
             </configuration>
           </execution>
diff --git a/src/it/filtering-it/src/main/webapp/logout.jsp b/src/it/filtering-it/src/main/webapp/logout.jsp
@@ -0,0 +1,19 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ page import="jakarta.servlet.http.HttpSession"%>
+<html>
+<head>
+    <title>Logout</title>
+</head>
+
+<body>
+<%
+    HttpSession s = request.getSession(false);
+    s.invalidate();
+   %>
+   <h1>Logout</h1>
+
+   <p>You are now logged out.</p> 
+   <a href="/"/>Home</a>
+</body>
+
+</html>
diff --git a/src/it/filtering-it/src/main/webapp/small_powered_by.gif b/src/it/filtering-it/src/main/webapp/small_powered_by.gif
diff --git a/src/it/filtering-it/verify.groovy b/src/it/filtering-it/verify.groovy
@@ -8,5 +8,9 @@ assert !source.text.contains( 'web-app_5_0.xsd')
 assert source.text.contains( 'org.eclipse.jetty.ee8.plus.webapp.PlusDescriptorProcessorTest$TestInjections');
 assert source.text.contains( 'javax.servlet.Foo');
 
+File jsp = new File( basedir, "target/test-classes/logout.jsp" );
+assert jsp.isFile()
+assert !jsp.text.contains( 'jakarta')
+
 
 
diff --git a/src/main/java/org/eclipse/jetty/toolchain/modifysources/ResourcesFiltering.java b/src/main/java/org/eclipse/jetty/toolchain/modifysources/ResourcesFiltering.java
@@ -41,23 +41,6 @@ public ResourcesFiltering(MavenFileFilter mavenFileFilter, BuildContext buildCon
         super(new JettyMavenFileFilter(buildContext), buildContext);
     }
 
-    @Override
-    public boolean filteredFileExtension(String fileName, List<String> userNonFilteredFileExtensions) {
-        String ext = getExtension(fileName);
-        return ext == null? false : Arrays.asList("xml", "properties", "txt").contains(ext);
-    }
-
-    private static String getExtension( String fileName )
-    {
-        String rawExt = FilenameUtils.getExtension(fileName);
-        return rawExt == null ? null : rawExt.toLowerCase(Locale.ROOT);
-    }
-
-    @Override
-    public void filterResources(MavenResourcesExecution mavenResourcesExecution) throws MavenFilteringException {
-        super.filterResources(mavenResourcesExecution);
-    }
-
     public static class JettyMavenFileFilter extends DefaultMavenFileFilter implements MavenFileFilter {
 
         private BuildContext buildContext;
