From 8089c74228e90d3e6c976f0aecb3aabf88e249bd Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 7 Mar 2010 10:16:38 +0000 Subject: [PATCH] Rename webapp to allow tetsing with webapps with different servlet spec versions in web.xml git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@919961 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/el/TestELInJsp.java | 24 +++++++++++----------- test/org/apache/jasper/compiler/TestGenerator.java | 4 ++-- .../jasper/compiler/TestJspDocumentParser.java | 4 ++-- test/org/apache/jasper/compiler/TestParser.java | 6 +++--- .../jasper/compiler/TestScriptingVariabler.java | 6 +++--- test/org/apache/jasper/compiler/TestValidator.java | 2 +- test/{webapp => webapp-3.0}/WEB-INF/bugs.tld | 0 .../WEB-INF/tags/bug42390.tag | 0 .../WEB-INF/tags/bug48668.tagx | 0 .../WEB-INF/tags/echo-deferred.tag | 0 .../WEB-INF/tags/echo-double.tag | 0 .../WEB-INF/tags/echo-long.tag | 0 .../WEB-INF/tags/echo-noel.tag | 0 test/{webapp => webapp-3.0}/WEB-INF/tags/echo.tag | 0 .../WEB-INF/tags/implicit.tld | 0 test/{webapp => webapp-3.0}/WEB-INF/test.tld | 0 test/{webapp => webapp-3.0}/WEB-INF/web.xml | 0 test/{webapp => webapp-3.0}/bug36923.jsp | 0 test/{webapp => webapp-3.0}/bug42390.jsp | 0 test/{webapp => webapp-3.0}/bug42565.jsp | 0 test/{webapp => webapp-3.0}/bug44994.jsp | 0 test/{webapp => webapp-3.0}/bug45015a.jsp | 0 test/{webapp => webapp-3.0}/bug45015b.jsp | 0 test/{webapp => webapp-3.0}/bug45427.jsp | 0 test/{webapp => webapp-3.0}/bug45451.jspf | 0 test/{webapp => webapp-3.0}/bug45451a.jsp | 0 test/{webapp => webapp-3.0}/bug45451b.jsp | 0 test/{webapp => webapp-3.0}/bug45451c.jsp | 0 test/{webapp => webapp-3.0}/bug45451d.jspx | 0 test/{webapp => webapp-3.0}/bug45451e.jsp | 0 test/{webapp => webapp-3.0}/bug45511.jsp | 0 test/{webapp => webapp-3.0}/bug46381.jsp | 0 test/{webapp => webapp-3.0}/bug46596.jsp | 0 test/{webapp => webapp-3.0}/bug47331.jsp | 0 test/{webapp => webapp-3.0}/bug47413.jsp | 0 test/{webapp => webapp-3.0}/bug47977.jspx | 0 test/{webapp => webapp-3.0}/bug48112.jsp | 0 test/{webapp => webapp-3.0}/bug48616.jsp | 0 test/{webapp => webapp-3.0}/bug48616b.jsp | 0 test/{webapp => webapp-3.0}/bug48627.jsp | 0 test/{webapp => webapp-3.0}/bug48668a.jsp | 0 test/{webapp => webapp-3.0}/bug48668b.jsp | 0 test/{webapp => webapp-3.0}/bug48827.jspx | 0 test/{webapp => webapp-3.0}/el-method.jsp | 0 test/{webapp => webapp-3.0}/el-misc.jsp | 0 test/{webapp => webapp-3.0}/script-expr.jsp | 0 46 files changed, 23 insertions(+), 23 deletions(-) rename test/{webapp => webapp-3.0}/WEB-INF/bugs.tld (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/bug42390.tag (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/bug48668.tagx (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/echo-deferred.tag (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/echo-double.tag (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/echo-long.tag (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/echo-noel.tag (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/echo.tag (100%) rename test/{webapp => webapp-3.0}/WEB-INF/tags/implicit.tld (100%) rename test/{webapp => webapp-3.0}/WEB-INF/test.tld (100%) rename test/{webapp => webapp-3.0}/WEB-INF/web.xml (100%) rename test/{webapp => webapp-3.0}/bug36923.jsp (100%) rename test/{webapp => webapp-3.0}/bug42390.jsp (100%) rename test/{webapp => webapp-3.0}/bug42565.jsp (100%) rename test/{webapp => webapp-3.0}/bug44994.jsp (100%) rename test/{webapp => webapp-3.0}/bug45015a.jsp (100%) rename test/{webapp => webapp-3.0}/bug45015b.jsp (100%) rename test/{webapp => webapp-3.0}/bug45427.jsp (100%) rename test/{webapp => webapp-3.0}/bug45451.jspf (100%) rename test/{webapp => webapp-3.0}/bug45451a.jsp (100%) rename test/{webapp => webapp-3.0}/bug45451b.jsp (100%) rename test/{webapp => webapp-3.0}/bug45451c.jsp (100%) rename test/{webapp => webapp-3.0}/bug45451d.jspx (100%) rename test/{webapp => webapp-3.0}/bug45451e.jsp (100%) rename test/{webapp => webapp-3.0}/bug45511.jsp (100%) rename test/{webapp => webapp-3.0}/bug46381.jsp (100%) rename test/{webapp => webapp-3.0}/bug46596.jsp (100%) rename test/{webapp => webapp-3.0}/bug47331.jsp (100%) rename test/{webapp => webapp-3.0}/bug47413.jsp (100%) rename test/{webapp => webapp-3.0}/bug47977.jspx (100%) rename test/{webapp => webapp-3.0}/bug48112.jsp (100%) rename test/{webapp => webapp-3.0}/bug48616.jsp (100%) rename test/{webapp => webapp-3.0}/bug48616b.jsp (100%) rename test/{webapp => webapp-3.0}/bug48627.jsp (100%) rename test/{webapp => webapp-3.0}/bug48668a.jsp (100%) rename test/{webapp => webapp-3.0}/bug48668b.jsp (100%) rename test/{webapp => webapp-3.0}/bug48827.jspx (100%) rename test/{webapp => webapp-3.0}/el-method.jsp (100%) rename test/{webapp => webapp-3.0}/el-misc.jsp (100%) rename test/{webapp => webapp-3.0}/script-expr.jsp (100%) diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java index 56e50cc79..5d704fb7e 100644 --- a/test/org/apache/el/TestELInJsp.java +++ b/test/org/apache/el/TestELInJsp.java @@ -33,7 +33,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug36923() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp"); + File appDir = new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -49,7 +49,7 @@ public class TestELInJsp extends TomcatBaseTest { public void testBug42565() throws Exception { Tomcat tomcat = getTomcatInstance(); - File appDir = new File("test/webapp"); + File appDir = new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -81,7 +81,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -100,7 +100,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -135,7 +135,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -235,7 +235,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -253,7 +253,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -269,7 +269,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -297,7 +297,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -313,7 +313,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -346,7 +346,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -373,7 +373,7 @@ public class TestELInJsp extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java index 30bab8411..78c5856c3 100644 --- a/test/org/apache/jasper/compiler/TestGenerator.java +++ b/test/org/apache/jasper/compiler/TestGenerator.java @@ -30,7 +30,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -58,7 +58,7 @@ public class TestGenerator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java index a0e87b6aa..c1c493d6f 100644 --- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java +++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java @@ -29,7 +29,7 @@ public class TestJspDocumentParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -50,7 +50,7 @@ public class TestJspDocumentParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java index 4db2cba6d..6c3eebdaa 100644 --- a/test/org/apache/jasper/compiler/TestParser.java +++ b/test/org/apache/jasper/compiler/TestParser.java @@ -29,7 +29,7 @@ public class TestParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -49,7 +49,7 @@ public class TestParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -94,7 +94,7 @@ public class TestParser extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java index 87e796031..8b372c3e4 100644 --- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java +++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java @@ -34,7 +34,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -76,7 +76,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); @@ -97,7 +97,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/org/apache/jasper/compiler/TestValidator.java b/test/org/apache/jasper/compiler/TestValidator.java index a367a646f..17fc195f7 100644 --- a/test/org/apache/jasper/compiler/TestValidator.java +++ b/test/org/apache/jasper/compiler/TestValidator.java @@ -29,7 +29,7 @@ public class TestValidator extends TomcatBaseTest { Tomcat tomcat = getTomcatInstance(); File appDir = - new File("test/webapp"); + new File("test/webapp-3.0"); // app dir is relative to server home tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); diff --git a/test/webapp/WEB-INF/bugs.tld b/test/webapp-3.0/WEB-INF/bugs.tld similarity index 100% rename from test/webapp/WEB-INF/bugs.tld rename to test/webapp-3.0/WEB-INF/bugs.tld diff --git a/test/webapp/WEB-INF/tags/bug42390.tag b/test/webapp-3.0/WEB-INF/tags/bug42390.tag similarity index 100% rename from test/webapp/WEB-INF/tags/bug42390.tag rename to test/webapp-3.0/WEB-INF/tags/bug42390.tag diff --git a/test/webapp/WEB-INF/tags/bug48668.tagx b/test/webapp-3.0/WEB-INF/tags/bug48668.tagx similarity index 100% rename from test/webapp/WEB-INF/tags/bug48668.tagx rename to test/webapp-3.0/WEB-INF/tags/bug48668.tagx diff --git a/test/webapp/WEB-INF/tags/echo-deferred.tag b/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag similarity index 100% rename from test/webapp/WEB-INF/tags/echo-deferred.tag rename to test/webapp-3.0/WEB-INF/tags/echo-deferred.tag diff --git a/test/webapp/WEB-INF/tags/echo-double.tag b/test/webapp-3.0/WEB-INF/tags/echo-double.tag similarity index 100% rename from test/webapp/WEB-INF/tags/echo-double.tag rename to test/webapp-3.0/WEB-INF/tags/echo-double.tag diff --git a/test/webapp/WEB-INF/tags/echo-long.tag b/test/webapp-3.0/WEB-INF/tags/echo-long.tag similarity index 100% rename from test/webapp/WEB-INF/tags/echo-long.tag rename to test/webapp-3.0/WEB-INF/tags/echo-long.tag diff --git a/test/webapp/WEB-INF/tags/echo-noel.tag b/test/webapp-3.0/WEB-INF/tags/echo-noel.tag similarity index 100% rename from test/webapp/WEB-INF/tags/echo-noel.tag rename to test/webapp-3.0/WEB-INF/tags/echo-noel.tag diff --git a/test/webapp/WEB-INF/tags/echo.tag b/test/webapp-3.0/WEB-INF/tags/echo.tag similarity index 100% rename from test/webapp/WEB-INF/tags/echo.tag rename to test/webapp-3.0/WEB-INF/tags/echo.tag diff --git a/test/webapp/WEB-INF/tags/implicit.tld b/test/webapp-3.0/WEB-INF/tags/implicit.tld similarity index 100% rename from test/webapp/WEB-INF/tags/implicit.tld rename to test/webapp-3.0/WEB-INF/tags/implicit.tld diff --git a/test/webapp/WEB-INF/test.tld b/test/webapp-3.0/WEB-INF/test.tld similarity index 100% rename from test/webapp/WEB-INF/test.tld rename to test/webapp-3.0/WEB-INF/test.tld diff --git a/test/webapp/WEB-INF/web.xml b/test/webapp-3.0/WEB-INF/web.xml similarity index 100% rename from test/webapp/WEB-INF/web.xml rename to test/webapp-3.0/WEB-INF/web.xml diff --git a/test/webapp/bug36923.jsp b/test/webapp-3.0/bug36923.jsp similarity index 100% rename from test/webapp/bug36923.jsp rename to test/webapp-3.0/bug36923.jsp diff --git a/test/webapp/bug42390.jsp b/test/webapp-3.0/bug42390.jsp similarity index 100% rename from test/webapp/bug42390.jsp rename to test/webapp-3.0/bug42390.jsp diff --git a/test/webapp/bug42565.jsp b/test/webapp-3.0/bug42565.jsp similarity index 100% rename from test/webapp/bug42565.jsp rename to test/webapp-3.0/bug42565.jsp diff --git a/test/webapp/bug44994.jsp b/test/webapp-3.0/bug44994.jsp similarity index 100% rename from test/webapp/bug44994.jsp rename to test/webapp-3.0/bug44994.jsp diff --git a/test/webapp/bug45015a.jsp b/test/webapp-3.0/bug45015a.jsp similarity index 100% rename from test/webapp/bug45015a.jsp rename to test/webapp-3.0/bug45015a.jsp diff --git a/test/webapp/bug45015b.jsp b/test/webapp-3.0/bug45015b.jsp similarity index 100% rename from test/webapp/bug45015b.jsp rename to test/webapp-3.0/bug45015b.jsp diff --git a/test/webapp/bug45427.jsp b/test/webapp-3.0/bug45427.jsp similarity index 100% rename from test/webapp/bug45427.jsp rename to test/webapp-3.0/bug45427.jsp diff --git a/test/webapp/bug45451.jspf b/test/webapp-3.0/bug45451.jspf similarity index 100% rename from test/webapp/bug45451.jspf rename to test/webapp-3.0/bug45451.jspf diff --git a/test/webapp/bug45451a.jsp b/test/webapp-3.0/bug45451a.jsp similarity index 100% rename from test/webapp/bug45451a.jsp rename to test/webapp-3.0/bug45451a.jsp diff --git a/test/webapp/bug45451b.jsp b/test/webapp-3.0/bug45451b.jsp similarity index 100% rename from test/webapp/bug45451b.jsp rename to test/webapp-3.0/bug45451b.jsp diff --git a/test/webapp/bug45451c.jsp b/test/webapp-3.0/bug45451c.jsp similarity index 100% rename from test/webapp/bug45451c.jsp rename to test/webapp-3.0/bug45451c.jsp diff --git a/test/webapp/bug45451d.jspx b/test/webapp-3.0/bug45451d.jspx similarity index 100% rename from test/webapp/bug45451d.jspx rename to test/webapp-3.0/bug45451d.jspx diff --git a/test/webapp/bug45451e.jsp b/test/webapp-3.0/bug45451e.jsp similarity index 100% rename from test/webapp/bug45451e.jsp rename to test/webapp-3.0/bug45451e.jsp diff --git a/test/webapp/bug45511.jsp b/test/webapp-3.0/bug45511.jsp similarity index 100% rename from test/webapp/bug45511.jsp rename to test/webapp-3.0/bug45511.jsp diff --git a/test/webapp/bug46381.jsp b/test/webapp-3.0/bug46381.jsp similarity index 100% rename from test/webapp/bug46381.jsp rename to test/webapp-3.0/bug46381.jsp diff --git a/test/webapp/bug46596.jsp b/test/webapp-3.0/bug46596.jsp similarity index 100% rename from test/webapp/bug46596.jsp rename to test/webapp-3.0/bug46596.jsp diff --git a/test/webapp/bug47331.jsp b/test/webapp-3.0/bug47331.jsp similarity index 100% rename from test/webapp/bug47331.jsp rename to test/webapp-3.0/bug47331.jsp diff --git a/test/webapp/bug47413.jsp b/test/webapp-3.0/bug47413.jsp similarity index 100% rename from test/webapp/bug47413.jsp rename to test/webapp-3.0/bug47413.jsp diff --git a/test/webapp/bug47977.jspx b/test/webapp-3.0/bug47977.jspx similarity index 100% rename from test/webapp/bug47977.jspx rename to test/webapp-3.0/bug47977.jspx diff --git a/test/webapp/bug48112.jsp b/test/webapp-3.0/bug48112.jsp similarity index 100% rename from test/webapp/bug48112.jsp rename to test/webapp-3.0/bug48112.jsp diff --git a/test/webapp/bug48616.jsp b/test/webapp-3.0/bug48616.jsp similarity index 100% rename from test/webapp/bug48616.jsp rename to test/webapp-3.0/bug48616.jsp diff --git a/test/webapp/bug48616b.jsp b/test/webapp-3.0/bug48616b.jsp similarity index 100% rename from test/webapp/bug48616b.jsp rename to test/webapp-3.0/bug48616b.jsp diff --git a/test/webapp/bug48627.jsp b/test/webapp-3.0/bug48627.jsp similarity index 100% rename from test/webapp/bug48627.jsp rename to test/webapp-3.0/bug48627.jsp diff --git a/test/webapp/bug48668a.jsp b/test/webapp-3.0/bug48668a.jsp similarity index 100% rename from test/webapp/bug48668a.jsp rename to test/webapp-3.0/bug48668a.jsp diff --git a/test/webapp/bug48668b.jsp b/test/webapp-3.0/bug48668b.jsp similarity index 100% rename from test/webapp/bug48668b.jsp rename to test/webapp-3.0/bug48668b.jsp diff --git a/test/webapp/bug48827.jspx b/test/webapp-3.0/bug48827.jspx similarity index 100% rename from test/webapp/bug48827.jspx rename to test/webapp-3.0/bug48827.jspx diff --git a/test/webapp/el-method.jsp b/test/webapp-3.0/el-method.jsp similarity index 100% rename from test/webapp/el-method.jsp rename to test/webapp-3.0/el-method.jsp diff --git a/test/webapp/el-misc.jsp b/test/webapp-3.0/el-misc.jsp similarity index 100% rename from test/webapp/el-misc.jsp rename to test/webapp-3.0/el-misc.jsp diff --git a/test/webapp/script-expr.jsp b/test/webapp-3.0/script-expr.jsp similarity index 100% rename from test/webapp/script-expr.jsp rename to test/webapp-3.0/script-expr.jsp -- 2.11.0