Refactor to avoid reproducibility issues due to zip task ordering

Ant's zip task orders the entires based OS file names. '/' and '\' have
very different ordering so reafctor to directory names that are not
affected by this so zip files are consistent across Linux and Windows.

Author: markt-asf

test/org/apache/catalina/core/TestStandardWrapper.java

@@ -191,7 +191,7 @@ public void testSecurityAnnotationsNoWebXmlConstraints() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-servletsecurity");
+        File appDir = new File("test/webapp-servletsecurity-a");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();
@@ -210,7 +210,7 @@ public void testSecurityAnnotationsNoWebXmlLoginConfig() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-servletsecurity2");
+        File appDir = new File("test/webapp-servletsecurity-b");
         tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
         tomcat.start();

test/org/apache/catalina/loader/TestVirtualContext.java

@@ -58,7 +58,7 @@ public void testVirtualClassLoader() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
+        File appDir = new File("test/webapp-virtual-webapp/src/main/webapp-a");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
             appDir.getAbsolutePath());
@@ -67,11 +67,11 @@ public void testVirtualClassLoader() throws Exception {
         File f1 = new File("test/webapp-virtual-webapp/target/classes");
         File f2 = new File("test/webapp-virtual-library/target/WEB-INF");
         File f3 = new File(
-                "test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
+                "test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes");
         File f4 = new File(
-                "test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+                "test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes");
         File f5 = new File("test/webapp-virtual-webapp/src/main/misc");
-        File f6 = new File("test/webapp-virtual-webapp/src/main/webapp2");
+        File f6 = new File("test/webapp-virtual-webapp/src/main/webapp-b");
         ctx.getResources().createWebResourceSet(
                 WebResourceRoot.ResourceSetType.POST, "/WEB-INF/classes",
                 f1.getAbsolutePath(), null, "/");
@@ -143,13 +143,13 @@ public void testVirtualClassLoader() throws Exception {
                     "/test/classpathGetResources.jsp?path=rsrc/").toString();
         Assert.assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes/rsrc") > 0);
         Assert.assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc") > 0);
         Assert.assertTrue(
             allUrls,
-            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
+            allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
         Assert.assertTrue(
             allUrls,
             allUrls.indexOf("/test/webapp-virtual-webapp/target/classes/rsrc") > 0);
@@ -165,10 +165,10 @@ public void testVirtualClassLoader() throws Exception {
         String allRsrsc2ClasspathUrls =
             getUrl(
                 "http://localhost:" + getPort() +
-                    "/test/classpathGetResources.jsp?path=rsrc2/").toString();
+                    "/test/classpathGetResources.jsp?path=rsrc-2/").toString();
         Assert.assertTrue(
             allRsrsc2ClasspathUrls,
-            allRsrsc2ClasspathUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0);
+            allRsrsc2ClasspathUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc-2") > 0);
 
         // tests context.getRealPath
 
@@ -180,7 +180,7 @@ public void testVirtualClassLoader() throws Exception {
         // Real paths depend on the OS and this test has to work on all
         // platforms so use File to convert the path to a platform specific form
         File f = new File(
-            "test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties");
+            "test/webapp-virtual-webapp/src/main/webapp-a/rsrc/resourceF.properties");
         assertPageContains(
             "/test/contextGetRealPath.jsp?path=/rsrc/resourceF.properties",
             f.getPath());
@@ -202,7 +202,7 @@ public void testVirtualClassLoader() throws Exception {
             "/test/contextGetResource.jsp?path=/other/resourceI.properties",
             "resourceIInWebapp=true");
         assertPageContains(
-            "/test/contextGetResource.jsp?path=/rsrc2/resourceJ.properties",
+            "/test/contextGetResource.jsp?path=/rsrc-2/resourceJ.properties",
             "resourceJInWebapp=true");
 
         String allRsrcPaths =
@@ -227,10 +227,10 @@ public void testVirtualClassLoader() throws Exception {
         String allRsrc2Paths =
             getUrl(
                 "http://localhost:" + getPort() +
-                    "/test/contextGetResourcePaths.jsp?path=/rsrc2/").toString();
+                    "/test/contextGetResourcePaths.jsp?path=/rsrc-2/").toString();
         Assert.assertTrue(
             allRsrc2Paths,
-            allRsrc2Paths.indexOf("/rsrc2/resourceJ.properties") > 0);
+            allRsrc2Paths.indexOf("/rsrc-2/resourceJ.properties") > 0);
 
         assertPageContains(
             "/test/testTlds.jsp",
@@ -250,7 +250,7 @@ public void testVirtualClassLoader() throws Exception {
     public void testAdditionalWebInfClassesPaths() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
+        File appDir = new File("test/webapp-virtual-webapp/src/main/webapp-a");
         // app dir is relative to server home
         StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
             appDir.getAbsolutePath());

test/webapp-servletsecurity/WEB-INF/web.xml renamed to test/webapp-servletsecurity-a/WEB-INF/web.xml

@@ -14,4 +14,4 @@
 #  limitations under the License.
 
 This file should not be served, it is masked by
-/test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties
+/test/webapp-virtual-webapp/src/main/webapp-a/rsrc/resourceF.properties

test/webapp-servletsecurity2/WEB-INF/web.xml renamed to test/webapp-servletsecurity-b/WEB-INF/web.xml

@@ -120,6 +120,11 @@
         Remove the applet example from the example web application as applets
         are no longer supported in any major browser. (markt)
       </fix>
+      <scode>
+        Refactor a small number of pages in the examples web application to
+        avoid an issue with reproducible builds due to differences in file
+        ordering across different operating systems with Ant's zip task. (markt)
+      </scode>
     </changelog>
   </subsection>
 </section>

test/webapp-servletsecurity2/protected.jsp renamed to test/webapp-servletsecurity-b/protected.jsp

@@ -211,7 +211,7 @@
                http://tomcat.apache.org/jsp2-example-taglib
             </taglib-uri>
             <taglib-location>
-               /WEB-INF/jsp2/jsp2-example-taglib.tld
+               /WEB-INF/jsp/jsp2-example-taglib.tld
             </taglib-location>
         </taglib>
 

test/webapp-servletsecurity2/unprotected.jsp renamed to test/webapp-servletsecurity-b/unprotected.jsp

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ taglib prefix="my" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
+<%@ taglib prefix="my" uri="/WEB-INF/jsp/jsp2-example-taglib.tld" %>
 <html>
   <head>
     <title>JSP 2.0 Examples - Book SimpleTag Handler</title>

test/webapp-virtual-webapp/src/main/webapp/WEB-INF/A.tld renamed to test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/A.tld

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ taglib prefix="mytag" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
+<%@ taglib prefix="mytag" uri="/WEB-INF/jsp/jsp2-example-taglib.tld" %>
 <html>
   <head>
     <title>JSP 2.0 Examples - Hello World SimpleTag Handler</title>

test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc/resourceA.properties renamed to test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes/rsrc/resourceA.properties

@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ taglib prefix="mytag" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
+<%@ taglib prefix="mytag" uri="/WEB-INF/jsp/jsp2-example-taglib.tld" %>
 <html>
   <head>
     <title>JSP 2.0 Examples - Repeat SimpleTag Handler</title>