From 094e93a682d2ca8c6f0887b9a0b84abc4840f33e Mon Sep 17 00:00:00 2001 From: Alwin Joseph <44426046+alwin-joseph@users.noreply.github.com> Date: Tue, 28 Nov 2023 17:09:04 +0530 Subject: [PATCH] JSP TCK Refactoring using Arquillian and JUnit (#1182) * Convert JSP arrayelresolver test to use Arquillian/JUnit - duplicated SunRIURL class to jsp module - copied ArrayELResolverTest.jsp, WEB-INF/arrayelresolver.tld from webartifacts module * add jsp tck runner, passing test arrayelresolver * simplify arrayelresolver test deployment code * prepare resources folder for jsp/api/jakarta_el & jakarta_servlet * URLClient changes in jsp/api/jakarta_el & jakarta_servlet to use Arquillian & Junit * rename URLClient to URLClientIT in jsp/api/jakarta_el & jakarta_servlet * remove build.xml and duplicate resource files from src * prepare resources folder for pending tests in jsp/spec : copied the web.xml from src, copied other web resources(tld, tag, tagx, gf, jsp, jspx, html files) from webartifacts/jsp module * set goldenfile stream as new property for tests depending on goldenfiles(.gf) * modify tests in jsp/spec to use Junit/Arquillian - pending 37 tests after this change to be run - URLClient classes renamed to URLClientIT * missed out file in previous commit * more tests included in spec - tagfiles/packaging, elevaluation, tldres, * use host/port from Arquillian if system property not set * add logging and address review comments * move test logging code to parent class * remove package name of classes while creating archive * use URL injected by Arquillian --- .../tests/common/webclient/WebTestCase.java | 23 + .../validation/TokenizedValidator.java | 12 +- glassfish-runner/jsp-tck/j2ee.pass | 17 + glassfish-runner/jsp-tck/javajoe.pass | 16 + glassfish-runner/jsp-tck/pom.xml | 327 ++++ .../jsp-tck/src/test/resources/arquillian.xml | 18 + jsp/pom.xml | 97 +- .../jakarta_el/arrayelresolver/URLClient.java | 76 - .../arrayelresolver/URLClientIT.java | 84 + .../api/jakarta_el/arrayelresolver/build.xml | 35 - .../jakarta_el/beanelresolver/URLClient.java | 76 - .../beanelresolver/URLClientIT.java | 87 ++ .../api/jakarta_el/beanelresolver/build.xml | 35 - .../jakarta_el/compelresolver/URLClient.java | 77 - .../compelresolver/URLClientIT.java | 90 ++ .../api/jakarta_el/compelresolver/build.xml | 36 - .../{URLClient.java => URLClientIT.java} | 54 +- .../{URLClient.java => URLClientIT.java} | 56 +- .../{URLClient.java => URLClientIT.java} | 62 +- .../jsp/api/jakarta_el/elresolver/build.xml | 35 - .../jakarta_el/listelresolver/URLClient.java | 76 - .../listelresolver/URLClientIT.java | 86 ++ .../api/jakarta_el/listelresolver/build.xml | 35 - .../jakarta_el/mapelresolver/URLClient.java | 76 - .../jakarta_el/mapelresolver/URLClientIT.java | 87 ++ .../api/jakarta_el/mapelresolver/build.xml | 35 - .../api/jakarta_el/methodinfo/URLClient.java | 76 - .../jakarta_el/methodinfo/URLClientIT.java | 86 ++ .../jsp/api/jakarta_el/methodinfo/build.xml | 36 - .../resourcebundleelresolver/URLClient.java | 76 - .../resourcebundleelresolver/URLClientIT.java | 87 ++ .../resourcebundleelresolver/build.xml | 35 - .../{URLClient.java => URLClientIT.java} | 63 +- .../api/jakarta_el/valexpression/build.xml | 36 - .../{URLClient.java => URLClientIT.java} | 61 +- .../jsp/el/elexception/build.xml | 43 - .../{URLClient.java => URLClientIT.java} | 65 +- .../jsp/el/expression/URLClient.java | 73 - .../jsp/el/expression/URLClientIT.java | 87 ++ .../{URLClient.java => URLClientIT.java} | 63 +- .../el/implicitobjelresolver/URLClient.java | 77 - .../el/implicitobjelresolver/URLClientIT.java | 94 ++ .../el/scopedattrelresolver/URLClient.java | 76 - .../el/scopedattrelresolver/URLClientIT.java | 93 ++ .../jsp/el/variableresolver/URLClient.java | 73 - .../jsp/el/variableresolver/URLClientIT.java | 87 ++ .../{URLClient.java => URLClientIT.java} | 64 +- .../jakarta_servlet/jsp/errordata/build.xml | 43 - .../{URLClient.java => URLClientIT.java} | 60 +- .../jsp/jspapplicationcontext/build.xml | 33 - .../{URLClient.java => URLClientIT.java} | 59 +- .../jsp/jspengineinfo/build.xml | 43 - .../{URLClient.java => URLClientIT.java} | 62 +- .../jsp/jspexception/build.xml | 42 - .../{URLClient.java => URLClientIT.java} | 64 +- .../jakarta_servlet/jsp/jspfactory/build.xml | 45 - .../{URLClient.java => URLClientIT.java} | 62 +- .../jsp/jsptagexception/build.xml | 43 - .../{URLClient.java => URLClientIT.java} | 94 +- .../jakarta_servlet/jsp/jspwriter/build.xml | 42 - .../{URLClient.java => URLClientIT.java} | 105 +- .../jakarta_servlet/jsp/pagecontext/build.xml | 43 - .../{URLClient.java => URLClientIT.java} | 62 +- .../jsp/skippageexception/build.xml | 43 - .../{URLClient.java => URLClientIT.java} | 64 +- .../jsp/tagext/bodycontent/build.xml | 53 - .../{URLClient.java => URLClientIT.java} | 82 +- .../jsp/tagext/bodytagsupport/build.xml | 57 - .../api/jakarta_servlet/jsp/tagext/build.xml | 22 - .../{URLClient.java => URLClientIT.java} | 61 +- .../jsp/tagext/dynamicattributes/build.xml | 45 - .../{URLClient.java => URLClientIT.java} | 69 +- .../jsp/tagext/functioninfo/build.xml | 51 - .../{URLClient.java => URLClientIT.java} | 63 +- .../jsp/tagext/jspidconsumer/build.xml | 34 - .../{URLClient.java => URLClientIT.java} | 66 +- .../jsp/tagext/pagedata/build.xml | 49 - .../{URLClient.java => URLClientIT.java} | 107 +- .../jsp/tagext/simpletagsupport/build.xml | 77 - .../{URLClient.java => URLClientIT.java} | 67 +- .../jsp/tagext/tagadapter/build.xml | 47 - .../{URLClient.java => URLClientIT.java} | 75 +- .../jsp/tagext/tagattributeinfo/build.xml | 49 - .../{URLClient.java => URLClientIT.java} | 70 +- .../jsp/tagext/tagdata/build.xml | 49 - .../{URLClient.java => URLClientIT.java} | 65 +- .../jsp/tagext/tagextrainfo/build.xml | 47 - .../{URLClient.java => URLClientIT.java} | 68 +- .../jsp/tagext/tagfileinfo/build.xml | 51 - .../{URLClient.java => URLClientIT.java} | 95 +- .../jsp/tagext/taginfo/build.xml | 51 - .../{URLClient.java => URLClientIT.java} | 92 +- .../jsp/tagext/taglibraryinfo/build.xml | 51 - .../{URLClient.java => URLClientIT.java} | 61 +- .../jsp/tagext/taglibraryvalidator/build.xml | 47 - .../{URLClient.java => URLClientIT.java} | 86 +- .../jsp/tagext/tagsupport/build.xml | 55 - .../{URLClient.java => URLClientIT.java} | 72 +- .../jsp/tagext/tagvariableinfo/build.xml | 49 - .../{URLClient.java => URLClientIT.java} | 60 +- .../jsp/tagext/trycatchfinally/build.xml | 49 - .../{URLClient.java => URLClientIT.java} | 63 +- .../jsp/tagext/variableinfo/build.xml | 42 - .../jsp/common/client/AbstractUrlClient.java | 86 +- .../implementation/sun/common/SunRIURL.java | 93 ++ .../{URLClient.java => URLClientIT.java} | 72 +- .../{URLClient.java => URLClientIT.java} | 111 +- .../elevaluation/jsp_config_eleval23.ear | Bin 2008 -> 0 bytes .../elevaluation/jsp_config_eleval23_web.war | Bin 1387 -> 0 bytes .../{URLClient.java => URLClientIT.java} | 55 +- .../{URLClient.java => URLClientIT.java} | 62 +- .../{URLClient.java => URLClientIT.java} | 60 +- .../{URLClient.java => URLClientIT.java} | 83 +- .../xml/{URLClient.java => URLClientIT.java} | 54 +- .../{URLClient.java => URLClientIT.java} | 90 +- .../body/{URLClient.java => URLClientIT.java} | 64 +- .../{URLClient.java => URLClientIT.java} | 58 +- .../{URLClient.java => URLClientIT.java} | 101 +- .../{URLClient.java => URLClientIT.java} | 76 +- .../{URLClient.java => URLClientIT.java} | 56 +- .../actions/forward/URLClient.java | 164 -- .../actions/forward/URLClientIT.java | 209 +++ .../{URLClient.java => URLClientIT.java} | 59 +- .../{URLClient.java => URLClientIT.java} | 102 +- .../{URLClient.java => URLClientIT.java} | 99 +- .../{URLClient.java => URLClientIT.java} | 97 +- .../{URLClient.java => URLClientIT.java} | 70 +- .../{URLClient.java => URLClientIT.java} | 94 +- .../root/{URLClient.java => URLClientIT.java} | 73 +- .../{URLClient.java => URLClientIT.java} | 55 +- .../{URLClient.java => URLClientIT.java} | 144 +- .../text/{URLClient.java => URLClientIT.java} | 62 +- .../{URLClient.java => URLClientIT.java} | 105 +- .../{URLClient.java => URLClientIT.java} | 62 +- .../directives/include/URLClient.java | 86 -- .../directives/include/URLClientIT.java | 105 ++ .../page/{URLClient.java => URLClientIT.java} | 234 ++- .../{URLClient.java => URLClientIT.java} | 54 +- .../{URLClient.java => URLClientIT.java} | 87 +- .../{URLClient.java => URLClientIT.java} | 56 +- .../el/{URLClient.java => URLClientIT.java} | 127 +- .../scripting/escaping/URLClient.java | 73 - .../scripting/escaping/URLClientIT.java | 84 + .../{URLClient.java => URLClientIT.java} | 63 +- .../scripting/scriptlet/URLClient.java | 75 - .../scripting/scriptlet/URLClientIT.java | 90 ++ .../jsp/{URLClient.java => URLClientIT.java} | 83 +- .../{URLClient.java => URLClientIT.java} | 81 +- .../i18n/{URLClient.java => URLClientIT.java} | 91 +- .../{URLClient.java => URLClientIT.java} | 71 +- .../{URLClient.java => URLClientIT.java} | 69 +- .../{URLClient.java => URLClientIT.java} | 54 +- .../{URLClient.java => URLClientIT.java} | 103 +- .../{URLClient.java => URLClientIT.java} | 77 +- .../{URLClient.java => URLClientIT.java} | 81 +- .../{URLClient.java => URLClientIT.java} | 118 +- .../{URLClient.java => URLClientIT.java} | 71 +- .../{URLClient.java => URLClientIT.java} | 131 +- .../{URLClient.java => URLClientIT.java} | 72 +- .../{URLClient.java => URLClientIT.java} | 98 +- .../{URLClient.java => URLClientIT.java} | 80 +- .../{URLClient.java => URLClientIT.java} | 100 +- .../arrayelresolver/ArrayELResolverTest.jsp | 23 + .../WEB-INF/arrayelresolver.tld} | 30 +- .../jsp_arrayelresolver_web.xml | 0 .../beanelresolver/BeanELResolverTest.jsp | 23 + .../WEB-INF/beanelresolver.tld} | 31 +- .../beanelresolver/jsp_beanelresolver_web.xml | 0 .../CompositeELResolverTest.jsp | 23 + .../compelresolver/WEB-INF/compelresolver.tld | 33 + .../compelresolver/jsp_compelresolver_web.xml | 0 .../CreateMethodExpressionTest.jsp | 65 + .../createmethexpr/jsp_createmethexpr_web.xml | 0 .../CreateValueExpressionTest.jsp | 70 + .../createvalexpr/jsp_createvalexpr_web.xml | 0 .../jakarta_el/elresolver/ELResolverTest.jsp | 47 + .../elresolver/jsp_elresolver_web.xml | 0 .../listelresolver/ListELResolverTest.jsp | 23 + .../listelresolver/WEB-INF/listelresolver.tld | 33 + .../listelresolver/jsp_listelresolver_web.xml | 0 .../mapelresolver/MapELResolverTest.jsp | 23 + .../mapelresolver/WEB-INF/mapelresolver.tld | 33 + .../mapelresolver/jsp_mapelresolver_web.xml | 0 .../jakarta_el/methodinfo/MethodInfoTest.jsp | 27 + .../methodinfo/WEB-INF/methodinfo.tld | 55 + .../methodinfo/jsp_methodinfo_web.xml | 0 .../ResourceBundleELResolverTest.jsp | 23 + .../WEB-INF/resourcebundleelresolver.tld | 33 + .../jsp_resourcebundleelresolver_web.xml | 0 .../valexpression/ValueExpressionTest.jsp | 24 + .../valexpression/WEB-INF/valexpression.tld | 54 + .../valexpression/jsp_valexpr_web.xml | 0 .../jsp/el/elexception/ELExceptionTest.jsp | 159 ++ .../jsp/el/elexception/jsp_elexc_web.xml | 0 .../elparseexception/ELParseExceptionTest.jsp | 64 + .../elparseexception/jsp_elparseexc_web.xml | 25 + .../jsp/el/expression/ExpressionTest.jsp | 134 ++ .../jsp/el/expression/jsp_expr_web.xml | 25 + .../ExpressionEvaluatorTest.jsp | 227 +++ .../expressionevaluator/jsp_expreval_web.xml | 25 + .../ImplicitObjELResolverTest.jsp | 23 + .../WEB-INF/implicitobjelresolver.tld | 33 + .../jsp_implicitobjelresolver_web.xml | 25 + .../ScopedAttrELResolverTest.jsp | 23 + .../WEB-INF/scopedattrelresolver.tld | 33 + .../jsp_scopedattrelresolver_web.xml | 25 + .../variableresolver/VariableResolverTest.jsp | 97 ++ .../variableresolver/jsp_varresolver_web.xml | 25 + .../jsp/errordata/ErrorDataTest.jsp | 154 ++ .../jsp/errordata/jsp_errordata_web.xml | 0 .../AddELResolverTest.jsp | 21 + .../IllegalStateExceptionTest.jsp | 52 + .../jsp_jspapplicationcontext_web.xml | 0 .../jsp/jspengineinfo/JspEngineInfoTest.jsp | 58 + .../jspengineinfo/jsp_jspengineinfo_web.xml | 0 .../jsp/jspexception/JspExceptionTest.jsp | 142 ++ .../jsp/jspexception/jsp_jspexc_web.xml | 0 .../jsp/jspfactory/JspFactoryTest.jsp | 86 ++ .../jsp/jspfactory/jsp_jspfactory_web.xml | 0 .../jsptagexception/JspTagExceptionTest.jsp | 108 ++ .../jsp/jsptagexception/jsp_jsptagexc_web.xml | 0 .../jsp/jspwriter/CloseValidator.jsp | 46 + .../jsp/jspwriter/JspWriterTest.jsp | 477 ++++++ .../jsp/jspwriter/jsp_jspwriter_web.xml | 0 .../jsp/pagecontext/ErrorPage.jsp | 47 + .../jsp/pagecontext/PageContextTest.jsp | 1375 +++++++++++++++++ .../jsp/pagecontext/Resource.jsp | 34 + .../jsp/pagecontext/jsp_pagecontext_web.xml | 0 .../SkipPageExceptionTest.jsp | 108 ++ .../skippageexception/jsp_skippageexc_web.xml | 0 .../bodycontent/BodyContentClearBodyTest.jsp | 24 + .../bodycontent/BodyContentFlushTest.jsp | 24 + .../bodycontent/BodyContentGetStringTest.jsp | 24 + .../bodycontent/BodyContentReadWriteTest.jsp | 24 + .../bodycontent/BodyContentWriteOutTest.jsp | 24 + .../bodycontent/WEB-INF/bodycontent.tld | 53 + .../bodycontent/jsp_bodycontent_web.xml | 0 .../bodytagsupport/BodyTagEmptyTagTest.jsp | 55 + .../BodyTagEvalBodyBufferedTest.jsp | 35 + .../BodyTagEvalBodyIncludeTest.jsp | 35 + .../bodytagsupport/BodyTagSkipBodyTest.jsp | 35 + .../bodytagsupport/BodyTagSupportApiTest.jsp | 109 ++ .../BodyTagSupportSynchronizationTest.jsp | 224 +++ .../bodytagsupport/GetBodyContentTest.jsp | 23 + .../bodytagsupport/GetPreviousOutTest.jsp | 24 + .../bodytagsupport/WEB-INF/bodytagsupport.tld | 81 + .../bodytagsupport/jsp_bodytagsupp_web.xml | 0 .../DynamicAttributesExceptionTest.jsp | 33 + .../SetDynamicAttributesTest.jsp | 22 + .../WEB-INF/dynamicattributes.tld | 43 + .../dynamicattributes/jsp_dynattrib_web.xml | 0 .../functioninfo/GetFunctionClassTest.jsp | 31 + .../functioninfo/GetFunctionSignatureTest.jsp | 31 + .../jsp/tagext/functioninfo/GetNameTest.jsp | 31 + .../functioninfo/WEB-INF/functioninfo.tld | 43 + .../functioninfo/jsp_functioninfo_web.xml | 0 .../jspidconsumer/MultipleJspIdTest.jsp | 25 + .../tagext/jspidconsumer/SameJspIdTest.jsp | 23 + .../jsp/tagext/jspidconsumer/SetJspIdTest.jsp | 23 + .../jspidconsumer/WEB-INF/jspidconsumer.tld | 57 + .../jspidconsumer/jsp_jspidconsumer_web.xml | 0 .../tagext/pagedata/PageDataTagFileTest.jsp | 21 + .../jsp/tagext/pagedata/PageDataTest.jsp | 38 + .../jsp/tagext/pagedata/WEB-INF/pagedata.tld | 47 + .../pagedata/WEB-INF/pagedatatagfile.tld | 47 + .../WEB-INF/tags/pageDataTagFileTest.tag | 39 + .../tagext/pagedata/WEB-INF/tags/template.txt | 1 + .../jsp/tagext/pagedata/jsp_pagedata_web.xml | 0 .../jsp/tagext/pagedata/template.txt | 1 + .../SimpleTagSupportDoTagDefault.jsp | 24 + .../SimpleTagSupportFindAncestorTest.jsp | 30 + .../SimpleTagSupportJspBodyTest.jsp | 22 + .../SimpleTagSupportJspContextTest.jsp | 22 + .../SimpleTagSupportParentTest.jsp | 24 + .../SimpleTagSupportSkipPageClassicTest.jsp | 23 + .../SimpleTagSupportSkipPageSimpleTest.jsp | 23 + ...eTagSupportVariableSynchronizationTest.jsp | 87 ++ .../WEB-INF/simpletagsupport.tld | 135 ++ .../simpletagsupport/ClassicSkipPageTag.tag | 21 + .../simpletagsupport/SimpleSkipPageTag.tag | 21 + .../WEB-INF/tags/simpletagsupport/Sync.tag | 56 + .../simpletagsupport/emptySetJspBodyTest.jsp | 22 + .../jspFragmentGetJspContextTest.jsp | 29 + .../jsp_simtagsupport_web.xml | 0 .../tagext/simpletagsupport/noParentTest.jsp | 22 + .../simpletagsupport/tagHandlerCacheTest.jsp | 26 + .../jsp/tagext/tagadapter/TagAdapterTest.jsp | 213 +++ .../tagadapter/TagAdapterValidationTest.jsp | 23 + .../tagext/tagadapter/WEB-INF/tagadapter.tld | 37 + .../tagext/tagadapter/jsp_tagadapter_web.xml | 0 .../tagattributeinfo/CanBeRequestTimeTest.jsp | 31 + .../tagattributeinfo/GetIdAttribute.jsp | 31 + .../tagext/tagattributeinfo/GetNameTest.jsp | 31 + .../tagattributeinfo/GetTypeNameTest.jsp | 31 + .../tagattributeinfo/IsFragmentTest.jsp | 31 + .../tagattributeinfo/IsRequiredTest.jsp | 31 + .../tagext/tagattributeinfo/ToStringTest.jsp | 31 + .../WEB-INF/tagattributeinfo.tld | 47 + .../tagattributeinfo/jsp_tagattrinfo_web.xml | 0 .../jsp/tagext/tagdata/ConstructorTest.jsp | 32 + .../tagext/tagdata/GetAttributeStringTest.jsp | 31 + .../jsp/tagext/tagdata/GetAttributeTest.jsp | 38 + .../jsp/tagext/tagdata/GetAttributesTest.jsp | 31 + .../jsp/tagext/tagdata/SetAttributeTest.jsp | 31 + .../jsp/tagext/tagdata/WEB-INF/tagdata.tld | 57 + .../jsp/tagext/tagdata/jsp_tagdata_web.xml | 0 .../TagExtraInfoDefaultImplTest.jsp | 31 + .../TagExtraInfoEmptyReturnTest.jsp | 31 + .../TagExtraInfoNonEmptyReturnTest.jsp | 31 + .../TagExtraInfoNullReturnTest.jsp | 31 + .../tagextrainfo/WEB-INF/tagextrainfo.tld | 37 + .../tagextrainfo/jsp_tagextrainfo_web.xml | 0 .../jsp/tagext/tagfileinfo/GetNameTest.jsp | 30 + .../jsp/tagext/tagfileinfo/GetPathTest.jsp | 30 + .../jsp/tagext/tagfileinfo/GetTagInfoTest.jsp | 30 + .../tagfileinfo/WEB-INF/tagfileinfo.tld | 41 + .../WEB-INF/tags/tagfileinfo/TagFile1.tag | 24 + .../tagfileinfo/jsp_tagfileinfo_web.xml | 0 .../jsp/tagext/taginfo/GetAttributesTest.jsp | 31 + .../jsp/tagext/taginfo/GetBodyContentTest.jsp | 31 + .../jsp/tagext/taginfo/GetDisplayNameTest.jsp | 31 + .../jsp/tagext/taginfo/GetInfoStringTest.jsp | 31 + .../jsp/tagext/taginfo/GetLargeIconTest.jsp | 31 + .../jsp/tagext/taginfo/GetSmallIconTest.jsp | 31 + .../tagext/taginfo/GetTagClassNameTest.jsp | 31 + .../tagext/taginfo/GetTagExtraInfoTest.jsp | 31 + .../jsp/tagext/taginfo/GetTagLibraryTest.jsp | 31 + .../jsp/tagext/taginfo/GetTagNameTest.jsp | 31 + .../taginfo/GetTagVariableInfosTest.jsp | 31 + .../taginfo/HasDynamicAttributesTest.jsp | 31 + .../tagext/taginfo/SetTagExtraInfoTest.jsp | 31 + .../jsp/tagext/taginfo/SetTagLibraryTest.jsp | 31 + .../jsp/tagext/taginfo/WEB-INF/taginfo.tld | 56 + .../jsp/tagext/taginfo/jsp_taginfo_web.xml | 0 .../tagext/taglibraryinfo/GetFunctionTest.jsp | 31 + .../taglibraryinfo/GetFunctionsTest.jsp | 31 + .../taglibraryinfo/GetInfoStringTest.jsp | 31 + .../taglibraryinfo/GetPrefixStringTest.jsp | 31 + .../taglibraryinfo/GetReliableURNTest.jsp | 31 + .../taglibraryinfo/GetRequiredVersionTest.jsp | 31 + .../taglibraryinfo/GetShortNameTest.jsp | 31 + .../tagext/taglibraryinfo/GetTagFileTest.jsp | 31 + .../tagext/taglibraryinfo/GetTagFilesTest.jsp | 31 + .../taglibraryinfo/GetTagLibraryInfosTest.jsp | 33 + .../jsp/tagext/taglibraryinfo/GetTagTest.jsp | 31 + .../jsp/tagext/taglibraryinfo/GetTagsTest.jsp | 31 + .../jsp/tagext/taglibraryinfo/GetURITest.jsp | 31 + .../taglibraryinfo/WEB-INF/taglibinfo.tld | 67 + .../taglibraryinfo/WEB-INF/taglibinfo2.tld | 67 + .../WEB-INF/tags/taglibinfo/TagFile1.tag | 19 + .../WEB-INF/tags/taglibinfo/TagFile2.tag | 19 + .../taglibraryinfo/jsp_taglibinfo_web.xml | 0 .../TLVTranslationErrorTest.jsp | 22 + .../TagLibraryValidatorTest.jsp | 33 + .../WEB-INF/taglibvalfail.tld | 32 + .../WEB-INF/taglibvalidator.tld | 36 + .../jsp_taglibvalidator_web.xml | 0 .../DoAfterBodyEvalBodyAgainTest.jsp | 36 + .../tagsupport/DoAfterBodySkipBodyTest.jsp | 36 + .../tagsupport/DoEndTagEvalPageTest.jsp | 44 + .../tagsupport/DoEndTagSkipPageTest.jsp | 28 + .../tagsupport/DoStartEvalBodyIncludeTest.jsp | 39 + .../tagext/tagsupport/DoStartSkipBodyTest.jsp | 34 + .../tagext/tagsupport/FindAncestorTest.jsp | 26 + .../tagext/tagsupport/MethodValidation.jsp | 28 + .../tagsupport/TagInitializationTest.jsp | 24 + .../tagext/tagsupport/TagSupportApiTest.jsp | 164 ++ .../TagSupportSynchronizationTest.jsp | 129 ++ .../tagext/tagsupport/WEB-INF/tagsupport.tld | 129 ++ .../tagext/tagsupport/jsp_tagsupport_web.xml | 0 .../tagvariableinfo/GetClassNameTest.jsp | 32 + .../tagext/tagvariableinfo/GetDeclareTest.jsp | 32 + .../GetNameFromAttributeTest.jsp | 32 + .../tagvariableinfo/GetNameGivenTest.jsp | 32 + .../tagext/tagvariableinfo/GetScopeTest.jsp | 32 + .../tagvariableinfo/WEB-INF/tagvarinfo.tld | 59 + .../tagvariableinfo/jsp_tagvarinfo_web.xml | 0 .../trycatchfinally/TryCatchFinallyTest.jsp | 47 + .../WEB-INF/trycatchfinally.tld | 42 + .../trycatchfinally/jsp_tcfinally_web.xml | 0 .../tagext/variableinfo/VariableInfoTest.jsp | 150 ++ .../tagext/variableinfo/jsp_varinfo_web.xml | 0 .../WEB-INF/config_charsequence.tld | 38 + ...dSyntaxAllowedAsLiteralFalseActionTest.jsp | 25 + ...xAllowedAsLiteralFalseTemplateTextTest.jsp | 22 + ...redSyntaxAllowedAsLiteralTrueActionTest.gf | 1 + ...edSyntaxAllowedAsLiteralTrueActionTest.jsp | 25 + ...taxAllowedAsLiteralTrueTemplateTextTest.gf | 1 + ...axAllowedAsLiteralTrueTemplateTextTest.jsp | 22 + .../jsp_config_charsequence_web.xml | 49 + ...ferredSyntaxAllowedAsLiteralActionTest.jsp | 25 + ...SyntaxAllowedAsLiteralTemplateTextTest.jsp | 22 + .../elevaluation/compat13/ElCompatTest.jsp | 21 + .../elconffalse/ElEvaluationTest.jsp | 21 + .../elconffalsex/ElEvaluationTest.jspx | 25 + .../elconftrue/ElEvaluationTest.jsp | 21 + .../elconftruex/ElEvaluationTest.jspx | 25 + .../elpagefalse/ElEvaluationTest.jsp | 21 + .../elpagefalsex/ElEvaluationTest.jspx | 26 + .../elpagetrue/ElEvaluationTest.jsp | 21 + .../elpagetruex/ElEvaluationTest.jspx | 26 + .../elunspec/ElEvaluationTest.jsp | 21 + .../elunspecx/ElEvaluationTest.jspx | 25 + .../elevaluation/jsp_config_eleval23_web.xml | 26 + .../elevaluation/jsp_config_eleval_web.xml | 82 + .../DifferentEncodingSpecifiedTest.jsp | 19 + .../DifferentEncodingSpecifiedTest.jspx | 26 + .../encoding/NoEncodingSpecifiedTest.jsp | 19 + .../encoding/SameEncodingSpecifiedTest.jsp | 19 + .../encoding/jsp_config_encode_web.xml | 36 + .../jsp/spec/configuration/general/coda1.jsp} | 9 +- .../jsp/spec/configuration/general/coda2.jsp} | 9 +- .../jsp/spec/configuration/general/coda3.jsp} | 9 +- .../general/identical/willSee.jsp | 21 + .../general/jsp_config_general_web.xml | 75 + .../general/mostSpecific/page/willSee.jsp | 26 + .../spec/configuration/general/prelude1.jsp | 19 + .../spec/configuration/general/prelude2.jsp | 19 + .../spec/configuration/general/prelude3.jsp | 19 + .../general/specific/svr/page/willSee.jsp | 21 + .../general/specific/svr/willNotSee.jsp | 21 + .../configuration/includes/IncludesTest.jsp | 21 + .../includes/WEB-INF/jspf/coda1.jspf | 18 + .../includes/WEB-INF/jspf/coda2.jspf | 18 + .../includes/WEB-INF/jspf/coda3.jspf | 18 + .../includes/WEB-INF/jspf/prelude1.jspf | 18 + .../includes/WEB-INF/jspf/prelude2.jspf | 18 + .../includes/WEB-INF/jspf/prelude3.jspf | 18 + .../includes/jsp_config_includes_web.xml | 45 + .../includes/three/Includes3Test.jspx | 26 + .../includes/two/Includes2Test.jsp | 21 + .../configuration/scripting/WEB-INF/tag.tld | 36 + .../scripting/jsp_config_scr_web.xml | 64 + .../scripting/scrfalse/DeclarationTest.jsp | 21 + .../scripting/scrfalse/ExpressionTest.jsp | 20 + .../scripting/scrfalse/ScriptletTest.jsp | 20 + .../scripting/scrfalsex/DeclarationTest.jspx | 25 + .../scripting/scrfalsex/ExpressionTest.jspx | 24 + .../scripting/scrfalsex/ScriptletTest.jspx | 24 + .../scrtrue/AttributeExpressionTest.jsp | 22 + .../scripting/scrtrue/DeclarationTest.jsp | 21 + .../scripting/scrtrue/ExpressionTest.jsp | 20 + .../scripting/scrtrue/ScriptletTest.jsp | 20 + .../scrtruex/AttributeExpressionTest.jspx | 24 + .../scripting/scrtruex/DeclarationTest.jspx | 25 + .../scripting/scrtruex/ExpressionTest.jspx | 24 + .../scripting/scrtruex/ScriptletTest.jspx | 24 + .../scripting/scrunspec/DeclarationTest.jsp | 21 + .../scripting/scrunspec/ExpressionTest.jsp | 20 + .../scripting/scrunspec/ScriptletTest.jsp | 20 + .../scripting/scrunspecx/DeclarationTest.jspx | 25 + .../scripting/scrunspecx/ExpressionTest.jspx | 24 + .../scripting/scrunspecx/ScriptletTest.jspx | 24 + .../configuration/xml/jsp_config_xml_web.xml | 38 + .../configuration/xml/unspec/NonXmlTest.jsp | 20 + .../configuration/xml/xmlfalse/NonXmlTest.jsp | 20 + .../configuration/xml/xmltrue/XmlJspTest.xsp | 23 + .../JspAttributeDuplicatedAttributeTest.jsp | 31 + .../attribute/JspAttributeDynamicTest1.jsp | 32 + .../attribute/JspAttributeDynamicTest2.jsp | 32 + .../JspAttributeElementInteractionTest.jspx | 29 + .../attribute/JspAttributeEmptyBodyTest.jsp | 28 + .../JspAttributeFragmentNonScrBodyTest1.jsp | 26 + .../JspAttributeFragmentNonScrBodyTest2.jsp | 26 + .../JspAttributeFragmentNonScrBodyTest3.jsp | 26 + .../JspAttributeFragmentNonScrBodyTest4.jsp | 26 + .../JspAttributeFragmentNonScrBodyTest5.jsp | 26 + .../JspAttributeFragmentNonScrBodyTest6.jsp | 26 + .../attribute/JspAttributeFragmentTest.jsp | 32 + .../JspAttributeNameReqAttributeTest.jsp | 26 + .../JspAttributeNoAttributeFoundTest.jsp | 24 + .../attribute/JspAttributeQNameTest1.jsp | 25 + .../attribute/JspAttributeQNameTest2.jsp | 25 + .../attribute/JspAttributeQNameTest3.jspx | 25 + .../attribute/JspAttributeQNameTest4.jsp | 25 + .../actions/attribute/JspAttributeRtTest.jsp | 182 +++ .../attribute/JspAttributeTrimTest.jsp | 57 + .../JspAttributeUsageContextTest1.jsp | 29 + .../JspAttributeUsageContextTest2.jspx | 29 + .../JspAttributeUsageContextTest3.jsp | 32 + .../actions/attribute/WEB-INF/attribute.tld | 156 ++ .../attribute/jsp_core_act_attribute_web.xml | 31 + .../actions/body/JspBodyEmptyBodyTest.jsp | 58 + .../core_syntax/actions/body/JspBodyTest.jsp | 44 + .../actions/body/JspBodyUsageContextTest1.jsp | 26 + .../actions/body/JspBodyUsageContextTest2.jsp | 28 + .../actions/body/JspBodyUsageContextTest3.jsp | 28 + .../actions/body/JspBodyUsageContextTest4.jsp | 30 + .../actions/body/JspBodyUsageContextTest5.jsp | 29 + .../core_syntax/actions/body/WEB-INF/body.tld | 60 + .../actions/body/jsp_core_act_body_web.xml | 31 + .../JspDeclarationUsageContextTest1.jsp | 27 + .../JspDeclarationUsageContextTest2.jspx | 28 + .../JspDeclarationUsageContextTest3.jsp | 21 + .../JspDeclarationUsageContextTest4.jspx | 23 + .../WEB-INF/tags/JspDeclarationTag1.tag | 27 + .../WEB-INF/tags/JspDeclarationTag2.tagx | 28 + .../declaration/jsp_core_act_decl_web.xml | 25 + .../JspDoBodyInvalidApplicationScopeTest.jsp | 24 + .../dobody/JspDoBodyInvalidPageScopeTest.jsp | 24 + .../JspDoBodyInvalidRequestScopeTest.jsp | 24 + .../dobody/JspDoBodyInvalidScopeTest.jsp | 24 + .../JspDoBodyInvalidSessionScopeTest.jsp | 24 + .../dobody/JspDoBodyJspAttributeTest.jsp | 24 + .../JspDoBodyNoVarVarReaderScopeTest.jsp | 24 + .../dobody/JspDoBodyNonEmptyBodyTest1.jsp | 24 + .../dobody/JspDoBodyNonEmptyBodyTest2.jsp | 24 + .../actions/dobody/JspDoBodyScopeTest.jsp | 66 + .../dobody/JspDoBodyUsageContextTest1.jsp | 21 + .../dobody/JspDoBodyUsageContextTest2.jspx | 22 + .../dobody/JspDoBodyUsageContextTest3.jsp | 30 + .../actions/dobody/JspDoBodyVarReaderTest.jsp | 63 + .../actions/dobody/JspDoBodyVarTest.jsp | 44 + .../dobody/JspDoBodyVarVarReaderTest.jsp | 24 + .../WEB-INF/tags/DoBodyAttributeTag.tag | 71 + .../tags/DoBodyInvalidApplicationScopeTag.tag | 19 + .../tags/DoBodyInvalidPageScopeTag.tag | 19 + .../tags/DoBodyInvalidRequestScopeTag.tag | 19 + .../WEB-INF/tags/DoBodyInvalidScopeTag.tag | 19 + .../tags/DoBodyInvalidSessionScopeTag.tag | 19 + .../tags/DoBodyNoVarVarReaderScopeTag.tag | 19 + .../WEB-INF/tags/DoBodyNonEmptyBodyTag1.tag | 21 + .../WEB-INF/tags/DoBodyNonEmptyBodyTag2.tag | 21 + .../dobody/WEB-INF/tags/DoBodyScopeTag.tag | 53 + .../WEB-INF/tags/DoBodyUsageContextTagA.tag | 19 + .../WEB-INF/tags/DoBodyUsageContextTagB.tagx | 22 + .../WEB-INF/tags/DoBodyVarReaderTag.tag | 19 + .../dobody/WEB-INF/tags/DoBodyVarTag.tag | 19 + .../WEB-INF/tags/DoBodyVarVarReaderTag.tag | 19 + .../dobody/jsp_core_act_dobody_web.xml | 25 + .../JspElementDynamicAttributeTest1.jsp | 22 + .../JspElementDynamicAttributeTest2.jspx | 25 + .../JspElementDynamicAttributeTest3.jsp | 22 + .../element/JspElementJspAttributeTest1.jsp | 23 + .../element/JspElementJspAttributeTest2.jspx | 27 + .../element/JspElementJspAttributeTest3.jsp | 21 + .../element/JspElementJspBodyTest1.jsp | 23 + .../element/JspElementJspBodyTest2.jspx | 26 + .../element/JspElementJspBodyTest3.jsp | 22 + .../JspElementNameReqAttributeTest1.jsp | 23 + .../JspElementNameReqAttributeTest2.jspx | 23 + .../JspElementNameReqAttributeTest3.jsp | 22 + .../actions/element/JspElementTest1.jsp | 22 + .../actions/element/JspElementTest2.jspx | 29 + .../actions/element/JspElementTest3.jsp | 22 + .../WEB-INF/tags/JspElementDynAttrTag.tag | 20 + .../tags/JspElementJspAttributeTag.tag | 21 + .../WEB-INF/tags/JspElementJspBodyTag.tag | 21 + .../element/WEB-INF/tags/JspElementTag.tag | 20 + .../element/WEB-INF/tags/NameAttrTag.tag | 19 + .../element/jsp_core_act_element_web.xml | 25 + .../JspExpressionUsageContextTest1.jsp | 20 + .../JspExpressionUsageContextTest2.jspx | 23 + .../JspExpressionUsageContextTest3.jsp | 21 + .../JspExpressionUsageContextTest4.jspx | 23 + .../WEB-INF/tags/JspExpressionTag1.tag | 19 + .../WEB-INF/tags/JspExpressionTag2.tagx | 20 + .../expression/jsp_core_act_expr_web.xml | 25 + .../forward/flushedBufferForwardTest.jsp | 20 + .../forward/flushedBufferForwardTest1.jsp | 21 + .../flushedBufferForwardTest_error.jsp | 29 + .../actions/forward/forwardcommon.html | 6 + .../actions/forward/forwardcommon.jsp | 24 + .../forward/jsp_coresyntx_act_forward_web.xml | 25 + .../forward/positiveForwardCtxRelative.gf | 6 + .../forward/positiveForwardCtxRelative.jsp | 36 + .../forward/positiveForwardCtxRelativeHtml.gf | 6 + .../positiveForwardCtxRelativeHtml.jsp | 30 + .../forward/positiveForwardPageRelative.gf | 6 + .../forward/positiveForwardPageRelative.jsp | 34 + .../positiveForwardPageRelativeHtml.gf | 6 + .../positiveForwardPageRelativeHtml.jsp | 31 + .../forward/positiveRequestAttrCtxRelative.gf | 6 + .../positiveRequestAttrCtxRelative.jsp | 32 + .../positiveRequestAttrPageRelative.gf | 6 + .../positiveRequestAttrPageRelative.jsp | 30 + .../forward/unbufferedWriteForwardTest.jsp | 22 + .../unbufferedWriteForwardTest_error.jsp | 29 + .../jsp_coresyntx_act_getproperty_web.xml | 25 + .../getproperty/nullPropertyValueTest.jsp | 30 + .../actions/getproperty/positiveGetProps.gf | 9 + .../actions/getproperty/positiveGetProps.jsp | 32 + .../spec/core_syntax/actions/include/C.jsp | 20 + .../actions/include/dynamicDynamic_A.jsp | 21 + .../actions/include/dynamicStatic_A.jsp | 21 + .../actions/include/forwardtarget.html | 6 + .../core_syntax/actions/include/include/C.jsp | 20 + .../actions/include/include/dynamic_B.jsp | 21 + .../actions/include/include/include2.jsp | 24 + .../include/includeMappedServlet.html} | 10 +- .../include/include/includeMappedServlet.jsp | 23 + .../actions/include/include/static_B.jsp | 21 + .../include/includeMappedServletTest.jsp | 23 + .../actions/include/includecommon.html | 6 + .../actions/include/includecommon.jsp | 24 + .../actions/include/includeforward.jsp | 19 + .../include/jsp_coresyntx_act_include_web.xml | 40 + .../include/positiveIncludeCtxRelative.gf | 13 + .../include/positiveIncludeCtxRelative.jsp | 33 + .../include/positiveIncludeCtxRelativeHtml.gf | 14 + .../positiveIncludeCtxRelativeHtml.jsp | 31 + .../actions/include/positiveIncludeForward.gf | 6 + .../include/positiveIncludeForward.jsp | 21 + .../include/positiveIncludePageRelative.gf | 13 + .../include/positiveIncludePageRelative.jsp | 33 + .../include/positiveIncludePageRelative2.gf | 13 + .../include/positiveIncludePageRelative2.jsp | 33 + .../positiveIncludePageRelativeHtml.gf | 14 + .../positiveIncludePageRelativeHtml.jsp | 32 + .../include/positiveRequestAttrCtxRelative.gf | 15 + .../positiveRequestAttrCtxRelative.jsp | 32 + .../positiveRequestAttrPageRelative.gf | 14 + .../positiveRequestAttrPageRelative.jsp | 30 + .../actions/include/staticDynamic_A.jsp | 21 + .../actions/include/staticStatic_A.jsp | 21 + .../JspInvokeFragmentReqAttributeTest.jsp | 26 + .../JspInvokeInvalidApplicationScopeTest.jsp | 26 + .../invoke/JspInvokeInvalidPageScopeTest.jsp | 26 + .../JspInvokeInvalidRequestScopeTest.jsp | 26 + .../invoke/JspInvokeInvalidScopeTest.jsp | 26 + .../JspInvokeInvalidSessionScopeTest.jsp | 26 + .../invoke/JspInvokeJspAttributeTest.jsp | 60 + .../JspInvokeNoVarVarReaderScopeTest.jsp | 27 + .../invoke/JspInvokeNonEmptyBodyTest.jsp | 26 + .../invoke/JspInvokeNotInSessionTest.jsp | 46 + .../actions/invoke/JspInvokeScopeTest.jsp | 68 + .../invoke/JspInvokeUsageContextTest1.jsp | 26 + .../invoke/JspInvokeUsageContextTest2.jspx | 27 + .../invoke/JspInvokeUsageContextTest3.jsp | 33 + .../actions/invoke/JspInvokeVarReaderTest.jsp | 65 + .../actions/invoke/JspInvokeVarTest.jsp | 49 + .../invoke/JspInvokeVarVarReaderTest.jsp | 27 + .../WEB-INF/tags/FragmentReqAttributeTag.tag | 21 + .../tags/InvalidApplicationScopeTag.tag | 21 + .../WEB-INF/tags/InvalidPageScopeTag.tag | 21 + .../WEB-INF/tags/InvalidRequestScopeTag.tag | 21 + .../invoke/WEB-INF/tags/InvalidScopeTag.tag | 21 + .../WEB-INF/tags/InvalidSessionScopeTag.tag | 21 + .../invoke/WEB-INF/tags/JspAttributeTag.tag | 43 + .../tags/JspInvokeUsageContextTag3a.tag | 21 + .../tags/JspInvokeUsageContextTag3b.tagx | 24 + .../WEB-INF/tags/JspInvokeVarReaderTag.tag | 21 + .../invoke/WEB-INF/tags/JspInvokeVarTag.tag | 21 + .../WEB-INF/tags/NoVarVarReaderScopeTag.tag | 21 + .../invoke/WEB-INF/tags/NonEmptyBodyTag.tag | 23 + .../invoke/WEB-INF/tags/NotInSessionTag.tag | 21 + .../actions/invoke/WEB-INF/tags/ScopeTag.tag | 55 + .../invoke/WEB-INF/tags/VarVarReaderTag.tag | 21 + .../WEB-INF/tags/jspFragmentNullTest.tag | 20 + .../actions/invoke/jspFragmentNullTest.jsp | 22 + .../invoke/jsp_core_act_invoke_web.xml | 25 + .../actions/output/JspOutputBodyTest1.jspx | 25 + .../actions/output/JspOutputBodyTest2.jsp | 21 + .../JspOutputJspRootOmitDeclDefaultTest.jspx | 24 + .../JspOutputOmitDeclDefaultTagTest.jsp | 22 + .../output/JspOutputOmitDeclDefaultTest.jspx | 23 + .../JspOutputOmitDeclValidValuesTest1.jspx | 23 + .../JspOutputOmitDeclValidValuesTest2.jspx | 23 + .../JspOutputOmitDeclValidValuesTest3.jspx | 23 + .../JspOutputOmitDeclValidValuesTest4.jspx | 23 + .../JspOutputOmitDeclValidValuesTest5.jsp | 21 + .../JspOutputOmitDeclValidValuesTest6.jsp | 21 + .../JspOutputOmitDeclValidValuesTest7.jsp | 21 + .../JspOutputOmitDeclValidValuesTest8.jsp | 21 + .../output/JspOutputUsageContextTest1.jsp | 20 + .../output/JspOutputUsageContextTest2.jsp | 23 + .../output/JspOutputUsageContextTest3.jspx | 23 + .../output/JspOutputUsageContextTest4.jsp | 23 + .../output/WEB-INF/tags/JspOutputBodyTag.tagx | 24 + .../WEB-INF/tags/JspOutputDefaultTag.tagx | 22 + .../tags/JspOutputOmitDeclFalseTag.tagx | 22 + .../WEB-INF/tags/JspOutputOmitDeclNoTag.tagx | 22 + .../tags/JspOutputOmitDeclTrueTag.tagx | 22 + .../WEB-INF/tags/JspOutputOmitDeclYesTag.tagx | 22 + .../output/WEB-INF/tags/JspOutputUsageTag.tag | 19 + .../WEB-INF/tags/JspOutputUsageXMLTag.tagx | 22 + .../output/doctypeSystemPublicTest.jspx | 27 + .../actions/output/doctypeSystemTest.jspx | 27 + .../output/jsp_core_act_output_web.xml | 25 + .../negativeDoctypePublicNoSystemTest.jspx | 26 + .../output/negativeDoctypeRootNoSystem.jspx | 26 + .../output/negativeDoctypeSystemNoRoot.jspx | 26 + .../output/negativeMultipleDoctypeTest.jspx | 30 + .../actions/output/simpleDefaultTest.jspx | 20 + .../actions/param/JspParamAttributesTest.jsp | 44 + .../actions/param/JspParamForwardTest.jsp | 28 + .../actions/param/JspParamIncludeTest.jsp | 55 + .../param/JspParamNameElValuesTest.jsp | 28 + .../param/JspParamNameRtValuesTest.jsp | 28 + .../param/JspParamNoNameAttributeTest.jsp | 25 + .../param/JspParamNoValueAttributeTest.jsp | 25 + .../param/JspParamUsageContextTest1.jsp | 22 + .../param/JspParamUsageContextTest2.jsp | 24 + .../param/JspParamUsageContextTest3.jsp | 25 + .../param/JspParamUsageContextTest4.jsp | 26 + .../core_syntax/actions/param/Resource.jsp | 60 + .../actions/param/WEB-INF/simple.tld | 31 + .../actions/param/jsp_core_act_param_web.xml | 31 + .../actions/plugin/JspFallbackBodyTest.jsp | 27 + .../plugin/JspFallbackUsageContextTest.jsp | 21 + .../actions/plugin/JspParamsBodyTest.jsp | 33 + .../plugin/JspParamsUsageContextTest.jsp | 26 + .../JspPluginAlignElAttributeValueTest.jsp | 23 + .../JspPluginAlignRtAttributeValueTest.jsp | 23 + .../actions/plugin/JspPluginAppletTest.jsp | 32 + .../JspPluginArchiveElAttributeValueTest.jsp | 23 + .../JspPluginArchiveRtAttributeValueTest.jsp | 23 + .../actions/plugin/JspPluginBeanTest.jsp | 32 + .../JspPluginCodeBaseElAttributeValueTest.jsp | 23 + .../JspPluginCodeBaseReqAttributeTest.jsp | 23 + .../JspPluginCodeBaseRtAttributeValueTest.jsp | 23 + .../JspPluginCodeElAttributeValueTest.jsp | 22 + .../plugin/JspPluginCodeReqAttributeTest.jsp | 23 + .../JspPluginCodeRtAttributeValueTest.jsp | 22 + .../JspPluginHeightElAttributeValueTest.jsp | 23 + .../JspPluginHeightRtAttributeValueTest.jsp | 23 + .../JspPluginHspaceElAttributeValueTest.jsp | 23 + .../JspPluginHspaceRtAttributeValueTest.jsp | 23 + ...pPluginIePluginUrlElAttributeValueTest.jsp | 23 + ...pPluginIePluginUrlRtAttributeValueTest.jsp | 23 + .../plugin/JspPluginInvalidTypeTest.jsp | 24 + ...spPluginJreversionElAttributeValueTest.jsp | 23 + ...spPluginJreversionRtAttributeValueTest.jsp | 23 + .../plugin/JspPluginJspAttributeTest.jsp | 46 + .../JspPluginJspParamsNoParametersTest.jsp | 28 + .../JspPluginNameElAttributeValueTest.jsp | 23 + .../JspPluginNameRtAttributeValueTest.jsp | 23 + ...pPluginNsPluginUrlElAttributeValueTest.jsp | 23 + ...pPluginNsPluginUrlRtAttributeValueTest.jsp | 23 + .../JspPluginTypeElAttributeValueTest.jsp | 23 + .../JspPluginTypeRtAttributeValueTest.jsp | 22 + .../JspPluginVspaceElAttributeValueTest.jsp | 23 + .../JspPluginVspaceRtAttributeValueTest.jsp | 23 + .../JspPluginWidthElAttributeValueTest.jsp | 23 + .../JspPluginWidthRtAttributeValueTest.jsp | 23 + .../plugin/jsp_core_act_plugin_web.xml | 25 + .../actions/root/JspRootJspBodyTest1.jspx | 25 + .../actions/root/JspRootJspBodyTest2.jsp | 21 + .../actions/root/JspRootUsageContextTest1.jsp | 21 + .../root/JspRootUsageContextTest2.jspx | 22 + .../actions/root/JspRootUsageContextTest3.jsp | 22 + .../actions/root/JspRootUsageContextTest4.jsp | 22 + ...spRootVersionAttrAllowableValuesTest1.jspx | 23 + ...spRootVersionAttrAllowableValuesTest2.jspx | 23 + .../JspRootVersionAttrInvalidValueTest1.jspx | 23 + .../JspRootVersionAttrInvalidValueTest2.jsp | 21 + .../root/JspRootVersionReqAttrTest1.jspx | 23 + .../root/JspRootVersionReqAttrTest2.jsp | 21 + .../root/WEB-INF/tags/JspRootJspBodyTag.tagx | 24 + .../WEB-INF/tags/JspRootUsageContextTag1.tagx | 22 + .../WEB-INF/tags/JspRootUsageContextTag2.tag | 21 + .../tags/JspRootVersionInvalidValueTag.tagx | 22 + .../tags/JspRootVersionReqAttrTag.tagx | 22 + .../actions/root/jsp_core_act_root_web.xml | 26 + .../JspScriptletUsageContextTest1.jsp | 20 + .../JspScriptletUsageContextTest2.jspx | 23 + .../JspScriptletUsageContextTest3.jsp | 21 + .../JspScriptletUsageContextTest4.jspx | 22 + .../WEB-INF/tags/JspScriptletTag1.tag | 19 + .../WEB-INF/tags/JspScriptletTag2.tagx | 22 + .../scriptlet/jsp_core_act_scr_web.xml | 25 + .../actions/setproperty/Errorpage.jsp | 24 + .../jsp_coresyntx_act_setproperty_web.xml | 25 + .../setproperty/positiveBeanPropertyEditor.gf | 20 + .../positiveBeanPropertyEditor.jsp | 43 + .../setproperty/positiveSetBooleanObj.gf | 11 + .../setproperty/positiveSetBooleanObj.jsp | 32 + .../setproperty/positiveSetBooleanPrim.gf | 11 + .../setproperty/positiveSetBooleanPrim.jsp | 32 + .../actions/setproperty/positiveSetByteObj.gf | 11 + .../setproperty/positiveSetByteObj.jsp | 32 + .../setproperty/positiveSetBytePrim.gf | 11 + .../setproperty/positiveSetBytePrim.jsp | 32 + .../actions/setproperty/positiveSetCharObj.gf | 11 + .../setproperty/positiveSetCharObj.jsp | 32 + .../setproperty/positiveSetCharPrim.gf | 11 + .../setproperty/positiveSetCharPrim.jsp | 32 + .../setproperty/positiveSetDoubleObj.gf | 11 + .../setproperty/positiveSetDoubleObj.jsp | 32 + .../setproperty/positiveSetDoublePrim.gf | 11 + .../setproperty/positiveSetDoublePrim.jsp | 32 + .../setproperty/positiveSetFloatObj.gf | 11 + .../setproperty/positiveSetFloatObj.jsp | 32 + .../setproperty/positiveSetFloatPrim.gf | 11 + .../setproperty/positiveSetFloatPrim.jsp | 32 + .../setproperty/positiveSetIndexedProp.gf | 48 + .../setproperty/positiveSetIndexedProp.jsp | 226 +++ .../actions/setproperty/positiveSetIntObj.gf | 11 + .../actions/setproperty/positiveSetIntObj.jsp | 32 + .../actions/setproperty/positiveSetIntPrim.gf | 11 + .../setproperty/positiveSetIntPrim.jsp | 32 + .../actions/setproperty/positiveSetLongObj.gf | 11 + .../setproperty/positiveSetLongObj.jsp | 32 + .../setproperty/positiveSetLongPrim.gf | 11 + .../setproperty/positiveSetLongPrim.jsp | 32 + .../actions/setproperty/positiveSetPropAll.gf | 14 + .../setproperty/positiveSetPropAll.jsp | 39 + .../setproperty/positiveSetPropNoParam.gf | 14 + .../setproperty/positiveSetPropNoParam.jsp | 41 + .../setproperty/positiveSetPropParam.gf | 12 + .../setproperty/positiveSetPropParam.jsp | 38 + .../positiveSetPropReqTimeDoubleQuotes.gf | 11 + .../positiveSetPropReqTimeDoubleQuotes.jsp | 33 + .../positiveSetPropReqTimeSingleQuotes.gf | 11 + .../positiveSetPropReqTimeSingleQuotes.jsp | 33 + .../setproperty/positiveSetPropValue.gf | 12 + .../setproperty/positiveSetPropValue.jsp | 37 + .../text/JspTextBodyRestrictionsTest1.jsp | 28 + .../text/JspTextBodyRestrictionsTest2.jsp | 28 + .../text/JspTextBodyRestrictionsTest3.jsp | 32 + .../text/JspTextBodyRestrictionsTest4.jsp | 28 + .../text/JspTextBodyRestrictionsTest5.jspx | 31 + .../actions/text/JspTextUsageContextTest1.jsp | 24 + .../text/JspTextUsageContextTest2.jspx | 27 + .../actions/text/JspTextUsageContextTest3.jsp | 21 + .../actions/text/WEB-INF/tags/JspTextTag.tag | 22 + .../actions/text/jsp_core_act_text_web.xml | 25 + .../actions/usebean/ScopeResult.jsp | 75 + .../spec/core_syntax/actions/usebean/date.ser | Bin 0 -> 46 bytes .../actions/usebean/defaultScope.jsp | 36 + .../core_syntax/actions/usebean/errorPage.jsp | 28 + .../usebean/jsp_coresyntx_act_usebean_web.xml | 25 + .../usebean/negativeClassCastException.gf | 10 + .../usebean/negativeClassCastException.jsp | 36 + .../usebean/negativeClassCastExceptionFwd.jsp | 32 + ...gativeDuplicateIDFatalTranslationError.jsp | 32 + .../actions/usebean/negativeInvalidScope.jsp | 31 + ...ativeSessionScopeFatalTranslationError.jsp | 37 + .../usebean/negativeTypeAssignable.jsp | 30 + .../positiveApplicationScopedObject.jsp | 28 + .../actions/usebean/positiveBeanNameType.gf | 11 + .../actions/usebean/positiveBeanNameType.jsp | 38 + .../usebean/positiveBeanNameTypeCast.gf | 11 + .../usebean/positiveBeanNameTypeCast.jsp | 39 + .../actions/usebean/positiveBodyNew.gf | 12 + .../actions/usebean/positiveBodyNew.jsp | 36 + .../actions/usebean/positiveClassTypeCast.gf | 10 + .../actions/usebean/positiveClassTypeCast.jsp | 32 + .../actions/usebean/positiveNoBody.gf | 9 + .../actions/usebean/positiveNoBody.jsp | 31 + .../usebean/positivePageScopedObject.jsp | 28 + .../usebean/positiveRequestScopedObject.jsp | 28 + .../usebean/positiveSessionScopedObject.jsp | 28 + .../actions/usebean/requestTimeBeanName.jsp | 33 + .../actions/usebean/serBeanName.jsp | 33 + .../usebean2/WEB-INF/tags/beanBody.tag | 20 + .../actions/usebean2/blockSCopeTest.jsp | 33 + .../actions/usebean2/existingWithBodyTest.jsp | 24 + .../usebean2/existingWithBodyTestInclude.jsp | 25 + .../actions/usebean2/inScriptlessTest.jsp | 27 + .../jsp_coresyntx_act_usebean2_web.xml | 33 + .../usebean2/noClassNoBeanNameTest.jsp | 32 + .../actions/usebean2/unrestrictedBodyTest.jsp | 31 + .../usebean2/unrestrictedBodyTestInclude.jsp | 19 + .../directives/include/includecommon.jsp | 25 + .../jsp_coresyntx_direct_include_web.xml | 25 + .../positiveIncludeCtxRelativeDirective.gf | 16 + .../positiveIncludeCtxRelativeDirective.jsp | 34 + .../positiveIncludePageRelativeDirective.gf | 16 + .../positiveIncludePageRelativeDirective.jsp | 34 + ...dSyntaxAllowedAsLiteralFalseActionTest.jsp | 29 + ...xAllowedAsLiteralFalseTemplateTextTest.jsp | 28 + ...redSyntaxAllowedAsLiteralTrueActionTest.gf | 1 + ...edSyntaxAllowedAsLiteralTrueActionTest.jsp | 28 + ...taxAllowedAsLiteralTrueTemplateTextTest.gf | 1 + ...axAllowedAsLiteralTrueTemplateTextTest.jsp | 28 + .../page/ErrorOnELNotFoundFalseTest.jsp | 28 + .../page/ErrorOnELNotFoundTrueTest.jsp | 28 + .../page/FatalTranslationErrorPage.jsp | 32 + .../page/IsELIgnoredFalseActionTest.gf | 2 + .../page/IsELIgnoredFalseActionTest.jsp | 33 + .../IsELIgnoredFalseTemplateTextDollarTest.gf | 3 + ...IsELIgnoredFalseTemplateTextDollarTest.jsp | 33 + .../IsELIgnoredFalseTemplateTextPoundTest.jsp | 35 + .../page/IsELIgnoredTrueActionTest.gf | 2 + .../page/IsELIgnoredTrueActionTest.jsp | 33 + .../page/IsELIgnoredTrueTemplateTextTest.gf | 4 + .../page/IsELIgnoredTrueTemplateTextTest.jsp | 35 + .../page/WEB-INF/deferredsyntaxaction.tld | 37 + .../page/WEB-INF/iselignoredaction.tld | 60 + .../directives/page/duplicateErrorPage.jsp | 26 + .../page/errorPageExceptionAttributeTest.jsp | 22 + .../errorPageExceptionAttributeTestError.jsp | 36 + .../directives/page/errorpagedefault.jsp | 28 + .../core_syntax/directives/page/implicit.jsp | 27 + .../directives/page/implicitImportHttp.gf | 14 + .../directives/page/implicitImportHttp.jsp | 45 + .../directives/page/implicitImportJsp.gf | 16 + .../directives/page/implicitImportJsp.jsp | 44 + .../directives/page/implicitImportLang.gf | 15 + .../directives/page/implicitImportLang.jsp | 46 + .../directives/page/implicitImportServlet.gf | 6 + .../directives/page/implicitImportServlet.jsp | 46 + .../page/jsp_coresyntx_directive_page_web.xml | 29 + .../directives/page/myerrorpage.jsp | 27 + .../directives/page/negativeBuffAutoflush.jsp | 29 + .../page/negativeBufferOverflowException.gf | 5 + .../page/negativeBufferOverflowException.jsp | 39 + .../directives/page/negativeBufferSuffix.jsp | 25 + .../directives/page/negativeBufferSuffix2.jsp | 22 + ...uplicateAutoFlushFatalTranslationError.jsp | 29 + ...plicateAutoFlushFatalTranslationError2.jsp | 30 + ...veDuplicateBufferFatalTranslationError.jsp | 29 + ...eDuplicateBufferFatalTranslationError2.jsp | 30 + ...eDuplicateContentFatalTranslationError.jsp | 32 + ...DuplicateContentFatalTranslationError2.jsp | 33 + ...uplicateErrorPageFatalTranslationError.jsp | 29 + ...plicateErrorPageFatalTranslationError2.jsp | 30 + ...eDuplicateExtendsFatalTranslationError.jsp | 29 + ...DuplicateExtendsFatalTranslationError2.jsp | 30 + ...tiveDuplicateInfoFatalTranslationError.jsp | 29 + ...iveDuplicateInfoFatalTranslationError2.jsp | 30 + ...licateIsELIgnoredFatalTranslationError.jsp | 29 + ...icateIsELIgnoredFatalTranslationError2.jsp | 30 + ...licateIsErrorPageFatalTranslationError.jsp | 29 + ...icateIsErrorPageFatalTranslationError2.jsp | 30 + ...icateIsThreadSafeFatalTranslationError.jsp | 29 + ...cateIsThreadSafeFatalTranslationError2.jsp | 30 + ...DuplicateLanguageFatalTranslationError.jsp | 29 + ...uplicateLanguageFatalTranslationError2.jsp | 30 + ...eDuplicateSessionFatalTranslationError.jsp | 29 + ...DuplicateSessionFatalTranslationError2.jsp | 30 + .../page/negativeFatalTranslationError.jsp | 37 + .../directives/page/negativeImportIo.jsp | 33 + .../directives/page/negativeImportUtil.jsp | 33 + .../page/negativeMultiplePageEncoding.jsp | 30 + .../negativeSessionFatalTranslationError.jsp | 35 + .../directives/page/positiveBuffAutoflush.jsp | 32 + .../directives/page/positiveBuffCreate.jsp | 32 + .../directives/page/positiveContenttype.jsp | 32 + .../page/positiveDefaultIsErrorPage.jsp | 31 + .../page/positiveDuplicateAutoFlush.jsp | 31 + .../page/positiveDuplicateBuffer.jsp | 31 + .../page/positiveDuplicateContent.jsp | 34 + .../page/positiveDuplicateErrorPage.jsp | 31 + .../page/positiveDuplicateExtends.jsp | 31 + .../directives/page/positiveDuplicateInfo.jsp | 31 + .../page/positiveDuplicateIsELIgnored.jsp | 31 + .../page/positiveDuplicateIsErrorPage.jsp | 31 + .../page/positiveDuplicateIsThreadSafe.jsp | 31 + .../page/positiveDuplicateLanguage.jsp | 31 + .../page/positiveDuplicateSession.jsp | 31 + .../directives/page/positiveErrorPage.gf | 11 + .../directives/page/positiveErrorPage.jsp | 33 + .../directives/page/positiveExtends.gf | 8 + .../directives/page/positiveExtends.jsp | 31 + .../directives/page/positiveImport.gf | 12 + .../directives/page/positiveImport.jsp | 38 + .../directives/page/positiveInfo.gf | 10 + .../directives/page/positiveInfo.jsp | 32 + .../directives/page/positiveLang.gf | 9 + .../directives/page/positiveLang.jsp | 32 + .../page/positiveMultipleImport.jsp | 29 + .../page/positiveNoErrorPageBuff.gf | 6 + .../directives/page/positiveSession.jsp | 33 + .../page/positiveSessionDefault.jsp | 32 + .../directives/page/willNotSee.jsp | 21 + .../directives/taglib/WEB-INF/common.tld | 35 + .../jsp_core_syntx_direct_taglib_web.xml | 31 + .../directives/taglib/positiveTagLib.jsp | 25 + .../core_syntax/implicitobjects/Errorpage.jsp | 27 + .../implicitobjects/checkApplication.gf | 10 + .../implicitobjects/checkApplication.jsp | 38 + .../implicitobjects/checkConfig.gf | 11 + .../implicitobjects/checkConfig.jsp | 36 + .../implicitobjects/checkException.gf | 9 + .../implicitobjects/checkException.jsp | 42 + .../core_syntax/implicitobjects/checkOut.gf | 8 + .../core_syntax/implicitobjects/checkOut.jsp | 30 + .../core_syntax/implicitobjects/checkPage.gf | 9 + .../core_syntax/implicitobjects/checkPage.jsp | 33 + .../implicitobjects/checkPageContext.gf | 10 + .../implicitobjects/checkPageContext.jsp | 39 + .../implicitobjects/checkRequest.gf | 19 + .../implicitobjects/checkRequest.jsp | 41 + .../implicitobjects/checkResponse.gf | 9 + .../implicitobjects/checkResponse.jsp | 34 + .../implicitobjects/checkSession.gf | 12 + .../implicitobjects/checkSession.jsp | 39 + .../jsp_coresyntx_implicitobjects_web.xml | 46 + .../jsp_coresyntx_script_declaration_web.xml | 25 + .../declaration/positiveDeclaration.gf | 10 + .../declaration/positiveDeclaration.jsp | 71 + .../declaration/positiveDeclaration.jspx | 27 + .../scripting/el/ELTernaryOperatorTest.jsp | 30 + .../scripting/el/ElAttributeSearchTest.jsp | 38 + .../scripting/el/ElBinaryOperators1Test.jsp | 188 +++ .../scripting/el/ElBinaryOperators2Test.jsp | 101 ++ .../scripting/el/ElBinaryOperators3Test.jsp | 105 ++ .../scripting/el/ElBinaryOperators4Test.jsp | 47 + .../scripting/el/ElBooleanCoercionTest.jsp | 45 + .../scripting/el/ElBooleanLiteralTest.jsp | 26 + .../scripting/el/ElCharacterCoercionTest.jsp | 69 + .../scripting/el/ElEcmaBeanAccessTest.jsp | 35 + .../scripting/el/ElEcmaListArrayTest.jsp | 54 + .../scripting/el/ElEcmaMapTest.jsp | 37 + .../scripting/el/ElEcmaNullValuesTest.jsp | 32 + .../scripting/el/ElEmptyOperatorTest.jsp | 76 + .../el/ElFloatingPointLiteralTest.jsp | 68 + .../scripting/el/ElFunctionInvocationTest.jsp | 21 + .../scripting/el/ElFunctionNamespaceTest.jsp | 21 + .../el/ElImplicitApplicationScopeTest.jsp | 27 + .../scripting/el/ElImplicitCookieTest.jsp | 24 + .../scripting/el/ElImplicitHeaderTest.jsp | 25 + .../el/ElImplicitHeaderValuesTest.jsp | 24 + .../scripting/el/ElImplicitInitParamTest.jsp | 24 + .../el/ElImplicitPageContextTest.jsp | 24 + .../scripting/el/ElImplicitPageScopeTest.jsp | 25 + .../scripting/el/ElImplicitParamTest.jsp | 24 + .../el/ElImplicitParamValuesTest.jsp | 24 + .../el/ElImplicitRequestScopeTest.jsp | 25 + .../el/ElImplicitSessionScopeTest.jsp | 26 + .../scripting/el/ElIntegerLiteralTest.jsp | 32 + .../scripting/el/ElInvocationAndUsageTest.jsp | 47 + .../el/ElNonExistingFunctionNameTest.jsp | 21 + .../el/ElNonMatchingFunctionSignatureTest.jsp | 21 + .../el/ElNonStaticPublicFunctionTest.jsp | 21 + .../scripting/el/ElNullLiteralTest.jsp | 23 + .../scripting/el/ElNumberCoercionTest.jsp | 485 ++++++ .../scripting/el/ElOtherTypeCoercionTest.jsp | 36 + .../el/ElPrimitiveBoxedTypeConversionTest.jsp | 47 + .../el/ElRelationalOperators1Test.jsp | 143 ++ .../el/ElRelationalOperators2Test.jsp | 109 ++ .../scripting/el/ElStaticAttributeTest.jsp | 22 + .../scripting/el/ElStringCoercionTest.jsp | 59 + .../scripting/el/ElStringLiteralTest.jsp | 32 + .../scripting/el/ElUnaryOperators1Test.jsp | 79 + .../scripting/el/ElUnaryOperators2Test.jsp | 38 + .../core_syntax/scripting/el/WEB-INF/el.tld | 234 +++ .../scripting/el/WEB-INF/nonstatic.tld | 31 + .../el/elBinaryOperatorParenthesesTest.jsp | 26 + .../el/jsp_coresyntx_script_el_web.xml | 35 + .../jsp_coresyntx_script_escape_web.xml | 25 + .../escaping/positiveEscapingTest.gf | 23 + .../escaping/positiveEscapingTest.jsp | 39 + .../jsp_coresyntx_script_expressions_web.xml | 25 + .../scripting/expressions/positiveExpr.gf | 10 + .../scripting/expressions/positiveExpr.jsp | 72 + .../expressions/positiveExprComment.gf | 9 + .../expressions/positiveExprComment.jsp | 71 + .../expressions/positiveExprWhiteSpace.gf | 11 + .../expressions/positiveExprWhiteSpace.jsp | 72 + .../jsp_coresyntx_script_scriptlet_web.xml | 25 + .../scripting/scriptlet/positiveScriptlet.gf | 27 + .../scripting/scriptlet/positiveScriptlet.jsp | 108 ++ .../jsp/AllowedDynamicAttributeValueTypes.jsp | 35 + .../el/jsp/DynamicAttributeSetterMethod.jsp | 23 + .../el/jsp/ELDeferredMethodStringLiteral.jsp | 23 + .../ELDeferredMethodStringLiteralError1.jsp | 23 + .../ELDeferredMethodStringLiteralError2.jsp | 23 + .../spec/el/jsp/ELDeferredValueCoercion.jsp | 29 + .../jsp/spec/el/jsp/ImplicitELImport.jsp | 26 + .../jsp/TagLibraryPoundTranslationError.jsp | 25 + .../jsp/TemplateTextPoundTranslationError.jsp | 25 + .../tests/jsp/spec/el/jsp/WEB-INF/el_jsp.tld | 227 +++ .../tests/jsp/spec/el/jsp/jsp_el_jsp_web.xml | 25 + .../el/jsp/negativeELDeferredMethodValue.jsp | 25 + .../el/jsp/negativeELDeferredValueValue.jsp | 25 + .../el/jsp/positiveELDeferredMethodValue.jsp | 25 + .../el/jsp/positiveELDeferredValueValue.jsp | 25 + .../spec/el/language/CompositeExprEval1.jsp | 28 + .../spec/el/language/CompositeExprEval2.jsp | 27 + .../el/language/DotAndIndexOperatorsSame.jsp | 29 + .../jsp/spec/el/language/ELSyntaxEscape.jsp | 94 ++ .../el/language/LiteralExprAsMethodExpr1.jsp | 23 + .../el/language/LiteralExprAsMethodExpr2.jsp | 23 + .../jsp/spec/el/language/LiteralExprEval1.jsp | 74 + .../jsp/spec/el/language/LiteralExprEval2.jsp | 74 + .../spec/el/language/ParseOnceEvalMany.jsp | 79 + .../el/language/PoundDollarSameMeaning.jsp | 25 + .../jsp/spec/el/language/RValueCoercion1.jsp | 76 + .../jsp/spec/el/language/RValueCoercion2.jsp | 79 + .../spec/el/language/WEB-INF/el_language.tld | 92 ++ .../spec/el/language/jsp_el_language_web.xml | 25 + .../jsp/spec/i18n/I18NBadTagPageEncoding.jsp | 20 + .../tests/jsp/spec/i18n/I18NContTypeTest.jsp | 21 + .../jsp/spec/i18n/I18NIncludedContentTest.jsp | 23 + .../spec/i18n/I18NIncludedContentTest.jspx | Bin 0 -> 1036 bytes .../spec/i18n/I18NNoPageEncNoContTypeTest.jsp | 19 + .../jsp/spec/i18n/I18NPageEncContTypeTest.jsp | 21 + .../tests/jsp/spec/i18n/I18NPageEncTest.jsp | 21 + .../spec/i18n/I18NUnsupportedEncodingTest.jsp | 19 + .../i18n/I18NUnsupportedEncodingTest.jspx | 21 + ...I18NXmlPrologNonMatchingDirectiveTest.jspx | 23 + ...XmlPrologNonMatchingPropertyGroupTest.jspx | 21 + .../i18n/WEB-INF/tags/BadTagPageEncoding.tag | Bin 0 -> 1752 bytes .../ts/tests/jsp/spec/i18n/bom/UTF16BE.jsp | Bin 0 -> 1452 bytes .../bom/UTF16BadPageEncodingAttribute.jsp | Bin 0 -> 1516 bytes .../jsp/spec/i18n/bom/UTF16ConfigElement.jsp | Bin 0 -> 1452 bytes .../ts/tests/jsp/spec/i18n/bom/UTF16LE.jsp | Bin 0 -> 1452 bytes .../i18n/bom/UTF16PageEncodingAttribute.jsp | Bin 0 -> 1518 bytes .../sun/ts/tests/jsp/spec/i18n/bom/UTF8.jsp | 18 + .../jsp/spec/i18n/bom/UTF8ConfigElement.jsp | 18 + .../ts/tests/jsp/spec/i18n/inclusion_iso.txt | 1 + .../jsp/spec/i18n/inclusion_utf-16LE.jspx | Bin 0 -> 160 bytes .../ts/tests/jsp/spec/i18n/jsp_i18n_web.xml | 40 + .../spec/i18n/noprolog/I18NContTypeTest.jspx | Bin 0 -> 2030 bytes .../noprolog/I18NNoPageEncNoContTypeTest.jspx | Bin 0 -> 1888 bytes .../noprolog/I18NPageEncContTypeTest.jspx | Bin 0 -> 2076 bytes .../spec/i18n/noprolog/I18NPageEncTest.jspx | Bin 0 -> 1988 bytes .../spec/i18n/prolog/I18NContTypeTest.jspx | 1 + .../prolog/I18NNoPageEncNoContTypeTest.jspx | 1 + .../i18n/prolog/I18NPageEncContTypeTest.jspx | Bin 0 -> 2112 bytes .../jsp/spec/i18n/prolog/I18NPageEncTest.jspx | 1 + .../elements/directiveIncludeInJspPage.jsp | 24 + .../elements/directiveIncludeLocation.jspx | 33 + .../elements/directivePageInJspPage.jsp | 30 + .../spec/jspdocument/elements/included.jsp | 21 + .../spec/jspdocument/elements/included.jspx | 21 + .../jspdocument/elements/jspRootPrefix.jspx | 27 + .../elements/jsp_jspdocument_elements_web.xml | 32 + .../jspdocument/elements/negativeJspRoot.jspx | 28 + .../jspdocument/elements/notJspDocument.jspx | 27 + .../spec/jspdocument/elements/scripting.jspx | 36 + .../elements/scriptingInJspPage.jsp | 29 + .../jspdocument/general/WEB-INF/tagdep.tld | 41 + .../jspdocument/general/identifyByConfig.jsp | 26 + .../general/identifyByExtension.jspx | 27 + .../jspdocument/general/identifyByJspRoot.jsp | 31 + .../jspdocument/general/invalidPlainURI.jsp | 30 + .../general/jsp_jspdocument_general_web.xml | 45 + .../general/negativeDTDValidation.jspx | 31 + .../general/negativeWellFormedness.jspx | 28 + .../jspdocument/general/tagDependentTest.jspx | 47 + .../jsp_misc_precompilation_web.xml | 25 + .../spec/misc/precompilation/precompile.jsp | 44 + .../WEB-INF/tagext_resource_httplistener.tld | 37 + .../WEB-INF/tagext_resource_listener.tld | 47 + .../ResourceSimpleTagHandlerTest.jsp | 23 + .../ResourceSimpleTagHandlerTimingTest.jsp | 23 + .../taghandler/ResourceTagHandlerTest.jsp | 23 + .../ResourceTagHandlerTimingTest.jsp | 23 + .../WEB-INF/tagext_resource_taghandler.tld | 59 + .../WEB-INF/tags/defaultFragment.tag | 31 + .../WEB-INF/tags/defaultRequired.tag | 20 + .../WEB-INF/tags/defaultRtexprvalue.tag | 20 + .../attribute20/WEB-INF/tags/defaultType.tag | 34 + .../tags/deferredMethodMinimumJspVersion.tag | 20 + ...ferredMethodSignatureMinimumJspVersion.tag | 20 + .../tags/deferredValueMinimumJspVersion.tag | 20 + .../deferredValueTypeMinimumJspVersion.tag | 20 + .../tags/negativeFragmentRtexprvalue.tag | 22 + .../WEB-INF/tags/negativeFragmentType.tag | 22 + .../WEB-INF/tags/negativeName1.tag | 21 + .../WEB-INF/tags/negativeName1Include.tag | 21 + .../WEB-INF/tags/negativeName1Include.tagf | 19 + .../WEB-INF/tags/negativeName2.tag | 21 + .../WEB-INF/tags/negativeName2Include.tag | 21 + .../WEB-INF/tags/negativeName2Include.tagf | 19 + .../WEB-INF/tags/negativeName3.tag | 21 + .../WEB-INF/tags/negativeName3Include.tag | 21 + .../WEB-INF/tags/negativeName3Include.tagf | 20 + .../attribute20/WEB-INF/tags/negativeType.tag | 20 + .../attribute20/defaultFragment.jsp | 29 + .../attribute20/defaultRequired.jsp | 25 + .../attribute20/defaultRtexprvalue.jsp | 22 + .../directives/attribute20/defaultType.jsp | 24 + .../deferredMethodMinimumJspVersion.jsp | 21 + ...ferredMethodSignatureMinimumJspVersion.jsp | 21 + .../deferredValueMinimumJspVersion.jsp | 21 + .../deferredValueTypeMinimumJspVersion.jsp | 21 + ...jsp_tagfile_directives_attribute20_web.xml | 25 + .../negativeFragmentRtexprvalue.jsp | 27 + .../attribute20/negativeFragmentType.jsp | 25 + .../directives/attribute20/negativeName1.jsp | 26 + .../attribute20/negativeName1Include.jsp | 26 + .../directives/attribute20/negativeName2.jsp | 26 + .../attribute20/negativeName2Include.jsp | 21 + .../directives/attribute20/negativeName3.jsp | 21 + .../attribute20/negativeName3Include.jsp | 21 + .../directives/attribute20/negativeType.jsp | 24 + .../tags/bothDeferredMethodAndSignature.tag | 20 + .../bothDeferredValueTypeAndDeferredValue.tag | 20 + .../WEB-INF/tags/defaultDeferredMethod1.tag | 25 + .../WEB-INF/tags/defaultDeferredMethod2.tag | 25 + .../tags/defaultDeferredMethodSignature.tag | 54 + .../WEB-INF/tags/defaultDeferredValue1.tag | 25 + .../WEB-INF/tags/defaultDeferredValue2.tag | 25 + .../tags/deferredValueTypeNotSpecified.tag | 29 + .../attribute21/WEB-INF/tags/implicit.tld | 27 + ...onlyOneOfDeferredValueOrDeferredMethod.tag | 20 + .../bothDeferredMethodAndSignature.jsp | 27 + .../bothDeferredValueTypeAndDeferredValue.jsp | 25 + .../attribute21/defaultDeferredMethod1.jsp | 22 + .../attribute21/defaultDeferredMethod2.jsp | 22 + .../defaultDeferredMethodSignature.jsp | 26 + .../attribute21/defaultDeferredValue1.jsp | 21 + .../attribute21/defaultDeferredValue2.jsp | 21 + .../deferredValueTypeNotSpecified.jsp | 22 + ...jsp_tagfile_directives_attribute21_web.xml | 25 + ...onlyOneOfDeferredValueOrDeferredMethod.jsp | 25 + .../general/ErrorOnELNotFoundFalse.jsp | 28 + .../general/ErrorOnELNotFoundTrue.jsp | 27 + .../WEB-INF/tags/ErrorOnELNotFoundFalse.tag | 28 + .../WEB-INF/tags/ErrorOnELNotFoundTrue.tag | 27 + .../WEB-INF/tags/include/negativeInclude.tagf | 23 + .../include/positiveIncludePageRelative.tagf | 21 + .../tags/invoke/positiveTaglibInvokee.tag | 21 + .../general/WEB-INF/tags/negativeInclude.tag | 20 + .../WEB-INF/tags/negativePageDirective.tag | 20 + .../tags/positiveIncludeContextRelative.tag | 20 + .../tags/positiveIncludePageRelative.tag | 20 + .../general/WEB-INF/tags/positiveTaglib.tag | 25 + .../positiveIncludeContextRelative.tagf | 22 + .../jsp_tagfile_directives_general_web.xml | 25 + .../general/negativeAttributeDirective.jsp | 25 + .../directives/general/negativeInclude.jsp | 22 + .../general/negativePageDirective.jsp | 25 + .../general/negativeTagDirective.jsp | 24 + .../general/negativeVariableDirective.jsp | 26 + .../positiveIncludeContextRelative.jsp | 22 + .../general/positiveIncludePageRelative.jsp | 22 + .../directives/general/positiveTaglib.jsp | 22 + .../tags/deferredValueMinimumJspVersion.tag | 26 + .../WEB-INF/tags/dynamicAttributesNoUri.tag | 29 + .../tag20/WEB-INF/tags/implicitImportHttp.tag | 28 + .../tag20/WEB-INF/tags/implicitImportJsp.tag | 27 + .../tag20/WEB-INF/tags/implicitImportLang.tag | 27 + .../WEB-INF/tags/implicitImportServlet.tag | 27 + .../WEB-INF/tags/negativeBodyContent.tag | 20 + .../tags/negativeDuplicateBodyContent.tag | 21 + .../tags/negativeDuplicateDescription.tag | 21 + .../tags/negativeDuplicateDisplayName.tag | 21 + .../negativeDuplicateDynamicAttributes.tag | 21 + .../WEB-INF/tags/negativeDuplicateExample.tag | 21 + ...licateIsELIgnoredFatalTranslationError.tag | 20 + ...DuplicateLanguageFatalTranslationError.tag | 20 + .../tags/negativeDuplicateLargeIcon.tag | 21 + .../tags/negativeDuplicateSmallIcon.tag | 21 + .../tags/negativeMultiplePageEncoding.tag | 20 + .../tags/negativeUnrecognizedAttribute.tag | 24 + .../tags/positiveDuplicateAttributes.tag | 65 + .../tags/positiveDuplicateAttributes.tagf | 64 + .../tag20/WEB-INF/tags/positiveImport.tag | 25 + .../tag20/WEB-INF/tags/positiveLang.tag | 22 + .../WEB-INF/tags/positiveMultipleImport.tag | 25 + .../tag20/deferredValueMinimumJspVersion.jsp | 22 + .../tag20/dynamicAttributesNoUri.jsp | 22 + .../directives/tag20/images/16/icon.jpg | Bin 0 -> 11231 bytes .../directives/tag20/images/32/icon.jpg | Bin 0 -> 11231 bytes .../directives/tag20/implicitImportHttp.jsp | 27 + .../directives/tag20/implicitImportJsp.jsp | 27 + .../directives/tag20/implicitImportLang.jsp | 26 + .../tag20/implicitImportServlet.jsp | 27 + .../jsp_tagfile_directives_tag20_web.xml | 25 + .../directives/tag20/negativeBodyContent.jsp | 25 + .../tag20/negativeDuplicateBodyContent.jsp | 22 + .../tag20/negativeDuplicateDescription.jsp | 22 + .../tag20/negativeDuplicateDisplayName.jsp | 22 + .../negativeDuplicateDynamicAttributes.jsp | 22 + .../tag20/negativeDuplicateExample.jsp | 22 + ...licateIsELIgnoredFatalTranslationError.jsp | 27 + ...DuplicateLanguageFatalTranslationError.jsp | 25 + .../tag20/negativeDuplicateLargeIcon.jsp | 22 + .../tag20/negativeDuplicateSmallIcon.jsp | 22 + .../tag20/negativeMultiplePageEncoding.jsp | 25 + .../tag20/negativeUnrecognizedAttribute.jsp | 22 + .../tag20/positiveDuplicateAttributes.jsp | 22 + .../directives/tag20/positiveImport.jsp | 27 + .../directives/tag20/positiveLang.jsp | 26 + .../tag20/positiveMultipleImport.jsp | 25 + ...erredSyntaxAllowedAsLiteralFalseAction.jsp | 29 + ...yntaxAllowedAsLiteralFalseTemplateText.jsp | 29 + ...eferredSyntaxAllowedAsLiteralTrueAction.gf | 1 + ...ferredSyntaxAllowedAsLiteralTrueAction.jsp | 29 + ...dSyntaxAllowedAsLiteralTrueTemplateText.gf | 1 + ...SyntaxAllowedAsLiteralTrueTemplateText.jsp | 29 + ...erredSyntaxAllowedAsLiteralFalseAction.tag | 30 + ...yntaxAllowedAsLiteralFalseTemplateText.tag | 29 + ...ferredSyntaxAllowedAsLiteralTrueAction.tag | 29 + ...SyntaxAllowedAsLiteralTrueTemplateText.tag | 29 + .../WEB-INF/tags/DeferredSyntaxAsLiteral.tag | 23 + .../tag21/WEB-INF/tags/implicit.tld | 27 + .../jsp_tagfile_directives_tag21_web.xml | 25 + .../variable/WEB-INF/tags/falseDeclare.tag | 29 + .../variable/WEB-INF/tags/falseDeclare2.tag | 22 + .../tags/negativeAliasAttributeSame.tag | 23 + .../negativeAliasAttributeSameInclude.tag | 23 + .../negativeAliasAttributeSameInclude.tagf | 19 + .../WEB-INF/tags/negativeAliasNameGiven.tag | 22 + .../negativeNameFromAttributeNoAttribute.tag | 23 + .../negativeNameFromAttributeNotRequired.tag | 22 + .../negativeNameFromAttributeNotString.tag | 23 + .../tags/negativeNameFromAttributeRtexpr.tag | 22 + .../tags/negativeNameFromAttributeSame.tag | 23 + .../negativeNameFromAttributeSameInclude.tag | 23 + .../negativeNameFromAttributeSameInclude.tagf | 20 + .../WEB-INF/tags/negativeNameGivenBoth.tag | 23 + .../WEB-INF/tags/negativeNameGivenDynamic.tag | 22 + .../tags/negativeNameGivenDynamicInclude.tag | 22 + .../tags/negativeNameGivenDynamicInclude.tagf | 20 + .../WEB-INF/tags/negativeNameGivenNeither.tag | 22 + .../WEB-INF/tags/negativeNameGivenSame.tag | 22 + .../tags/negativeNameGivenSameInclude.tag | 22 + .../tags/negativeNameGivenSameInclude.tagf | 19 + .../variable/WEB-INF/tags/positiveDeclare.tag | 27 + .../WEB-INF/tags/positiveDeclare2.tag | 22 + .../WEB-INF/tags/positiveVariableClass.tag | 25 + .../variable/WEB-INF/tags/syncAtBegin.tag | 31 + .../tags/syncAtBeginNameFromAttribute.tag | 38 + .../variable/WEB-INF/tags/syncAtEnd.tag | 31 + .../variable/WEB-INF/tags/syncNested.tag | 31 + .../WEB-INF/tags/syncRemoveAtBegin.tag | 31 + .../variable/WEB-INF/tags/syncRemoveAtEnd.tag | 31 + .../WEB-INF/tags/syncRemoveNested.tag | 31 + .../directives/variable/falseDeclareTest.jsp | 28 + .../jsp_tagfiles_directives_variable_web.xml | 25 + .../variable/negativeAliasAttributeSame.jsp | 26 + .../negativeAliasAttributeSameInclude.jsp | 26 + .../variable/negativeAliasNameGiven.jsp | 26 + .../negativeNameFromAttributeNoAttribute.jsp | 26 + .../negativeNameFromAttributeNotRequired.jsp | 26 + .../negativeNameFromAttributeNotString.jsp | 23 + .../negativeNameFromAttributeRtexpr.jsp | 27 + .../negativeNameFromAttributeSame.jsp | 26 + .../negativeNameFromAttributeSameInclude.jsp | 26 + .../variable/negativeNameGivenBoth.jsp | 26 + .../variable/negativeNameGivenDynamic.jsp | 26 + .../negativeNameGivenDynamicInclude.jsp | 26 + .../variable/negativeNameGivenNeither.jsp | 26 + .../variable/negativeNameGivenSame.jsp | 26 + .../variable/negativeNameGivenSameInclude.jsp | 26 + .../directives/variable/positiveDeclare.jsp | 27 + .../variable/positiveVariableClass.jsp | 32 + .../directives/variable/syncAtBegin.jsp | 30 + .../variable/syncAtBeginNameFromAttribute.jsp | 33 + .../directives/variable/syncAtEnd.jsp | 30 + .../directives/variable/syncNested.jsp | 30 + .../directives/variable/syncRemoveAtBegin.jsp | 30 + .../directives/variable/syncRemoveAtEnd.jsp | 30 + .../directives/variable/syncRemoveNested.jsp | 30 + .../WEB-INF/tags/checkApplication.tag | 21 + .../WEB-INF/tags/checkConfig.tag | 22 + .../WEB-INF/tags/checkJspContext.tag | 25 + .../WEB-INF/tags/checkOut.tag} | 10 +- .../WEB-INF/tags/checkRequest.tag | 23 + .../WEB-INF/tags/checkResponse.tag | 23 + .../WEB-INF/tags/checkSession.tag | 22 + .../implicitobjects/checkApplication.jsp | 22 + .../tagfiles/implicitobjects/checkConfig.jsp | 22 + .../implicitobjects/checkJspContext.jsp | 22 + .../tagfiles/implicitobjects/checkOut.jsp | 22 + .../tagfiles/implicitobjects/checkRequest.jsp | 22 + .../implicitobjects/checkResponse.jsp | 22 + .../tagfiles/implicitobjects/checkSession.jsp | 25 + .../jsp_tagfiles_implicitobjects_web.xml | 46 + .../jsp/spec/tagfiles/packaging/IgnoreTag.tag | 19 + .../ImplicitTldAdditionalElements.jsp | 22 + .../ImplicitTldDefaultJspVersion.jsp | 22 + .../ImplicitTldMinimumJspVersion.jsp | 22 + .../packaging/ImplicitTldReservedName20.jsp | 22 + .../packaging/ImplicitTldReservedName21.jsp | 22 + .../JspTagFilePackagedJarIgnoredTagTest.jsp | 21 + .../packaging/JspTagFilePackagedJarTest.jsp | 21 + .../packaging/JspTagFilePackagedWarTest.jsp | 24 + .../JspTagFilePackagedWarTldTest.jsp | 22 + .../jsp/spec/tagfiles/packaging/Tag1.tag | 19 + .../TldImplicitTldJspVersionNotMatch.jsp | 29 + .../spec/tagfiles/packaging/WEB-INF/tag.tld | 36 + .../packaging/WEB-INF/tags/WebTag1.tag | 19 + .../WEB-INF/tags/badtldversion/WebTag1.tag | 19 + .../WEB-INF/tags/badtldversion/implicit.tld | 27 + .../tags/defaultjspversion/WebTag1.tag | 22 + .../packaging/WEB-INF/tags/dir/WebTag1.tag | 19 + .../DeferredSyntaxAsLiteral.tag | 23 + .../tags/reservedname20/ImplicitTld20.tag | 29 + .../WEB-INF/tags/reservedname20/implicit.tld | 27 + .../DeferredSyntaxAsLiteral.tag | 23 + .../tags/reservedname21/ImplicitTld21.tag | 31 + .../WEB-INF/tags/reservedname21/implicit.tld | 27 + .../tags/toomanytldelements/WebTag1.tag | 19 + .../tags/toomanytldelements/implicit.tld | 32 + .../WEB-INF/tags/versionnotmatch/WebTag1.tag | 19 + .../WEB-INF/tags/versionnotmatch/implicit.tld | 27 + .../spec/tagfiles/packaging/jartagfile.tld | 32 + .../packaging/jsp_tagfile_pkg_web.xml | 25 + ...pTagSemanticsAttributeNotSpecifiedTest.jsp | 27 + .../JspTagSemanticsDeclaredAttributesTest.jsp | 32 + .../JspTagSemanticsDynamicAttributesTest.jsp | 22 + .../JspTagSemanticsJspContextWrapperTest.jsp | 34 + .../semantics/JspTagSemanticsScopesTest.jsp | 167 ++ .../tagfiles/semantics/WEB-INF/mytags.tld | 41 + .../WEB-INF/tags/AttributeNotSpecifiedTag.tag | 28 + .../WEB-INF/tags/DeclaredAttributesTag.tag | 36 + .../WEB-INF/tags/DynamicAttributesTag.tag | 30 + .../tags/JspContextWrapperScopesTag.tag | 69 + .../WEB-INF/tags/JspContextWrapperTag.tag | 53 + .../tags/semanticsInvokeClassicTag.tag | 22 + .../WEB-INF/tags/semanticsInvokeSimpleTag.tag | 22 + .../WEB-INF/tags/semanticsJspForward.tag | 21 + .../semantics/jsp_tagfile_semantics_web.xml | 25 + .../semantics/semanticsInvokeClassicTag.jsp | 22 + .../semantics/semanticsInvokeSimpleTag.jsp | 22 + .../semantics/semanticsJspForward.jsp | 22 + .../semantics/semanticsJspForwardTarget.jsp | 20 + .../TldExplicitWebXmlPrecedenceTest.jsp | 27 + .../jsp/spec/tldres/TldResPath11Test.jsp | 29 + .../tldres/TldResPathAbsUriNotFoundTest.jsp | 27 + .../TldResPathDirectTldReferenceTest.jsp | 27 + .../tldres/TldResPathExplicitWebXmlTest.jsp | 25 + .../spec/tldres/TldResPathMultiTldTest.jsp | 30 + .../spec/tldres/TldResPathWebInfUriTest.jsp | 27 + .../ts/tests/jsp/spec/tldres/WEB-INF/a12.tld | 31 + .../jsp/spec/tldres/WEB-INF/sub/webinfsub.tld | 30 + .../jsp/spec/tldres/WEB-INF/tlds/uri.tld | 33 + .../jsp/spec/tldres/WEB-INF/webinfpres.tld | 33 + .../tests/jsp/spec/tldres/WEB-INF/webxml.tld | 35 + .../ts/tests/jsp/spec/tldres/jartagpres.tld | 33 + .../tests/jsp/spec/tldres/jsp_tldres_web.xml | 35 + .../tests/jsp/spec/tldres/listenerTldTest.jsp | 23 + .../ts/tests/jsp/spec/tldres/metainfsub.tld | 31 + .../sun/ts/tests/jsp/spec/tldres/multi1.tld | 36 + .../sun/ts/tests/jsp/spec/tldres/multi2.tld | 33 + .../jsp/spec/tldres/negativeJSPPrefix.jsp | 26 + .../tldres/negativeTaglibAfterActionTest.jsp | 24 + .../tldres/path/TldResPathRelativeUriTest.jsp | 21 + .../sun/ts/tests/jsp/spec/tldres/taglib.tld | 32 + .../spec/tldres/tld12DefaultBodyContent.jsp | 26 + 1418 files changed, 45404 insertions(+), 4887 deletions(-) create mode 100644 glassfish-runner/jsp-tck/j2ee.pass create mode 100644 glassfish-runner/jsp-tck/javajoe.pass create mode 100644 glassfish-runner/jsp-tck/pom.xml create mode 100644 glassfish-runner/jsp-tck/src/test/resources/arquillian.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/build.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/build.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/{URLClient.java => URLClientIT.java} (51%) rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/{URLClient.java => URLClientIT.java} (51%) rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/{URLClient.java => URLClientIT.java} (51%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/build.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/build.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/build.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/build.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/{URLClient.java => URLClientIT.java} (50%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/{URLClient.java => URLClientIT.java} (70%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/{URLClient.java => URLClientIT.java} (53%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/{URLClient.java => URLClientIT.java} (61%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClientIT.java delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClientIT.java rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/{URLClient.java => URLClientIT.java} (67%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/{URLClient.java => URLClientIT.java} (59%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/{URLClient.java => URLClientIT.java} (51%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/{URLClient.java => URLClientIT.java} (68%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/{URLClient.java => URLClientIT.java} (58%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/{URLClient.java => URLClientIT.java} (65%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/{URLClient.java => URLClientIT.java} (89%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/{URLClient.java => URLClientIT.java} (93%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/{URLClient.java => URLClientIT.java} (65%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/{URLClient.java => URLClientIT.java} (59%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/{URLClient.java => URLClientIT.java} (67%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/build.xml delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/{URLClient.java => URLClientIT.java} (58%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/{URLClient.java => URLClientIT.java} (59%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/{URLClient.java => URLClientIT.java} (62%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/{URLClient.java => URLClientIT.java} (57%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/{URLClient.java => URLClientIT.java} (62%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/{URLClient.java => URLClientIT.java} (74%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/{URLClient.java => URLClientIT.java} (63%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/{URLClient.java => URLClientIT.java} (59%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/{URLClient.java => URLClientIT.java} (56%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/{URLClient.java => URLClientIT.java} (56%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/{URLClient.java => URLClientIT.java} (68%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/{URLClient.java => URLClientIT.java} (67%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/{URLClient.java => URLClientIT.java} (61%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/{URLClient.java => URLClientIT.java} (73%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/{URLClient.java => URLClientIT.java} (70%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/{URLClient.java => URLClientIT.java} (51%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/build.xml rename jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/{URLClient.java => URLClientIT.java} (66%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/build.xml create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/lib/implementation/sun/common/SunRIURL.java rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/charsequence/{URLClient.java => URLClientIT.java} (63%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/{URLClient.java => URLClientIT.java} (54%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23.ear delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23_web.war rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/encoding/{URLClient.java => URLClientIT.java} (64%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/general/{URLClient.java => URLClientIT.java} (51%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/includes/{URLClient.java => URLClientIT.java} (58%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/scripting/{URLClient.java => URLClientIT.java} (55%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/xml/{URLClient.java => URLClientIT.java} (64%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/{URLClient.java => URLClientIT.java} (67%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/{URLClient.java => URLClientIT.java} (55%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/{URLClient.java => URLClientIT.java} (50%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/{URLClient.java => URLClientIT.java} (54%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/{URLClient.java => URLClientIT.java} (58%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/{URLClient.java => URLClientIT.java} (52%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClientIT.java rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/{URLClient.java => URLClientIT.java} (55%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/{URLClient.java => URLClientIT.java} (51%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/{URLClient.java => URLClientIT.java} (59%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/{URLClient.java => URLClientIT.java} (63%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/{URLClient.java => URLClientIT.java} (61%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/{URLClient.java => URLClientIT.java} (70%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/{URLClient.java => URLClientIT.java} (58%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/{URLClient.java => URLClientIT.java} (52%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/{URLClient.java => URLClientIT.java} (57%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/{URLClient.java => URLClientIT.java} (54%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/{URLClient.java => URLClientIT.java} (67%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/{URLClient.java => URLClientIT.java} (63%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClientIT.java rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/{URLClient.java => URLClientIT.java} (70%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/{URLClient.java => URLClientIT.java} (51%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/{URLClient.java => URLClientIT.java} (57%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/{URLClient.java => URLClientIT.java} (52%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/{URLClient.java => URLClientIT.java} (68%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClientIT.java rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/{URLClient.java => URLClientIT.java} (52%) delete mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClient.java create mode 100644 jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClientIT.java rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/jsp/{URLClient.java => URLClientIT.java} (71%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/language/{URLClient.java => URLClientIT.java} (68%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/i18n/{URLClient.java => URLClientIT.java} (76%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/elements/{URLClient.java => URLClientIT.java} (64%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/general/{URLClient.java => URLClientIT.java} (68%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/misc/precompilation/{URLClient.java => URLClientIT.java} (73%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/{URLClient.java => URLClientIT.java} (60%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/{URLClient.java => URLClientIT.java} (62%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/{URLClient.java => URLClientIT.java} (59%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/{URLClient.java => URLClientIT.java} (61%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/{URLClient.java => URLClientIT.java} (53%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/{URLClient.java => URLClientIT.java} (59%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/{URLClient.java => URLClientIT.java} (63%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/packaging/{URLClient.java => URLClientIT.java} (53%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/semantics/{URLClient.java => URLClientIT.java} (61%) rename jsp/src/main/java/com/sun/ts/tests/jsp/spec/tldres/{URLClient.java => URLClientIT.java} (60%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTest.jsp rename jsp/src/main/{java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/build.xml => resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/WEB-INF/arrayelresolver.tld} (50%) rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/jsp_arrayelresolver_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTest.jsp rename jsp/src/main/{java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/build.xml => resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/WEB-INF/beanelresolver.tld} (50%) rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/jsp_beanelresolver_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/WEB-INF/compelresolver.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/jsp_compelresolver_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/CreateMethodExpressionTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/jsp_createmethexpr_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/CreateValueExpressionTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/jsp_createvalexpr_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/ELResolverTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/jsp_elresolver_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/WEB-INF/listelresolver.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/jsp_listelresolver_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/WEB-INF/mapelresolver.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/jsp_mapelresolver_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/WEB-INF/methodinfo.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/jsp_methodinfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/WEB-INF/resourcebundleelresolver.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/jsp_resourcebundleelresolver_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/WEB-INF/valexpression.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/jsp_valexpr_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/ErrorDataTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/jsp_errordata_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/JspExceptionTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/jsp_jspexc_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/JspFactoryTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/jsp_jspfactory_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/CloseValidator.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/jsp_jspwriter_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/ErrorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/PageContextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/Resource.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/jsp_pagecontext_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/jsp_skippageexc_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/jsp_functioninfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/template.txt create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/jsp_tagattrinfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/ConstructorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/jsp_tagdata_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/jsp_tagfileinfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/jsp_taginfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/jsp_taglibinfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/MethodValidation.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/jsp_tagvarinfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp rename jsp/src/main/{java => resources}/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml (100%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/WEB-INF/config_charsequence.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/jsp_config_charsequence_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/compat13/ElCompatTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalse/ElEvaluationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalsex/ElEvaluationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftrue/ElEvaluationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftruex/ElEvaluationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalse/ElEvaluationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalsex/ElEvaluationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetrue/ElEvaluationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetruex/ElEvaluationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspec/ElEvaluationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspecx/ElEvaluationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/NoEncodingSpecifiedTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/SameEncodingSpecifiedTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/jsp_config_encode_web.xml rename jsp/src/main/{java/com/sun/ts/tests/jsp/api/jakarta_servlet/build.xml => resources/com/sun/ts/tests/jsp/spec/configuration/general/coda1.jsp} (77%) rename jsp/src/main/{java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/build.xml => resources/com/sun/ts/tests/jsp/spec/configuration/general/coda2.jsp} (77%) rename jsp/src/main/{java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/build.xml => resources/com/sun/ts/tests/jsp/spec/configuration/general/coda3.jsp} (76%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/identical/willSee.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/jsp_config_general_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/mostSpecific/page/willSee.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/page/willSee.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/willNotSee.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/IncludesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda1.jspf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda2.jspf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda3.jspf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude1.jspf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude2.jspf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude3.jspf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/jsp_config_includes_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/three/Includes3Test.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/two/Includes2Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/WEB-INF/tag.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/jsp_config_scr_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/DeclarationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ExpressionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ScriptletTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/DeclarationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ExpressionTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ScriptletTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/AttributeExpressionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/DeclarationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ExpressionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ScriptletTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/AttributeExpressionTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/DeclarationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ExpressionTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ScriptletTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/DeclarationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ExpressionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ScriptletTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/DeclarationTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ExpressionTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ScriptletTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/jsp_config_xml_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/unspec/NonXmlTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmlfalse/NonXmlTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmltrue/XmlJspTest.xsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDuplicatedAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeElementInteractionTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeEmptyBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest4.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest5.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest6.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNameReqAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNoAttributeFoundTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest3.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest4.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeRtTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeTrimTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/WEB-INF/attribute.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/jsp_core_act_attribute_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyEmptyBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest4.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest5.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/WEB-INF/body.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/jsp_core_act_body_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest4.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag2.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/jsp_core_act_decl_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidApplicationScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidPageScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidRequestScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidSessionScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyJspAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNoVarVarReaderScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarReaderTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarVarReaderTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyAttributeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidApplicationScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidPageScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidRequestScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidSessionScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNoVarVarReaderScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag2.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagA.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagB.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarReaderTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarVarReaderTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/jsp_core_act_dobody_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementDynAttrTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspAttributeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspBodyTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/NameAttrTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/jsp_core_act_element_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest4.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag2.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/jsp_core_act_expr_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest_error.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.html create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/jsp_coresyntx_act_forward_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest_error.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/jsp_coresyntx_act_getproperty_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/nullPropertyValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/C.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicDynamic_A.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicStatic_A.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/forwardtarget.html create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/C.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/dynamic_B.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/include2.jsp rename jsp/src/main/{java/com/sun/ts/tests/jsp/api/build.xml => resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.html} (80%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/static_B.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeMappedServletTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.html create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeforward.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/jsp_coresyntx_act_include_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticDynamic_A.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticStatic_A.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeFragmentReqAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidApplicationScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidPageScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidRequestScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidSessionScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeJspAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNoVarVarReaderScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNonEmptyBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNotInSessionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarReaderTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarVarReaderTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/FragmentReqAttributeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidApplicationScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidPageScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidRequestScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidSessionScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspAttributeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3a.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3b.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarReaderTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NoVarVarReaderScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NonEmptyBodyTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NotInSessionTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/ScopeTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/VarVarReaderTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/jspFragmentNullTest.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jspFragmentNullTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jsp_core_act_invoke_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest1.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputJspRootOmitDeclDefaultTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTagTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest1.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest3.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest4.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest5.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest6.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest7.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest8.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest3.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest4.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputBodyTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputDefaultTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclFalseTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclNoTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclTrueTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclYesTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageXMLTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemPublicTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/jsp_core_act_output_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypePublicNoSystemTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeRootNoSystem.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeSystemNoRoot.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeMultipleDoctypeTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/simpleDefaultTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamAttributesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamForwardTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamIncludeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameElValuesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameRtValuesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoNameAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoValueAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest4.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/Resource.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/WEB-INF/simple.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/jsp_core_act_param_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackUsageContextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsUsageContextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAppletTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginBeanTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseReqAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeReqAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginInvalidTypeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspParamsNoParametersTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthElAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthRtAttributeValueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest1.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest4.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest1.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest1.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest1.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootJspBodyTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag1.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag2.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionInvalidValueTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionReqAttrTag.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/jsp_core_act_root_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest4.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag2.tagx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/jsp_core_act_scr_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/Errorpage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/jsp_coresyntx_act_setproperty_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest4.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest5.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest2.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/WEB-INF/tags/JspTextTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/jsp_core_act_text_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/ScopeResult.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/date.ser create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/defaultScope.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/errorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/jsp_coresyntx_act_usebean_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastExceptionFwd.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeDuplicateIDFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeInvalidScope.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeSessionScopeFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeTypeAssignable.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveApplicationScopedObject.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positivePageScopedObject.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveRequestScopedObject.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveSessionScopedObject.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/requestTimeBeanName.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/serBeanName.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/WEB-INF/tags/beanBody.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/blockSCopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTestInclude.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/inScriptlessTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/jsp_coresyntx_act_usebean2_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/noClassNoBeanNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTestInclude.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/includecommon.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/jsp_coresyntx_direct_include_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundFalseTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundTrueTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/FatalTranslationErrorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextPoundTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/deferredsyntaxaction.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/iselignoredaction.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/duplicateErrorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTestError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorpagedefault.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicit.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/jsp_coresyntx_directive_page_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/myerrorpage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBuffAutoflush.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportIo.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportUtil.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeMultiplePageEncoding.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeSessionFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffAutoflush.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffCreate.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveContenttype.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDefaultIsErrorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateAutoFlush.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateBuffer.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateContent.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateErrorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateExtends.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateInfo.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsELIgnored.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsErrorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsThreadSafe.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateLanguage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateSession.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveMultipleImport.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveNoErrorPageBuff.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSession.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSessionDefault.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/willNotSee.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/WEB-INF/common.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/jsp_core_syntx_direct_taglib_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/positiveTagLib.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/Errorpage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/jsp_coresyntx_implicitobjects_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/jsp_coresyntx_script_declaration_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ELTernaryOperatorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElAttributeSearchTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators1Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators2Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators3Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators4Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanCoercionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanLiteralTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElCharacterCoercionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaBeanAccessTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaListArrayTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaMapTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaNullValuesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEmptyOperatorTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFloatingPointLiteralTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionInvocationTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionNamespaceTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitApplicationScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitCookieTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderValuesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitInitParamTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageContextTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamValuesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitRequestScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitSessionScopeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElIntegerLiteralTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElInvocationAndUsageTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonExistingFunctionNameTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonMatchingFunctionSignatureTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonStaticPublicFunctionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNullLiteralTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNumberCoercionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElOtherTypeCoercionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElPrimitiveBoxedTypeConversionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators1Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators2Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStaticAttributeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringCoercionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringLiteralTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators1Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators2Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/el.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/nonstatic.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/elBinaryOperatorParenthesesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/jsp_coresyntx_script_el_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/jsp_coresyntx_script_escape_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/jsp_coresyntx_script_expressions_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/jsp_coresyntx_script_scriptlet_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypes.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethod.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteral.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TagLibraryPoundTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TemplateTextPoundTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/WEB-INF/el_jsp.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/jsp_el_jsp_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredMethodValue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredValueValue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredMethodValue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredValueValue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/DotAndIndexOperatorsSame.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ELSyntaxEscape.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ParseOnceEvalMany.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaning.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/WEB-INF/el_language.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/jsp_el_language_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NBadTagPageEncoding.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NContTypeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NIncludedContentTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NIncludedContentTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NNoPageEncNoContTypeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncContTypeTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingDirectiveTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingPropertyGroupTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/WEB-INF/tags/BadTagPageEncoding.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16BE.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16BadPageEncodingAttribute.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16ConfigElement.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16LE.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16PageEncodingAttribute.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8ConfigElement.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/inclusion_iso.txt create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/inclusion_utf-16LE.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/jsp_i18n_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NContTypeTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NNoPageEncNoContTypeTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NPageEncContTypeTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NPageEncTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/prolog/I18NContTypeTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/prolog/I18NNoPageEncNoContTypeTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/prolog/I18NPageEncContTypeTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/prolog/I18NPageEncTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directiveIncludeInJspPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directiveIncludeLocation.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directivePageInJspPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jspRootPrefix.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jsp_jspdocument_elements_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/negativeJspRoot.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/notJspDocument.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scripting.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scriptingInJspPage.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/WEB-INF/tagdep.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByConfig.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByExtension.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByJspRoot.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/invalidPlainURI.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/jsp_jspdocument_general_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeDTDValidation.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeWellFormedness.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/tagDependentTest.jspx create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/jsp_misc_precompilation_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/precompile.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/WEB-INF/tagext_resource_httplistener.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/listener/WEB-INF/tagext_resource_listener.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTimingTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTimingTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/WEB-INF/tagext_resource_taghandler.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRequired.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRtexprvalue.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultType.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodMinimumJspVersion.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodSignatureMinimumJspVersion.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueMinimumJspVersion.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueTypeMinimumJspVersion.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentRtexprvalue.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentType.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeType.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultFragment.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRequired.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRtexprvalue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultType.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodMinimumJspVersion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodSignatureMinimumJspVersion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueMinimumJspVersion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueTypeMinimumJspVersion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/jsp_tagfile_directives_attribute20_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentRtexprvalue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentType.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1Include.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2Include.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3Include.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeType.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredMethodAndSignature.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredValueTypeAndDeferredValue.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod2.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethodSignature.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue2.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/deferredValueTypeNotSpecified.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/implicit.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/onlyOneOfDeferredValueOrDeferredMethod.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredMethodAndSignature.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredValueTypeAndDeferredValue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethodSignature.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue1.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue2.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/deferredValueTypeNotSpecified.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/jsp_tagfile_directives_attribute21_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/onlyOneOfDeferredValueOrDeferredMethod.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundFalse.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundTrue.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundFalse.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundTrue.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/negativeInclude.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/positiveIncludePageRelative.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/invoke/positiveTaglibInvokee.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativeInclude.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativePageDirective.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludeContextRelative.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludePageRelative.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveTaglib.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/include/positiveIncludeContextRelative.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/jsp_tagfile_directives_general_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeAttributeDirective.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeInclude.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativePageDirective.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeTagDirective.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeVariableDirective.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludeContextRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludePageRelative.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveTaglib.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/deferredValueMinimumJspVersion.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/dynamicAttributesNoUri.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportLang.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeBodyContent.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateBodyContent.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDescription.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDisplayName.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDynamicAttributes.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateExample.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateIsELIgnoredFatalTranslationError.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLanguageFatalTranslationError.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLargeIcon.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateSmallIcon.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeMultiplePageEncoding.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeUnrecognizedAttribute.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveImport.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveLang.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveMultipleImport.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/deferredValueMinimumJspVersion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/dynamicAttributesNoUri.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/images/16/icon.jpg create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/images/32/icon.jpg create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportHttp.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportLang.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/jsp_tagfile_directives_tag20_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeBodyContent.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateBodyContent.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDescription.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDisplayName.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDynamicAttributes.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateExample.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateIsELIgnoredFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLanguageFatalTranslationError.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLargeIcon.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateSmallIcon.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeMultiplePageEncoding.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeUnrecognizedAttribute.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveDuplicateAttributes.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveImport.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveLang.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveMultipleImport.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseAction.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseTemplateText.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.gf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseAction.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseTemplateText.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueAction.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueTemplateText.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAsLiteral.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/implicit.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/jsp_tagfile_directives_tag21_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare2.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSame.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasNameGiven.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNoAttribute.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotRequired.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotString.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeRtexpr.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSame.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenBoth.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamic.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenNeither.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSame.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tagf create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare2.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveVariableClass.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBegin.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBeginNameFromAttribute.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtEnd.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncNested.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtBegin.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtEnd.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveNested.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/falseDeclareTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/jsp_tagfiles_directives_variable_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSame.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSameInclude.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasNameGiven.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNoAttribute.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotRequired.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotString.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeRtexpr.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSame.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSameInclude.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenBoth.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamic.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamicInclude.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenNeither.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSame.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSameInclude.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveDeclare.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveVariableClass.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBegin.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBeginNameFromAttribute.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtEnd.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncNested.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtBegin.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtEnd.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveNested.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag rename jsp/src/main/{java/com/sun/ts/tests/jsp/api/jakarta_el/build.xml => resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag} (78%) create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkApplication.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkConfig.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkJspContext.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkOut.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkRequest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkResponse.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkSession.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/jsp_tagfiles_implicitobjects_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/IgnoreTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldAdditionalElements.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldDefaultJspVersion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldMinimumJspVersion.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName20.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName21.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarIgnoredTagTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTldTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/Tag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/TldImplicitTldJspVersionNotMatch.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tag.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/WebTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/WebTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/implicit.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/defaultjspversion/WebTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/dir/WebTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/DeferredSyntaxAsLiteral.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/ImplicitTld20.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/implicit.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/DeferredSyntaxAsLiteral.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/ImplicitTld21.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/implicit.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/WebTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/implicit.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/WebTag1.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/implicit.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jartagfile.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jsp_tagfile_pkg_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsAttributeNotSpecifiedTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDeclaredAttributesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDynamicAttributesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsJspContextWrapperTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsScopesTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/mytags.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/AttributeNotSpecifiedTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DeclaredAttributesTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DynamicAttributesTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperScopesTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeClassicTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeSimpleTag.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsJspForward.tag create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/jsp_tagfile_semantics_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeClassicTag.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeSimpleTag.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForward.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForwardTarget.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldExplicitWebXmlPrecedenceTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPath11Test.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathAbsUriNotFoundTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathDirectTldReferenceTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathExplicitWebXmlTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathMultiTldTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathWebInfUriTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/a12.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/sub/webinfsub.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/tlds/uri.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webinfpres.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webxml.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jartagpres.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jsp_tldres_web.xml create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/listenerTldTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/metainfsub.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi1.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi2.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeJSPPrefix.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeTaglibAfterActionTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/path/TldResPathRelativeUriTest.jsp create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/taglib.tld create mode 100644 jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/tld12DefaultBodyContent.jsp diff --git a/common/src/main/java/com/sun/ts/tests/common/webclient/WebTestCase.java b/common/src/main/java/com/sun/ts/tests/common/webclient/WebTestCase.java index ca8f57fdab..762f2f7176 100644 --- a/common/src/main/java/com/sun/ts/tests/common/webclient/WebTestCase.java +++ b/common/src/main/java/com/sun/ts/tests/common/webclient/WebTestCase.java @@ -20,6 +20,7 @@ package com.sun.ts.tests.common.webclient; +import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -94,6 +95,8 @@ public class WebTestCase implements TestCase { */ private String _goldenfilePath = null; + private InputStream _goldenfileStream = null; + /** * A List of strings that will be searched for in the response in the order * they appear in the list. @@ -227,6 +230,17 @@ public void setGoldenFilePath(String gfPath) { _goldenfilePath = gfPath; } + + /** + * Sets the InputStream of the goldenfile the test case should use. + * + * @param in + * an InputStream value of the goldenfile. + */ + public void setGoldenFileStream(InputStream in) { + _goldenfileStream = in; + } + /** * Sets the request that should be dispatched by this test case. * @@ -458,6 +472,15 @@ public String getGoldenfilePath() { return _goldenfilePath; } + /** + * Returns the InputStream of the goldenfile. + * + * @return InputStream of the goldenfile + */ + public InputStream getGoldenfileStream() { + return _goldenfileStream; + } + /** * Returns the state for this particular test case. * diff --git a/common/src/main/java/com/sun/ts/tests/common/webclient/validation/TokenizedValidator.java b/common/src/main/java/com/sun/ts/tests/common/webclient/validation/TokenizedValidator.java index 271740db93..b74ff95a2c 100644 --- a/common/src/main/java/com/sun/ts/tests/common/webclient/validation/TokenizedValidator.java +++ b/common/src/main/java/com/sun/ts/tests/common/webclient/validation/TokenizedValidator.java @@ -20,6 +20,7 @@ package com.sun.ts.tests.common.webclient.validation; +import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; @@ -27,6 +28,7 @@ import com.sun.ts.lib.util.TestUtil; import com.sun.ts.tests.common.webclient.Goldenfile; +import com.sun.ts.tests.common.webclient.Util; /** * 
@@ -63,7 +65,7 @@ public TokenizedValidator() {
    *           if an error occurs will processing the Goldenfile
    */
   protected boolean checkGoldenfile() throws IOException {
-    String gf;
+    String gf = null;
     String path = _case.getGoldenfilePath();
     String enc = _res.getResponseEncoding();
 
@@ -74,7 +76,13 @@ protected boolean checkGoldenfile() throws IOException {
     Goldenfile file = new Goldenfile(_case.getGoldenfilePath(), enc);
 
     try {
-      gf = file.getGoldenFileAsString();
+      File goldenFile = new File(_case.getGoldenfilePath());
+      if(goldenFile.exists()){
+        gf = file.getGoldenFileAsString();
+      }
+      else if(_case.getGoldenfileStream()!=null){
+        gf = Util.getEncodedStringFromStream(_case.getGoldenfileStream(), enc);
+      }
     } catch (IOException ioe) {
       TestUtil
           .logErr("[TokenizedValidator] Unexpected exception while accessing "
diff --git a/glassfish-runner/jsp-tck/j2ee.pass b/glassfish-runner/jsp-tck/j2ee.pass
new file mode 100644
index 0000000000..dccc3037eb
--- /dev/null
+++ b/glassfish-runner/jsp-tck/j2ee.pass
@@ -0,0 +1,17 @@
+
+#
+# Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+AS_ADMIN_USERPASSWORD=j2ee
diff --git a/glassfish-runner/jsp-tck/javajoe.pass b/glassfish-runner/jsp-tck/javajoe.pass
new file mode 100644
index 0000000000..d69a7520e5
--- /dev/null
+++ b/glassfish-runner/jsp-tck/javajoe.pass
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+AS_ADMIN_USERPASSWORD=javajoe
diff --git a/glassfish-runner/jsp-tck/pom.xml b/glassfish-runner/jsp-tck/pom.xml
new file mode 100644
index 0000000000..84fc5d9138
--- /dev/null
+++ b/glassfish-runner/jsp-tck/pom.xml
@@ -0,0 +1,327 @@
+
+
+
+    4.0.0
+
+    
+        org.glassfish
+        standalone-tck
+        10.0.0-SNAPSHOT
+        ../pom.xml
+    
+    jakarta
+    glassfish.jsp-tck
+    10.0.0-SNAPSHOT
+    jar
+
+    
+        10.0.0
+        5.9.1
+        jsp-tck
+        4.0.0
+    
+
+    
+        
+            org.junit.vintage
+            junit-vintage-engine
+            test
+        
+        
+            jakartatck
+            jsp-tck
+            10.0.0-SNAPSHOT
+        
+        
+            org.glassfish.main.common
+            simple-glassfish-api
+            ${glassfish.container.version}
+        
+        
+            org.jboss.arquillian.junit5
+            arquillian-junit5-container
+            1.7.0.Alpha10
+        
+        
+            jakarta.platform
+            jakarta.jakartaee-api
+            ${jakarta.platform.version}
+            provided
+        
+        
+            commons-httpclient
+            commons-httpclient
+            3.1
+        
+        
+            org.glassfish.hk2
+            hk2-locator
+            3.0.0
+        
+        
+            org.jboss.arquillian.container
+            arquillian-container-test-spi
+            1.7.0.Alpha10
+        
+        
+            org.omnifaces.arquillian
+            arquillian-glassfish-server-managed
+            1.2
+            test
+        
+    
+
+    
+        
+            
+                org.apache.maven.plugins
+                maven-dependency-plugin
+                3.2.0
+                
+                    
+                        unpack
+                        
+                            unpack
+                        
+                        pre-integration-test
+                        
+                            
+                                
+                                    org.glassfish.main.distributions
+                                    ${glassfish-artifact-id}
+                                    ${glassfish.container.version}
+                                    zip
+                                    true
+                                    ${project.build.directory}
+                                
+                            
+                        
+                    
+                
+            
+            
+                org.codehaus.mojo
+                exec-maven-plugin
+                
+                    
+                        1-StopDomain
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                stop-domain
+                            
+                        
+                    
+                    
+                        2-StartDomain
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                start-domain
+                            
+                        
+                    
+                    
+                        3-EnableTraceRequests
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                set
+                                server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true
+                            
+                        
+                    
+                    
+                        4-DeleteUser-j2ee
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                --passwordfile
+                                ${project.basedir}/j2ee.pass
+                                delete-file-user
+                                j2ee
+                            
+                            
+                                0
+                                1
+                            
+                        
+                    
+                    
+                        5-AddUser-j2ee
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                --passwordfile
+                                ${project.basedir}/j2ee.pass
+                                create-file-user
+                                --groups
+                                staff:mgr
+                                j2ee
+                            
+                        
+                    
+                    
+                        6-DeleteUser-javajoe
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                --passwordfile
+                                ${project.basedir}/javajoe.pass
+                                delete-file-user
+                                javajoe
+                            
+                            
+                                0
+                                1
+                            
+                        
+                    
+                    
+                        7-AddUser-javajoe
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                --passwordfile
+                                ${project.basedir}/javajoe.pass
+                                create-file-user
+                                --groups
+                                guest
+                                javajoe
+                            
+                        
+                    
+                    
+                        8-list-users
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                list-file-users
+                            
+                        
+                    
+                    
+                        9-StopDomain
+                        
+                            exec
+                        
+                        pre-integration-test
+                        
+                            ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin
+                            
+                                stop-domain
+                            
+                        
+                    
+                
+            
+            
+                maven-failsafe-plugin
+                3.0.0-M5
+                
+                    
+                        gf-tests
+                        
+                            integration-test
+                            verify
+                        
+                        
+                            
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar
+                            
+                            jakartatck:jsp-tck
+                            
+                                ${project.build.directory}/${glassfish.toplevel.dir}
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish
+                                ${project.build.directory}/${glassfish.toplevel.dir}
+                                glassfish
+                                ${webServerHome}/domains/domain1/autodeploy
+                                30
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.el.jar
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp-api.jar
+                                ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar
+                                true
+                                j2ee
+                                j2ee
+                                javajoe
+                                javajoe
+                                true
+                                true
+                                com.sun.ts.tests.jsp.lib.implementation.sun.common.SunRIURL
+                            
+                            
+                                ${project.build.directory}/${glassfish.toplevel.dir}
+                            
+                        
+                    
+                
+            
+        
+    
+
+    
+        
+            full
+            
+                true
+            
+            
+                glassfish
+            
+        
+        
+            web
+            
+                web
+            
+        
+    
+
diff --git a/glassfish-runner/jsp-tck/src/test/resources/arquillian.xml b/glassfish-runner/jsp-tck/src/test/resources/arquillian.xml
new file mode 100644
index 0000000000..4319e6ae8d
--- /dev/null
+++ b/glassfish-runner/jsp-tck/src/test/resources/arquillian.xml
@@ -0,0 +1,18 @@
+
+
+
+  
+    
+  
+
+  
+    
+        
+            target/glassfish7
+        
+    
+  
+
+
diff --git a/jsp/pom.xml b/jsp/pom.xml
index 5cdd2ed449..8b26faad43 100644
--- a/jsp/pom.xml
+++ b/jsp/pom.xml
@@ -26,12 +26,19 @@
         10.0.0-SNAPSHOT
     
 
-    jsp
+    jsp-tck
     jar
 
     JSP
     JSP
 
+    
+        1.7.0.Alpha14
+        5.9.1
+        11
+        11
+    
+
     
         
             ${project.groupId}
@@ -69,33 +76,69 @@
             jakarta.mail
             jakarta.mail-api
         
+        
+            org.junit.jupiter
+            junit-jupiter
+            ${junit.jupiter.version}
+        
+        
+            org.jboss.arquillian.junit5
+            arquillian-junit5-container
+            ${arquillian.junit}
+        
+        
+            org.jboss.arquillian.junit5
+            arquillian-junit5-core
+            ${arquillian.junit}
+        
     
 
-    
-        
-            
-                src/main/java
-                
-                    **/**.xml
-                    **/*.tld
-                
-            
-        
-        
-            
-                org.mortbay.jetty
-                tck-extract-tests-maven-plugin
-                
-                    
-                        generate-tck-tests-list
-                        
-                            extract-tck-tests
-                        
-                        process-sources
-                    
-                
-            
-        
-    
+    
+        
+            tck-build
+            
+                true
+            
+            
+                
+                    
+                        maven-compiler-plugin
+                        2.3.2
+                    
+                    
+                        maven-surefire-plugin
+                        3.0.0-M5
+                    
+                    
+                        org.apache.maven.plugins
+                        maven-jar-plugin
+                        3.2.0
+                        
+                            
+                                
+                                    src/main/java
+                                    
+                                        **/*.xml
+                                    
+                                
+                            
+                        
+                    
+                    
+                        org.apache.maven.plugins
+                        maven-source-plugin
+                        
+                            
+                                attach-sources
+                                
+                                    jar
+                                
+                            
+                        
+                    
+                
+            
+        
+    
 
 
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClient.java
deleted file mode 100644
index f4fb1ec643..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClient.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_el.arrayelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_arrayelresolver_web");
-    setTestJsp("ArrayELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: arrayElResolverTest
-   * 
-   * @assertion_ids: EL:JAVADOC:3; EL:JAVADOC:4; EL:JAVADOC:5; EL:JAVADOC:6;
-   * EL:JAVADOC:7; EL:JAVADOC:8
-   * 
-   * @test_Strategy: Obtain an ArrayELResolver via the PageContext and verify
-   * that API calls work as expected: setValue() getValue() getType()
-   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void arrayElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "arrayElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClientIT.java
new file mode 100644
index 0000000000..70f7556c5f
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/URLClientIT.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_el.arrayelresolver;
+
+import java.io.IOException;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil; 
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest; 
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_arrayelresolver_web");
+    setTestJsp("ArrayELResolverTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_arrayelresolver_web.war");
+    archive.addClasses(ArrayELResolverTag.class, JspTestUtil.class, 
+            ResolverTest.class, 
+            BarELResolver.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_arrayelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/arrayelresolver.tld", "arrayelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ArrayELResolverTest.jsp")), "ArrayELResolverTest.jsp");
+
+    return archive;
+
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: arrayElResolverTest
+   * 
+   * @assertion_ids: EL:JAVADOC:3; EL:JAVADOC:4; EL:JAVADOC:5; EL:JAVADOC:6;
+   * EL:JAVADOC:7; EL:JAVADOC:8
+   * 
+   * @test_Strategy: Obtain an ArrayELResolver via the PageContext and verify
+   * that API calls work as expected: setValue() getValue() getType()
+   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void arrayElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "arrayElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/build.xml
deleted file mode 100644
index b249b60bfa..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClient.java
deleted file mode 100644
index 6fccadf48e..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClient.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_el.beanelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_beanelresolver_web");
-    setTestJsp("BeanELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: beanElResolverTest
-   * 
-   * @assertion_ids: EL:JAVADOC:11; EL:JAVADOC:12; EL:JAVADOC:13; EL:JAVADOC:14;
-   * EL:JAVADOC:15; EL:JAVADOC:16
-   * 
-   * @test_Strategy: Obtain an BeanELResolver via the PageContext and verify
-   * that API calls work as expected: setValue() getValue() getType()
-   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void beanElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "beanElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClientIT.java
new file mode 100644
index 0000000000..31c6e8d9b4
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/URLClientIT.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_el.beanelresolver;
+
+import java.io.IOException;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_beanelresolver_web");
+    setTestJsp("BeanELResolverTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_beanelresolver_web.war");
+    archive.addClasses(BeanELResolverTag.class, SimpleBean.class,
+            JspTestUtil.class, 
+            ResolverTest.class, 
+            BarELResolver.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_beanelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/beanelresolver.tld", "beanelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BeanELResolverTest.jsp")), "BeanELResolverTest.jsp");
+
+    return archive;
+
+  }
+
+
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: beanElResolverTest
+   * 
+   * @assertion_ids: EL:JAVADOC:11; EL:JAVADOC:12; EL:JAVADOC:13; EL:JAVADOC:14;
+   * EL:JAVADOC:15; EL:JAVADOC:16
+   * 
+   * @test_Strategy: Obtain an BeanELResolver via the PageContext and verify
+   * that API calls work as expected: setValue() getValue() getType()
+   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void beanElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "beanElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/build.xml
deleted file mode 100644
index b1d1d8248a..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-    
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClient.java
deleted file mode 100644
index f0ea0e41fc..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClient.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_el.compelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_compelresolver_web");
-    setTestJsp("CompositeELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: compositeElResolverTest
-   * 
-   * @assertion_ids: EL:JAVADOC:24; EL:JAVADOC:26; EL:JAVADOC:27; EL:JAVADOC:28;
-   * EL:JAVADOC:29; EL:JAVADOC:30; EL:JAVADOC:31
-   * 
-   * @test_Strategy: Obtain a CompositeELResolver via the PageContext and verify
-   * that API calls work as expected: add() setValue() setValue() throws
-   * PropertyNotWritableException getValue() getType() isReadOnly()
-   * getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void compositeElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "compositeElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClientIT.java
new file mode 100644
index 0000000000..ece955e83f
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/URLClientIT.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_el.compelresolver;
+
+import java.io.IOException;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.InstallCompositeELResolverListener;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_compelresolver_web");
+    setTestJsp("CompositeELResolverTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_compelresolver_web.war");
+    archive.addClasses(CompositeELResolverTag.class,
+            JspTestUtil.class, 
+            InstallCompositeELResolverListener.class,
+            ResolverTest.class, 
+            BarELResolver.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_compelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/compelresolver.tld", "compelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CompositeELResolverTest.jsp")), "CompositeELResolverTest.jsp");
+    
+    return archive;
+
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: compositeElResolverTest
+   * 
+   * @assertion_ids: EL:JAVADOC:24; EL:JAVADOC:26; EL:JAVADOC:27; EL:JAVADOC:28;
+   * EL:JAVADOC:29; EL:JAVADOC:30; EL:JAVADOC:31
+   * 
+   * @test_Strategy: Obtain a CompositeELResolver via the PageContext and verify
+   * that API calls work as expected: add() setValue() setValue() throws
+   * PropertyNotWritableException getValue() getType() isReadOnly()
+   * getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void compositeElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "compositeElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/build.xml
deleted file mode 100644
index 6d95feb421..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClientIT.java
index a13a91121a..66ec1fcbcb 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,46 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_el.createmethexpr;
 
-import java.io.PrintWriter;
+import java.io.IOException;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_createmethexpr_web");
     setTestJsp("CreateMethodExpressionTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_createmethexpr_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_createmethexpr_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CreateMethodExpressionTest.jsp")), "CreateMethodExpressionTest.jsp");
+
+    return archive;
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -67,6 +72,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate the behavior of
    * ExpressionFactory.createMethodExpression().
    */
+  @Test
   public void createMethodExpressionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "createMethodExpressionTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClientIT.java
index 273e020827..d8d312a0b6 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,46 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_el.createvalexpr;
 
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_createvalexpr_web");
     setTestJsp("CreateValueExpressionTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_createvalexpr_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_createvalexpr_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CreateValueExpressionTest.jsp")), "CreateValueExpressionTest.jsp");
+
+    return archive;
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -67,6 +72,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate the behavior of
    * ExpressionFactory.createValueExpression().
    */
+  @Test
   public void createValueExpressionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "createValueExpressionTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClientIT.java
index 8f3be63d5b..312b47efeb 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,52 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_el.elresolver;
 
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_elresolver_web");
     setTestJsp("ELResolverTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elresolver_web.war");
+    archive.addClasses(JspTestUtil.class,
+            ResolverTest.class, 
+            BarELResolver.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elresolver_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELResolverTest.jsp")), "ELResolverTest.jsp");
+
+    return archive;
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -69,6 +80,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * API calls work as expected: getValue() getType() setValue() isReadOnly()
    * getCommonPropertyType() getFeatureDescriptors()
    */
+  @Test
   public void elResolverTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elResolverTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/build.xml
deleted file mode 100644
index acc04ea8d4..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClient.java
deleted file mode 100644
index 06a66e016f..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClient.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_el.listelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_listelresolver_web");
-    setTestJsp("ListELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: listElResolverTest
-   * 
-   * @assertion_ids: EL:JAVADOC:68; EL:JAVADOC:69; EL:JAVADOC:70; EL:JAVADOC:71;
-   * EL:JAVADOC:72; EL:JAVADOC:73
-   * 
-   * @test_Strategy: Obtain an ListELResolver via the PageContext and verify
-   * that API calls work as expected: setValue() getValue() getType()
-   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void listElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "listElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClientIT.java
new file mode 100644
index 0000000000..d4917281f1
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/URLClientIT.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_el.listelresolver;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+
+import java.io.IOException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_listelresolver_web");
+    setTestJsp("ListELResolverTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_listelresolver_web.war");
+    archive.addClasses(ListELResolverTag.class,
+            JspTestUtil.class,
+            ResolverTest.class, 
+            BarELResolver.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_listelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/listelresolver.tld", "listelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ListELResolverTest.jsp")), "ListELResolverTest.jsp");
+
+    return archive;
+
+  }
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: listElResolverTest
+   * 
+   * @assertion_ids: EL:JAVADOC:68; EL:JAVADOC:69; EL:JAVADOC:70; EL:JAVADOC:71;
+   * EL:JAVADOC:72; EL:JAVADOC:73
+   * 
+   * @test_Strategy: Obtain an ListELResolver via the PageContext and verify
+   * that API calls work as expected: setValue() getValue() getType()
+   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void listElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "listElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/build.xml
deleted file mode 100644
index 19e6619084..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClient.java
deleted file mode 100644
index 44780c5a66..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClient.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_el.mapelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_mapelresolver_web");
-    setTestJsp("MapELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: mapElResolverTest
-   * 
-   * @assertion_ids: EL:JAVADOC:76; EL:JAVADOC:77; EL:JAVADOC:78; EL:JAVADOC:79;
-   * EL:JAVADOC:80; EL:JAVADOC:83
-   * 
-   * @test_Strategy: Obtain an MapELResolver via the PageContext and verify that
-   * API calls work as expected: setValue() getValue() getType() isReadOnly()
-   * getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void mapElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "mapElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClientIT.java
new file mode 100644
index 0000000000..25ca773640
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/URLClientIT.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_el.mapelresolver;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+
+import java.io.IOException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_mapelresolver_web");
+    setTestJsp("MapELResolverTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_mapelresolver_web.war");
+    archive.addClasses(MapELResolverTag.class,
+            JspTestUtil.class,
+            ResolverTest.class, 
+            BarELResolver.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_mapelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/mapelresolver.tld", "mapelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/MapELResolverTest.jsp")), "MapELResolverTest.jsp");
+
+    return archive;
+
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: mapElResolverTest
+   * 
+   * @assertion_ids: EL:JAVADOC:76; EL:JAVADOC:77; EL:JAVADOC:78; EL:JAVADOC:79;
+   * EL:JAVADOC:80; EL:JAVADOC:83
+   * 
+   * @test_Strategy: Obtain an MapELResolver via the PageContext and verify that
+   * API calls work as expected: setValue() getValue() getType() isReadOnly()
+   * getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void mapElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "mapElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/build.xml
deleted file mode 100644
index 543e3608c9..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClient.java
deleted file mode 100644
index a6890a358c..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClient.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_el.methodinfo;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_methodinfo_web");
-    setTestJsp("MethodInfoTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: methodInfoTest
-   * 
-   * @assertion_ids: EL:JAVADOC:84; EL:JAVADOC:85; EL:JAVADOC:87; EL:JAVADOC:88;
-   * EL:JAVADOC:89
-   * 
-   * @test_Strategy: Validate the behavior of MethodExpression and MethodInfo
-   * class methods: MethodExpression.getMethodInfo() MethodExpression.invoke()
-   * MethodInfo.getName() MethodInfo.getReturnType() MethodInfo.getParamTypes()
-   */
-  public void methodInfoTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "methodInfoTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClientIT.java
new file mode 100644
index 0000000000..202bd22128
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/URLClientIT.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_el.methodinfo;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
+
+import java.io.IOException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_methodinfo_web");
+    setTestJsp("MethodInfoTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_methodinfo_web.war");
+    archive.addClasses(MethodInfoTag.class,
+              JspTestUtil.class,
+              SetTag.class,
+              ExpressionTest.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_methodinfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/methodinfo.tld", "methodinfo.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/MethodInfoTest.jsp")), "MethodInfoTest.jsp");
+
+    return archive;
+
+  }
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: methodInfoTest
+   * 
+   * @assertion_ids: EL:JAVADOC:84; EL:JAVADOC:85; EL:JAVADOC:87; EL:JAVADOC:88;
+   * EL:JAVADOC:89
+   * 
+   * @test_Strategy: Validate the behavior of MethodExpression and MethodInfo
+   * class methods: MethodExpression.getMethodInfo() MethodExpression.invoke()
+   * MethodInfo.getName() MethodInfo.getReturnType() MethodInfo.getParamTypes()
+   */
+  @Test
+  public void methodInfoTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "methodInfoTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/build.xml
deleted file mode 100644
index 738d6560f9..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClient.java
deleted file mode 100644
index 48604add67..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClient.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_el.resourcebundleelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_resourcebundleelresolver_web");
-    setTestJsp("ResourceBundleELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: resourceBundleElResolverTest
-   * 
-   * @assertion_ids: EL:JAVADOC:103; EL:JAVADOC:104; EL:JAVADOC:105;
-   * EL:JAVADOC:106; EL:JAVADOC:107; EL:JAVADOC:109
-   * 
-   * @test_Strategy: Obtain an ResourceBundleELResolver via the PageContext and
-   * verify that API calls work as expected: setValue() getValue() getType()
-   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void resourceBundleElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "resourcebundleElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClientIT.java
new file mode 100644
index 0000000000..fda527b4a7
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/URLClientIT.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_el.resourcebundleelresolver;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+
+import java.io.IOException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_resourcebundleelresolver_web");
+    setTestJsp("ResourceBundleELResolverTest");
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_resourcebundleelresolver_web.war");
+    archive.addClasses(ResourceBundleELResolverTag.class,
+              JspTestUtil.class,
+              ResolverTest.class, 
+              BarELResolver.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_resourcebundleelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/resourcebundleelresolver.tld", "resourcebundleelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ResourceBundleELResolverTest.jsp")), "ResourceBundleELResolverTest.jsp");
+
+    return archive;
+
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: resourceBundleElResolverTest
+   * 
+   * @assertion_ids: EL:JAVADOC:103; EL:JAVADOC:104; EL:JAVADOC:105;
+   * EL:JAVADOC:106; EL:JAVADOC:107; EL:JAVADOC:109
+   * 
+   * @test_Strategy: Obtain an ResourceBundleELResolver via the PageContext and
+   * verify that API calls work as expected: setValue() getValue() getType()
+   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void resourceBundleElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "resourcebundleElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/build.xml
deleted file mode 100644
index 3f4109ba38..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClientIT.java
similarity index 50%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClientIT.java
index 073a9e81e7..adc613ec9d 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,51 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_el.valexpression;
 
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_valexpr_web");
     setTestJsp("ValueExpressionTest");
-
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_valexpr_web.war");
+    archive.addClasses(ValueExpressionTag.class,
+            JspTestUtil.class,
+            SetTag.class,
+            ExpressionTest.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_valexpr_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/valexpression.tld", "valexpression.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ValueExpressionTest.jsp")), "ValueExpressionTest.jsp");
+
+    return archive;
+
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -71,6 +81,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * ValueExpression.getExpectedType() ValueExpression.isReadOnly()
    * Expression.isLiteralText()
    */
+  @Test
   public void valueExpressionEvaluateTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "valueExpressionEvaluateTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/build.xml
deleted file mode 100644
index ca917861c3..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java
similarity index 70%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java
index 966dbb4a2a..9f6dd51f89 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,48 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.elexception;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import java.io.IOException;
+import java.io.InputStream;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_elexc_web");
     setTestJsp("ELExceptionTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elexc_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elexc_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELExceptionTest.jsp")), "ELExceptionTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -66,6 +73,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate default constructor of ELException
    */
+  @Test
   public void elExceptionDefaultCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elExceptionDefaultCtorTest");
     invoke();
@@ -79,6 +87,7 @@ public void elExceptionDefaultCtorTest() throws Exception {
    * @test_Strategy: Validate contructor taking single string argument as the
    * message of the Exception.
    */
+  @Test
   public void elExceptionMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elExceptionMessageCtorTest");
     invoke();
@@ -92,6 +101,7 @@ public void elExceptionMessageCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking a Throwable signifying the root
    * cause of the this ELException.
    */
+  @Test
   public void elExceptionCauseCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elExceptionCauseCtorTest");
     invoke();
@@ -105,6 +115,7 @@ public void elExceptionCauseCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking both a message and a Throwable
    * signifying the root cause of the ELException.
    */
+  @Test
   public void elExceptionCauseMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elExceptionCauseMessageCtorTest");
     invoke();
@@ -117,6 +128,7 @@ public void elExceptionCauseMessageCtorTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of ELException.getRootCause().
    */
+  @Test
   public void elExceptionGetRootCauseTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elExceptionGetRootCauseTest");
     invoke();
@@ -129,6 +141,7 @@ public void elExceptionGetRootCauseTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of ELException.toString().
    */
+  @Test
   public void elExceptionToStringTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elExceptionToStringTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/build.xml
deleted file mode 100644
index 1fd89b41c2..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-	
-        
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java
similarity index 53%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java
index 3d63299ee4..767bea1265 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,54 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.elparseexception;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_elparseexc_web");
     setTestJsp("ELParseExceptionTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_elparseexc_web.war");
+    archive.addClasses(
+            JspTestUtil.class,
+            SetTag.class,
+            ExpressionTest.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_elparseexc_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELParseExceptionTest.jsp")), "ELParseExceptionTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -66,6 +79,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate default constructor of ELParseException
    */
+  @Test
   public void elParseExceptionDefaultCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elParseExceptionDefaultCtorTest");
     invoke();
@@ -79,6 +93,7 @@ public void elParseExceptionDefaultCtorTest() throws Exception {
    * @test_Strategy: Validate contructor taking single string argument as the
    * message of the Exception.
    */
+  @Test
   public void elParseExceptionMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "elParseExceptionMessageCtorTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClient.java
deleted file mode 100644
index 3cd7971e80..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClient.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.expression;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_expr_web");
-    setTestJsp("ExpressionTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: expressionEvaluateTest
-   * 
-   * @assertion_ids: JSP:JAVADOC:174
-   * 
-   * @test_Strategy: Validate the behavior of Expression.evaluate().
-   */
-  public void expressionEvaluateTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "expressionEvaluateTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java
new file mode 100644
index 0000000000..2ebba4db8b
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/URLClientIT.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.expression;
+
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.TSFunctionMapper;
+import com.sun.ts.tests.jsp.common.util.JspFunctions;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_expr_web");
+    setTestJsp("ExpressionTest");
+
+    }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_expr_web.war");
+    archive.addClasses(
+            JspTestUtil.class,
+            TSFunctionMapper.class,
+            JspFunctions.class);
+archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_expr_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ExpressionTest.jsp")), "ExpressionTest.jsp");
+
+
+    return archive;
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: expressionEvaluateTest
+   * 
+   * @assertion_ids: JSP:JAVADOC:174
+   * 
+   * @test_Strategy: Validate the behavior of Expression.evaluate().
+   */
+  @Test
+  public void expressionEvaluateTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "expressionEvaluateTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java
similarity index 61%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java
index 77a01912d4..d4548bf62b 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,52 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.expressionevaluator;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.TSFunctionMapper;
+import com.sun.ts.tests.jsp.common.util.JspFunctions;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_expreval_web");
     setTestJsp("ExpressionEvaluatorTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_expreval_web.war");
+    archive.addClasses(
+            JspTestUtil.class,
+            TSFunctionMapper.class,
+            JspFunctions.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_expreval_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ExpressionEvaluatorTest.jsp")), "ExpressionEvaluatorTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -69,6 +80,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * reference for the FunctionMapper - If the expression uses a function an no
    * prefix is provided, the default prefix will be used.
    */
+  @Test
   public void expressionEvaluatorParseExpressionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "expressionEvaluatorParseExpressionTest");
     invoke();
@@ -87,6 +99,7 @@ public void expressionEvaluatorParseExpressionTest() throws Exception {
    * provided VariableResolver is used. - Validate the result of the
    * expressions.
    */
+  @Test
   public void expressionEvaluatorEvaluateTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "expressionEvaluatorEvaluateTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClient.java
deleted file mode 100644
index 1b058afbee..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClient.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.implicitobjelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_implicitobjelresolver_web");
-    setTestJsp("ImplicitObjELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: implicitObjElResolverTest
-   * 
-   * @assertion_ids: JSP:JAVADOC:420; JSP:JAVADOC:421; JSP:JAVADOC:422;
-   * JSP:JAVADOC:423; JSP:JAVADOC:425; JSP:JAVADOC:426
-   * 
-   * @test_Strategy: Obtain an ImplicitObjectELResolver via the PageContext and
-   * verify that API calls work as expected: setValue() setValue() throws
-   * PropertyNotWritableException getValue() getType() isReadOnly()
-   * getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void implicitObjElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "implicitObjElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClientIT.java
new file mode 100644
index 0000000000..75205f977f
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/URLClientIT.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.implicitobjelresolver;
+
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.JspResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_implicitobjelresolver_web");
+    setTestJsp("ImplicitObjELResolverTest");
+
+    }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_implicitobjelresolver_web.war");
+    archive.addClasses(ImplicitObjELResolverTag.class,
+            JspTestUtil.class,
+            JspResolverTest.class,
+            BarELResolver.class,
+            ResolverTest.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_implicitobjelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/implicitobjelresolver.tld", "implicitobjelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitObjELResolverTest.jsp")), "ImplicitObjELResolverTest.jsp");
+
+
+    return archive;
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: implicitObjElResolverTest
+   * 
+   * @assertion_ids: JSP:JAVADOC:420; JSP:JAVADOC:421; JSP:JAVADOC:422;
+   * JSP:JAVADOC:423; JSP:JAVADOC:425; JSP:JAVADOC:426
+   * 
+   * @test_Strategy: Obtain an ImplicitObjectELResolver via the PageContext and
+   * verify that API calls work as expected: setValue() setValue() throws
+   * PropertyNotWritableException getValue() getType() isReadOnly()
+   * getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void implicitObjElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "implicitObjElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClient.java
deleted file mode 100644
index 0ac91613eb..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClient.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * @(#)URLClient.java	
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.scopedattrelresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_scopedattrelresolver_web");
-    setTestJsp("ScopedAttrELResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: scopedAttrElResolverTest
-   * 
-   * @assertion_ids: JSP:JAVADOC:427; JSP:JAVADOC:428; JSP:JAVADOC:429;
-   * JSP:JAVADOC:430; JSP:JAVADOC:431; JSP:JAVADOC:433
-   * 
-   * @test_Strategy: Obtain an ScopedAttributeELResolver via the PageContext and
-   * verify that API calls work as expected: setValue() getValue() getType()
-   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
-   */
-  public void scopedAttrElResolverTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "scopedAttrElResolverTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClientIT.java
new file mode 100644
index 0000000000..2244f3c75e
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/URLClientIT.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * @(#)URLClient.java	
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.scopedattrelresolver;
+
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.JspResolverTest;
+import com.sun.ts.tests.common.el.api.resolver.BarELResolver;
+import com.sun.ts.tests.common.el.api.resolver.ResolverTest;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_scopedattrelresolver_web");
+    setTestJsp("ScopedAttrELResolverTest");
+
+    }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_scopedattrelresolver_web.war");
+    archive.addClasses(ScopedAttrELResolverTag.class,
+            JspTestUtil.class,
+            JspResolverTest.class,
+            BarELResolver.class,
+            ResolverTest.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_scopedattrelresolver_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/scopedattrelresolver.tld", "scopedattrelresolver.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ScopedAttrELResolverTest.jsp")), "ScopedAttrELResolverTest.jsp");
+
+
+    return archive;
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: scopedAttrElResolverTest
+   * 
+   * @assertion_ids: JSP:JAVADOC:427; JSP:JAVADOC:428; JSP:JAVADOC:429;
+   * JSP:JAVADOC:430; JSP:JAVADOC:431; JSP:JAVADOC:433
+   * 
+   * @test_Strategy: Obtain an ScopedAttributeELResolver via the PageContext and
+   * verify that API calls work as expected: setValue() getValue() getType()
+   * isReadOnly() getCommonPropertyType() getFeatureDescriptors()
+   */
+  @Test
+  public void scopedAttrElResolverTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "scopedAttrElResolverTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClient.java
deleted file mode 100644
index 596e2cd31f..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClient.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.variableresolver;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setContextRoot("/jsp_varresolver_web");
-    setTestJsp("VariableResolverTest");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: variableResolverResolveVariableTest
-   * 
-   * @assertion_ids: JSP:JAVADOC:384
-   * 
-   * @test_Strategy: Validate behavior of VariableResolver.resolveVariable().
-   */
-  public void variableResolverResolveVariableTest() throws Exception {
-    TEST_PROPS.setProperty(APITEST, "variableResolverResolveVariableTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClientIT.java
new file mode 100644
index 0000000000..4dd8531ec6
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/URLClientIT.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.variableresolver;
+
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
+
+    setContextRoot("/jsp_varresolver_web");
+    setTestJsp("VariableResolverTest");
+
+    }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_varresolver_web.war");
+    archive.addClasses(
+            JspTestUtil.class,
+            SetTag.class,
+            ExpressionTest.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_varresolver_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/VariableResolverTest.jsp")), "VariableResolverTest.jsp");
+
+
+    return archive;
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: variableResolverResolveVariableTest
+   * 
+   * @assertion_ids: JSP:JAVADOC:384
+   * 
+   * @test_Strategy: Validate behavior of VariableResolver.resolveVariable().
+   */
+  @Test
+  public void variableResolverResolveVariableTest() throws Exception {
+    TEST_PROPS.setProperty(APITEST, "variableResolverResolveVariableTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClientIT.java
similarity index 67%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClientIT.java
index 81d9f5a920..34f35e68b3 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,42 +20,51 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.errordata;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_errordata_web");
     setTestJsp("ErrorDataTest");
     System.out.println("Running TESTS");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_errordata_web.war");
+    archive.addClasses(
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_errordata_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ErrorDataTest.jsp")), "ErrorDataTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -68,6 +77,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate proper construction of ErrorData object directly
    * via API.
    */
+  @Test
   public void errorDataConstructorTest() throws Exception {
     System.out.println("In test method");
     TEST_PROPS.setProperty(APITEST, "errorDataConstructorTest");
@@ -81,6 +91,7 @@ public void errorDataConstructorTest() throws Exception {
    * 
    * @test_Strategy: Validate behavior of ErrorData.getThrowable().
    */
+  @Test
   public void errorDataGetThrowableTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "errorDataGetThrowableTest");
     invoke();
@@ -93,6 +104,7 @@ public void errorDataGetThrowableTest() throws Exception {
    * 
    * @test_Strategy: Validate behavior of ErrorData.getStatusCode().
    */
+  @Test
   public void errorDataGetStatusCodeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "errorDataGetStatusCodeTest");
     invoke();
@@ -105,6 +117,7 @@ public void errorDataGetStatusCodeTest() throws Exception {
    * 
    * @test_Strategy: Validate behavior of ErrorData.getRequestURI()
    */
+  @Test
   public void errorDataGetRequestURITest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "errorDataGetRequestURITest");
     invoke();
@@ -117,6 +130,7 @@ public void errorDataGetRequestURITest() throws Exception {
    * 
    * @test_Strategy: Validate behavior of ErrorData.getServletName().
    */
+  @Test
   public void errorDataGetServletNameTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "errorDataGetServletNameTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/build.xml
deleted file mode 100644
index e26ebfdb79..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	 
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClientIT.java
similarity index 59%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClientIT.java
index edf605e68a..db8ed0d7e3 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,51 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspapplicationcontext;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_jspapplicationcontext_web");
     setTestJsp("JspApplicationContextTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspapplicationcontext_web.war");
+    archive.addClasses(FooELResolver.class, InstallFooListener.class,
+            JspTestUtil.class);    
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspapplicationcontext_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/AddELResolverTest.jsp")), "AddELResolverTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IllegalStateExceptionTest.jsp")), "IllegalStateExceptionTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -68,6 +78,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * JspApplicationContext.addELResolver() Verify that once an ELResolver has
    * been registered with the JSP container it performs as expected.
    */
+  @Test
   public void addELResolverTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_jspapplicationcontext_web/AddELResolverTest.jsp HTTP 1.1");
@@ -86,6 +97,7 @@ public void addELResolverTest() throws Exception {
    * JspApplicationContext.addELResolver() will cause the container to throw an
    * IllegalStateException.
    */
+  @Test
   public void invokeIllegalStateExceptionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_jspapplicationcontext_web/IllegalStateExceptionTest.jsp HTTP 1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/build.xml
deleted file mode 100644
index 05e0b1930d..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClientIT.java
index 2024adfb46..ca08dc97ce 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,49 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspengineinfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_jspengineinfo_web");
     setTestJsp("JspEngineInfoTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspengineinfo_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspengineinfo_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspEngineInfoTest.jsp")), "JspEngineInfoTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -67,6 +75,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate the behavior of
    * JspEngineInfo.getSpecificationVersion().
    */
+  @Test
   public void jspEngineInfoGetSpecificationVersionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspEngineInfoGetSpecificationVersionTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/build.xml
deleted file mode 100644
index 8367193a22..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClientIT.java
similarity index 68%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClientIT.java
index 7528a72ac4..1dd98aee43 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,48 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspexception;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_jspexc_web");
     setTestJsp("JspExceptionTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspexc_web.war");
+    archive.addClasses(com.sun.ts.tests.jsp.common.util.JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspexc_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspExceptionTest.jsp")), "JspExceptionTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -66,6 +73,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate default constructor of JspException
    */
+  @Test
   public void jspExceptionDefaultCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspExceptionDefaultCtorTest");
     invoke();
@@ -79,6 +87,7 @@ public void jspExceptionDefaultCtorTest() throws Exception {
    * @test_Strategy: Validate contructor taking single string argument as the
    * message of the Exception.
    */
+  @Test
   public void jspExceptionMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspExceptionMessageCtorTest");
     invoke();
@@ -92,6 +101,7 @@ public void jspExceptionMessageCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking a Throwable signifying the root
    * cause of the this JspException.
    */
+  @Test
   public void jspExceptionCauseCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspExceptionCauseCtorTest");
     invoke();
@@ -105,6 +115,7 @@ public void jspExceptionCauseCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking both a message and a Throwable
    * signifying the root cause of the JspException.
    */
+  @Test
   public void jspExceptionCauseMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspExceptionCauseMessageCtorTest");
     invoke();
@@ -117,6 +128,7 @@ public void jspExceptionCauseMessageCtorTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspException.getRootCause().
    */
+  @Test
   public void jspExceptionGetRootCauseTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspExceptionGetRootCauseTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/build.xml
deleted file mode 100644
index 949610c129..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClientIT.java
similarity index 58%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClientIT.java
index 483679524b..4819d8512b 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,52 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspfactory;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.SimpleContext;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_jspfactory_web");
     setTestJsp("JspFactoryTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspfactory_web.war");
+    archive.addClasses(
+            JspTestUtil.class,
+            SimpleContext.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspfactory_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspFactoryTest.jsp")), "JspFactoryTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -66,6 +77,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate the behavior of JspFactory.getDefaultFactory().
    */
+  @Test
   public void jspFactoryGetDefaultFactoryTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspFactoryGetDefaultFactoryTest");
     invoke();
@@ -78,6 +90,7 @@ public void jspFactoryGetDefaultFactoryTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspFactory.getPageContext().
    */
+  @Test
   public void jspFactoryGetPageContextTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspFactoryGetPageContextTest");
     invoke();
@@ -90,6 +103,7 @@ public void jspFactoryGetPageContextTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspFactory.getEngineInfo().
    */
+  @Test
   public void jspFactoryGetEngineInfoTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspFactoryGetEngineInfoTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/build.xml
deleted file mode 100644
index 789db85643..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/build.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClientIT.java
similarity index 65%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClientIT.java
index 6c8741523e..b83b082fd6 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,49 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jsptagexception;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_jsptagexc_web");
     setTestJsp("JspTagExceptionTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jsptagexc_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jsptagexc_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagExceptionTest.jsp")), "JspTagExceptionTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -66,6 +74,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate default constructor of JspTagException
    */
+  @Test
   public void jspTagExceptionDefaultCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspTagExceptionDefaultCtorTest");
     invoke();
@@ -79,6 +88,7 @@ public void jspTagExceptionDefaultCtorTest() throws Exception {
    * @test_Strategy: Validate contructor taking single string argument as the
    * message of the Exception.
    */
+  @Test
   public void jspTagExceptionMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspTagExceptionMessageCtorTest");
     invoke();
@@ -92,6 +102,7 @@ public void jspTagExceptionMessageCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking a Throwable signifying the root
    * cause of the this JspTagException.
    */
+  @Test
   public void jspTagExceptionCauseCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspTagExceptionCauseCtorTest");
     invoke();
@@ -105,6 +116,7 @@ public void jspTagExceptionCauseCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking both a message and a Throwable
    * signifying the root cause of the JspTagException.
    */
+  @Test
   public void jspTagExceptionCauseMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspTagExceptionCauseMessageCtorTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/build.xml
deleted file mode 100644
index 0b3eec4875..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClientIT.java
similarity index 89%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClientIT.java
index de18cf59cc..176107bb1e 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,12 +20,27 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspwriter;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil; 
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
 
-public class URLClient extends AbstractUrlClient {
 
   private static final char[] CHARS = new char[89];
 
@@ -33,40 +48,31 @@ public class URLClient extends AbstractUrlClient {
 
   private static final String JSP_WRITER_VALIDATOR = "com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspwriter.JspWriterValidator";
 
-  public URLClient() {
+  public URLClientIT() throws Exception {
     for (short i = 33, idx = 0; i < 90; i++, idx++) {
       CHARS[idx] = (char) i;
     }
-  }
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_jspwriter_web");
     setTestJsp("JspWriterTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspwriter_web.war");
+    archive.addClasses(JspWriterValidator.class, JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspwriter_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspWriterTest.jsp")), "JspWriterTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CloseValidator.jsp")), "CloseValidator.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -78,6 +84,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.newLine().
    */
+  @Test
   public void jspWriterNewLineTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterNewLineTest");
     TEST_PROPS.setProperty(STRATEGY, JSP_WRITER_VALIDATOR);
@@ -92,6 +99,7 @@ public void jspWriterNewLineTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(boolean).
    */
+  @Test
   public void jspWriterPrintBooleanTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintBooleanTest");
     TEST_PROPS.setProperty(SEARCH_STRING, "truefalse");
@@ -105,6 +113,7 @@ public void jspWriterPrintBooleanTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(char).
    */
+  @Test
   public void jspWriterPrintCharTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintCharTest");
     TEST_PROPS.setProperty(SEARCH_STRING, "cb");
@@ -118,6 +127,7 @@ public void jspWriterPrintCharTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(int).
    */
+  @Test
   public void jspWriterPrintIntTest() throws Exception {
     String result = new StringBuffer().append(Integer.MIN_VALUE)
         .append(Integer.MAX_VALUE).toString();
@@ -133,6 +143,7 @@ public void jspWriterPrintIntTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(long).
    */
+  @Test
   public void jspWriterPrintLongTest() throws Exception {
     String result = new StringBuffer().append(Long.MIN_VALUE)
         .append(Long.MAX_VALUE).toString();
@@ -148,6 +159,7 @@ public void jspWriterPrintLongTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(Float).
    */
+  @Test
   public void jspWriterPrintFloatTest() throws Exception {
     String result = new StringBuffer().append(Float.MIN_VALUE)
         .append(Float.MAX_VALUE).toString();
@@ -163,6 +175,7 @@ public void jspWriterPrintFloatTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(double).
    */
+  @Test
   public void jspWriterPrintDoubleTest() throws Exception {
     String result = new StringBuffer().append(Double.MIN_VALUE)
         .append(Double.MAX_VALUE).toString();
@@ -178,6 +191,7 @@ public void jspWriterPrintDoubleTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(char[]).
    */
+  @Test
   public void jspWriterPrintCharArrayTest() throws Exception {
     String result = new StringBuffer().append(CHARS).append(CHARS).toString();
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintCharArrayTest");
@@ -192,6 +206,7 @@ public void jspWriterPrintCharArrayTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(String).
    */
+  @Test
   public void jspWriterPrintStringTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintStringTest");
     TEST_PROPS.setProperty(SEARCH_STRING, "Test Passed");
@@ -206,6 +221,7 @@ public void jspWriterPrintStringTest() throws Exception {
    * @test_Strategy: Validate the behavior of JspWriter.print(String) where the
    * argument is null.
    */
+  @Test
   public void jspWriterPrintNullStringTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintNullStringTest");
     TEST_PROPS.setProperty(SEARCH_STRING, "null");
@@ -219,6 +235,7 @@ public void jspWriterPrintNullStringTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.print(Object).
    */
+  @Test
   public void jspWriterPrintObjectTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintObjectTest");
     TEST_PROPS.setProperty(SEARCH_STRING, "Test Passed");
@@ -232,6 +249,7 @@ public void jspWriterPrintObjectTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println().
    */
+  @Test
   public void jspWriterPrintlnTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintlnTest");
     TEST_PROPS.setProperty(STRATEGY, JSP_WRITER_VALIDATOR);
@@ -246,6 +264,7 @@ public void jspWriterPrintlnTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(boolean).
    */
+  @Test
   public void jspWriterPrintlnBooleanTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintlnBooleanTest");
     TEST_PROPS.setProperty(STRATEGY, JSP_WRITER_VALIDATOR);
@@ -260,6 +279,7 @@ public void jspWriterPrintlnBooleanTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(char).
    */
+  @Test
   public void jspWriterPrintlnCharTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintlnCharTest");
     TEST_PROPS.setProperty(STRATEGY, JSP_WRITER_VALIDATOR);
@@ -274,6 +294,7 @@ public void jspWriterPrintlnCharTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(int).
    */
+  @Test
   public void jspWriterPrintlnIntTest() throws Exception {
     String result = new StringBuffer().append(Integer.MIN_VALUE).append(EOL)
         .append(Integer.MAX_VALUE).append(EOL).toString();
@@ -290,6 +311,7 @@ public void jspWriterPrintlnIntTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(long).
    */
+  @Test
   public void jspWriterPrintlnLongTest() throws Exception {
     String result = new StringBuffer().append(Long.MIN_VALUE).append(EOL)
         .append(Long.MAX_VALUE).append(EOL).toString();
@@ -306,6 +328,7 @@ public void jspWriterPrintlnLongTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(float).
    */
+  @Test
   public void jspWriterPrintlnFloatTest() throws Exception {
     String result = new StringBuffer().append(Float.MIN_VALUE).append(EOL)
         .append(Float.MAX_VALUE).append(EOL).toString();
@@ -322,6 +345,7 @@ public void jspWriterPrintlnFloatTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(double).
    */
+  @Test
   public void jspWriterPrintlnDoubleTest() throws Exception {
     String result = new StringBuffer().append(Double.MIN_VALUE).append(EOL)
         .append(Double.MAX_VALUE).append(EOL).toString();
@@ -338,6 +362,7 @@ public void jspWriterPrintlnDoubleTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(double).
    */
+  @Test
   public void jspWriterPrintlnCharArrayTest() throws Exception {
     String result = new StringBuffer().append(CHARS).append(EOL).append(CHARS)
         .append(EOL).toString();
@@ -354,6 +379,7 @@ public void jspWriterPrintlnCharArrayTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(String).
    */
+  @Test
   public void jspWriterPrintlnStringTest() throws Exception {
     String result = new StringBuffer().append("Test ").append(EOL)
         .append("Passed").append(EOL).toString();
@@ -371,6 +397,7 @@ public void jspWriterPrintlnStringTest() throws Exception {
    * @test_Strategy: Validate the behavior of JspWriter.println(String) where
    * the argument is null.
    */
+  @Test
   public void jspWriterPrintlnNullStringTest() throws Exception {
     TEST_PROPS.setProperty(APITEST1, "jspWriterPrintlnNullStringTest");
     TEST_PROPS.setProperty(SEARCH_STRING, "null");
@@ -384,6 +411,7 @@ public void jspWriterPrintlnNullStringTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.println(Object).
    */
+  @Test
   public void jspWriterPrintlnObjectTest() throws Exception {
     String result = new StringBuffer().append("Test ").append(EOL)
         .append("Passed").append(EOL).toString();
@@ -400,6 +428,7 @@ public void jspWriterPrintlnObjectTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.clear().
    */
+  @Test
   public void jspWriterClearTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspWriterClearTest");
     invoke();
@@ -414,6 +443,7 @@ public void jspWriterClearTest() throws Exception {
    * must be thrown if the response has been committed, and JspWriter.clear() is
    * subsequently called.
    */
+  @Test
   public void jspWriterClearIOExceptionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspWriterClearIOExceptionTest");
     invoke();
@@ -426,6 +456,7 @@ public void jspWriterClearIOExceptionTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.clearBuffer().
    */
+  @Test
   public void jspWriterClearBufferTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspWriterClearBufferTest");
     invoke();
@@ -438,6 +469,7 @@ public void jspWriterClearBufferTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.flush().
    */
+  @Test
   public void jspWriterFlushTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspWriterFlushTest");
     invoke();
@@ -450,6 +482,7 @@ public void jspWriterFlushTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.close().
    */
+  @Test
   public void jspWriterCloseTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_jspwriter_web/JspWriterTest.jsp?testname=jspWriterCloseTest HTTP/1.1");
@@ -469,6 +502,7 @@ public void jspWriterCloseTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.getBufferSize().
    */
+  @Test
   public void jspWriterGetBufferSizeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspWriterGetBufferSizeTest");
     invoke();
@@ -481,6 +515,7 @@ public void jspWriterGetBufferSizeTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.getRemaining().
    */
+  @Test
   public void jspWriterGetRemainingTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspWriterGetRemainingTest");
     invoke();
@@ -493,6 +528,7 @@ public void jspWriterGetRemainingTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of JspWriter.isAutoFlush().
    */
+  @Test
   public void jspWriterIsAutoFlushTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "jspWriterIsAutoFlushTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/build.xml
deleted file mode 100644
index a9ab0970cc..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClientIT.java
similarity index 93%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClientIT.java
index 2011d9f0e0..2008b3b138 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,51 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.pagecontext;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+
+  public URLClientIT() throws Exception {
 
     setTestJsp("PageContextTest");
     setContextRoot("/jsp_pagecontext_web");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_pagecontext_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_pagecontext_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/PageContextTest.jsp")), "PageContextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ErrorPage.jsp")), "ErrorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/Resource.jsp")), "Resource.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -64,6 +74,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @assertion_ids: JSP:JAVADOC:16
    * @test_Strategy: Validate PageContext.getSession().
    */
+  @Test
   public void pageContextGetSessionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetSessionTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -75,6 +86,7 @@ public void pageContextGetSessionTest() throws Exception {
    * @assertion_ids: JSP:JAVADOC:17
    * @test_Strategy: Validate PageContext.getPage().
    */
+  @Test
   public void pageContextGetPageTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetPageTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -86,6 +98,7 @@ public void pageContextGetPageTest() throws Exception {
    * @assertion_ids: JSP:JAVADOC:18
    * @test_Strategy: Validate PageContext.getRequest().
    */
+  @Test
   public void pageContextGetRequestTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetRequestTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -97,6 +110,7 @@ public void pageContextGetRequestTest() throws Exception {
    * @assertion_ids: JSP:JAVADOC:19
    * @test_Strategy: Validate PageContext.getResponse().
    */
+  @Test
   public void pageContextGetResponseTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetResponseTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -108,6 +122,7 @@ public void pageContextGetResponseTest() throws Exception {
    * @assertion_ids: JSP:JAVADOC:20
    * @test_Strategy: Validate PageContext.getException().
    */
+  @Test
   public void pageContextGetExceptionTest() throws Exception {
     TEST_PROPS.setProperty(TEST_NAME, "pageContextGetExceptionTest");
     TEST_PROPS.setProperty(REQUEST,
@@ -123,6 +138,7 @@ public void pageContextGetExceptionTest() throws Exception {
    * @assertion_ids: JSP:JAVADOC:21
    * @test_Strategy: Validate PageContext.getServletConfig().
    */
+  @Test
   public void pageContextGetServletConfigTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetServletConfigTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -134,6 +150,7 @@ public void pageContextGetServletConfigTest() throws Exception {
    * @assertion_ids: JSP:JAVADOC:22
    * @test_Strategy: Validate PageContext.getServletContext().
    */
+  @Test
   public void pageContextGetServletContextTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetServletContextTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -146,6 +163,7 @@ public void pageContextGetServletContextTest() throws Exception {
    * @test_Strategy: Validate PageContext.forward() passing in a resource
    *                 identified by a context-relative path.
    */
+  @Test
   public void pageContextForwardContextPathTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextForwardContextPathTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -158,6 +176,7 @@ public void pageContextForwardContextPathTest() throws Exception {
    * @test_Strategy: Validate PageContext.forward() passing in a resource
    *                 identified by a page-relative path.
    */
+  @Test
   public void pageContextForwardPagePathTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextForwardPagePathTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -201,6 +220,7 @@ public void pageContextForwardPagePathTest() throws Exception {
    *                 IllegalStateException if ServletResponse is not in the
    *                 proper state to perform a forward.
    */
+  @Test
   public void pageContextForwardIllegalStateExceptionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_pagecontext_web/PageContextTest.jsp?testname=pageContextForwardIllegalStateExceptionTest HTTP/1.1");
@@ -215,6 +235,7 @@ public void pageContextForwardIllegalStateExceptionTest() throws Exception {
    * @test_Strategy: Validate PageContext.include() where the inclusion resource
    *                 is identified by a context-relative path.
    */
+  @Test
   public void pageContextIncludeContextPathTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextIncludeContextPathTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -227,6 +248,7 @@ public void pageContextIncludeContextPathTest() throws Exception {
    * @test_Strategy: Validate PageContext.include() where the inclusion resource
    *                 is identified by a page-relative path.
    */
+  @Test
   public void pageContextIncludePagePathTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextIncludePagePathTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -243,6 +265,7 @@ public void pageContextIncludePagePathTest() throws Exception {
    *                 the response has been comitted. This also validated the
    *                 inclusion of a resource identified by a page-relative path.
    */
+  @Test
   public void pageContextIncludeFlushTrueTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextIncludeFlushTrueTest");
     TEST_PROPS.setProperty(SEARCH_STRING, "Stream was properly flushed");
@@ -261,6 +284,7 @@ public void pageContextIncludeFlushTrueTest() throws Exception {
    *                 inclusion of a resource identified by a context-relative
    *                 path.
    */
+  @Test
   public void pageContextIncludeFlushFalseTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextIncludeFlushFalseTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH,
@@ -274,6 +298,7 @@ public void pageContextIncludeFlushFalseTest() throws Exception {
    * @test_Strategy: Validate PageContext.handlePageException(Exception) invokes
    *                 the defined error page.
    */
+  @Test
   public void pageContextHandlePageExceptionExcTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextHandlePageExceptionExcTest");
     TEST_PROPS.setProperty(IGNORE_STATUS_CODE, "true");
@@ -287,6 +312,7 @@ public void pageContextHandlePageExceptionExcTest() throws Exception {
    * @test_Strategy: Validate PageContext.handlePageException(Throwable) invokes
    *                 the defined error page.
    */
+  @Test
   public void pageContextHandlePageExceptionThrTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextHandlePageExceptionThrTest");
     TEST_PROPS.setProperty(IGNORE_STATUS_CODE, "true");
@@ -300,6 +326,7 @@ public void pageContextHandlePageExceptionThrTest() throws Exception {
    * @test_Strategy: Validate PageContext.handlePageException(Exception) throws
    *                 a NullPointerException if an null argument is provided.
    */
+  @Test
   public void pageContextHandlePageExceptionExcNPETest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextHandlePageExceptionExcNPETest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -312,6 +339,7 @@ public void pageContextHandlePageExceptionExcNPETest() throws Exception {
    * @test_Strategy: Validate PageContext.handlePageException(Throwable) throws
    *                 a NullPointerException if an null argument is provided.
    */
+  @Test
   public void pageContextHandlePageExceptionThrNPETest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextHandlePageExceptionThrNPETest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -325,6 +353,7 @@ public void pageContextHandlePageExceptionThrNPETest() throws Exception {
    * @test_Strategy: Validate behavior of PageContext.pushBody() and
    *                 PageContext.popBody().
    */
+  @Test
   public void pageContextPushPopBodyTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextPushPopBodyTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -336,6 +365,7 @@ public void pageContextPushPopBodyTest() throws Exception {
    * @assertion_ids: JSP:JAVADOC:62
    * @test_Strategy: Validate behavior of PageContext.getErrorData().
    */
+  @Test
   public void pageContextGetErrorDataTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetErrorDataTest");
     TEST_PROPS.setProperty(IGNORE_STATUS_CODE, "true");
@@ -349,6 +379,7 @@ public void pageContextGetErrorDataTest() throws Exception {
    * @test_Strategy: Validate PageContext.include() throws an IOException if
    *                 included resource throws an IOException.
    */
+  @Test
   public void pageContextIncludeIOExceptionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextIncludeIOExceptionTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -361,6 +392,7 @@ public void pageContextIncludeIOExceptionTest() throws Exception {
    * @test_Strategy: Validate PageContext.include() throws a ServletException if
    *                 target resource throws a ServletException.
    */
+  @Test
   public void pageContextIncludeServletExceptionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextIncludeServletExceptionTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -374,6 +406,7 @@ public void pageContextIncludeServletExceptionTest() throws Exception {
    *                 provided, throws an IOException if the target resource
    *                 cannot be accessed by the caller.
    */
+  @Test
   public void pageContextIncludeFlushIOExceptionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextIncludeFlushIOExceptionTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -387,6 +420,7 @@ public void pageContextIncludeFlushIOExceptionTest() throws Exception {
    *                 provided, throws a ServletException if the target resource
    *                 cannot be accessed by the caller.
    */
+  @Test
   public void pageContextIncludeFlushServletExceptionTest() throws Exception {
     TEST_PROPS.setProperty(APITEST,
         "pageContextIncludeFlushServletExceptionTest");
@@ -401,6 +435,7 @@ public void pageContextIncludeFlushServletExceptionTest() throws Exception {
    *                 PageContext.setAttribute(String). Note: These are inherited
    *                 from JspContext.
    */
+  @Test
   public void pageContextGetSetAttributeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetSetAttributeTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -414,6 +449,7 @@ public void pageContextGetSetAttributeTest() throws Exception {
    *                 name provided is null, but not when the provided value is
    *                 null. Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextSetAttributeNPETest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextSetAttributeNPETest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -427,6 +463,7 @@ public void pageContextSetAttributeNPETest() throws Exception {
    *                 PageContext.setAttribute() when provided with scope
    *                 arguments. Note: These are inherited from JspContext.
    */
+  @Test
   public void pageContextGetSetAttributeInScopeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetSetAttributeInScopeTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -440,6 +477,7 @@ public void pageContextGetSetAttributeInScopeTest() throws Exception {
    *                 name provided is null, but not when the provided value is
    *                 null. Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextSetAttributeInScopeNPETest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextSetAttributeInScopeNPETest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -453,6 +491,7 @@ public void pageContextSetAttributeInScopeNPETest() throws Exception {
    *                 PageContext.setAttribute() is provided an invalid scope.
    *                 Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextSetAttributeInScopeIllegalArgumentExceptionTest()
       throws Exception {
     TEST_PROPS.setProperty(APITEST,
@@ -468,6 +507,7 @@ public void pageContextSetAttributeInScopeIllegalArgumentExceptionTest()
    *                 PageContext.getAttriubte() is provided a null argument.
    *                 Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextGetAttributeNPETest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetAttributeNPETest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -481,6 +521,7 @@ public void pageContextGetAttributeNPETest() throws Exception {
    *                 PageContext.getAttribute() is provided an invalid value for
    *                 scope. Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextGetAttributeInScopeIllegalArgumentExceptionTest()
       throws Exception {
     TEST_PROPS.setProperty(APITEST,
@@ -495,6 +536,7 @@ public void pageContextGetAttributeInScopeIllegalArgumentExceptionTest()
    * @test_Strategy: Validate behavior of PageContext.findAttribute(). Note:
    *                 This is inherited from JspContext.
    */
+  @Test
   public void pageContextFindAttributeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextFindAttributeTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -507,6 +549,7 @@ public void pageContextFindAttributeTest() throws Exception {
    * @test_Strategy: Validate the behavior of PageContext.removeAttribute().
    *                 Note: This is inhertied from JspContext
    */
+  @Test
   public void pageContextRemoveAttributeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextRemoveAttributeTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -519,6 +562,7 @@ public void pageContextRemoveAttributeTest() throws Exception {
    * @test_Strategy: Validate the behavior of PageContext.remoteAttribute() when
    *                 provided a scope. Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextRemoveAttributeFromScopeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextRemoveAttributeFromScopeTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -531,6 +575,7 @@ public void pageContextRemoveAttributeFromScopeTest() throws Exception {
    * @test_Strategy: Validate an IllegalArgumentException is thrown if the scope
    *                 argument is provided an illegal scope.
    */
+  @Test
   public void pageContextRemoveAttributeFromScopeIllegalScopeTest()
       throws Exception {
     TEST_PROPS.setProperty(APITEST,
@@ -545,6 +590,7 @@ public void pageContextRemoveAttributeFromScopeIllegalScopeTest()
    * @test_Strategy: Validate the behavior of PageContext.getAttributeScope().
    *                 Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextGetAttributeScopeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetAttributeScopeTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -558,6 +604,7 @@ public void pageContextGetAttributeScopeTest() throws Exception {
    *                 PageContext.getAttributeNamesInScope(). Note: This is
    *                 inherited from JspContext
    */
+  @Test
   public void pageContextGetAttributeNamesInScopeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetAttributeNamesInScopeTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -570,6 +617,7 @@ public void pageContextGetAttributeNamesInScopeTest() throws Exception {
    * @test_Strategy: Validate an IllegalArgumentException is thrown if the scope
    *                 argument is provided an illegal scope.
    */
+  @Test
   public void pageContextGetAttributeNamesInScopeIllegalScopeTest()
       throws Exception {
     TEST_PROPS.setProperty(APITEST,
@@ -584,6 +632,7 @@ public void pageContextGetAttributeNamesInScopeIllegalScopeTest()
    * @test_Strategy: Validate the behavior of PageContext.getOut. Note: This is
    *                 inherited from JspContext.
    */
+  @Test
   public void pageContextGetOutTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetOutTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -597,6 +646,7 @@ public void pageContextGetOutTest() throws Exception {
    *                 PageContext.getExpressionEvaluator. Note: This is inherited
    *                 from JspContext.
    */
+  @Test
   public void pageContextGetExpressionEvaluatorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetExpressionEvaluatorTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -609,6 +659,7 @@ public void pageContextGetExpressionEvaluatorTest() throws Exception {
    * @test_Strategy: Validate the behavior of PageContext.getVariableResolver().
    *                 Note: This is inherited from JspContext.
    */
+  @Test
   public void pageContextGetVariableResolverTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextGetVariableResolverTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -621,6 +672,7 @@ public void pageContextGetVariableResolverTest() throws Exception {
    * @test_Strategy: Validate a NullPointerException is thrown if a null value
    *                 is provided for the name parameter.
    */
+  @Test
   public void pageContextFindAttributeNullNameTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextFindAttributeNullNameTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -633,6 +685,7 @@ public void pageContextFindAttributeNullNameTest() throws Exception {
    * @test_Strategy: Validate a NullPointerException is thrown if a null value
    *                 is provided to the name argument.
    */
+  @Test
   public void pageContextGetAttributesScopeNullNameTest() throws Exception {
     TEST_PROPS.setProperty(APITEST,
         "pageContextGetAttributesScopeNullNameTest");
@@ -646,6 +699,7 @@ public void pageContextGetAttributesScopeNullNameTest() throws Exception {
    * @test_Strategy: Validate a NullPointerException is thrown if the name
    *                 argument is provided a null value.
    */
+  @Test
   public void pageContextRemoveAttributeNullNameTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextRemoveAttributeNullNameTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
@@ -660,6 +714,7 @@ public void pageContextRemoveAttributeNullNameTest() throws Exception {
    *                 Object, int) it has the same affect as calling
    *                 removeAttribute(String) or removeAttribute(String, int).
    */
+  @Test
   public void pageContextSetAttributeNullValueTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "pageContextSetAttributeNullValueTest");
     TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "Error page invoked");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/build.xml
deleted file mode 100644
index c50aef7fd0..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClientIT.java
similarity index 65%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClientIT.java
index bc9f45ac45..7343d8a289 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,49 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.skippageexception;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_skippageexc_web");
     setTestJsp("SkipPageExceptionTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_skippageexc_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_skippageexc_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SkipPageExceptionTest.jsp")), "SkipPageExceptionTest.jsp");
+
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -66,6 +74,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate default constructor of SkipPageException
    */
+  @Test
   public void skipPageExceptionDefaultCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "skipPageExceptionDefaultCtorTest");
     invoke();
@@ -79,6 +88,7 @@ public void skipPageExceptionDefaultCtorTest() throws Exception {
    * @test_Strategy: Validate contructor taking single string argument as the
    * message of the Exception.
    */
+  @Test
   public void skipPageExceptionMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "skipPageExceptionMessageCtorTest");
     invoke();
@@ -92,6 +102,7 @@ public void skipPageExceptionMessageCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking a Throwable signifying the root
    * cause of the this SkipPageException.
    */
+  @Test
   public void skipPageExceptionCauseCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "skipPageExceptionCauseCtorTest");
     invoke();
@@ -105,6 +116,7 @@ public void skipPageExceptionCauseCtorTest() throws Exception {
    * @test_Strategy: Validate constructor taking both a message and a Throwable
    * signifying the root cause of the SkipPageException.
    */
+  @Test
   public void skipPageExceptionCauseMessageCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "skipPageExceptionCauseMessageCtorTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/build.xml
deleted file mode 100644
index 0f8d095c20..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClientIT.java
similarity index 59%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClientIT.java
index 68c18d6ade..fcf7c8aa7a 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,41 +24,52 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import java.io.IOException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
 /**
  * Test client for BodyContent
  */
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+  public URLClientIT() throws Exception {
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_bodycontent_web.war");
+    archive.addClasses(BodyContentClearBodyTag.class,
+            BodyContentFlushTag.class, BodyContentGetStringTag.class,
+            BodyContentReadWriteTag.class, BodyContentWriteOutTag.class,
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_bodycontent_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/bodycontent.tld", "bodycontent.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyContentClearBodyTest.jsp")), "BodyContentClearBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyContentFlushTest.jsp")), "BodyContentFlushTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyContentGetStringTest.jsp")), "BodyContentGetStringTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyContentReadWriteTest.jsp")), "BodyContentReadWriteTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyContentWriteOutTest.jsp")), "BodyContentWriteOutTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -71,6 +82,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validates that an IOException is thrown when
    * BodyContent.flush() is called.
    */
+  @Test
   public void bodyContentFlushTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodycontent_web/BodyContentFlushTest.jsp HTTP/1.1");
@@ -85,6 +97,7 @@ public void bodyContentFlushTest() throws Exception {
    * 
    * @test_Strategy: Validate that clearBuffer() works as expected.
    */
+  @Test
   public void bodyContentClearBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodycontent_web/BodyContentClearBodyTest.jsp HTTP/1.1");
@@ -101,6 +114,7 @@ public void bodyContentClearBodyTest() throws Exception {
    * bodycontent of the tag. Using the content that is read in, obtain a writer
    * and write the content to that writer.
    */
+  @Test
   public void bodyContentReadWriteTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodycontent_web/BodyContentReadWriteTest.jsp HTTP/1.1");
@@ -115,6 +129,7 @@ public void bodyContentReadWriteTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of BodyContent.writeOut().
    */
+  @Test
   public void bodyContentWriteOutTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodycontent_web/BodyContentWriteOutTest.jsp HTTP/1.1");
@@ -129,6 +144,7 @@ public void bodyContentWriteOutTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of BodyContent.getString().
    */
+  @Test
   public void bodyContentGetStringTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodycontent_web/BodyContentGetStringTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/build.xml
deleted file mode 100644
index 5894a8e34d..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-          
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClientIT.java
similarity index 67%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClientIT.java
index fe90a5c49d..7c562df7e1 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,44 +20,67 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.ContainerInteractionTag;
+import com.sun.ts.tests.jsp.common.util.MethodValidatorBean;
 
 /**
  * Test client for BodyTagSupport.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_bodytagsupp_web");
     setTestJsp("BodyTagSupportApiTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_bodytagsupp_web.war");
+    archive.addClasses(BodyContainerInteractionTag.class,
+            BodySynchronizationTag.class, GetBodyContentTestTag.class,
+            GetPreviousOutTestTag.class, SyncTEI.class,
+            JspTestUtil.class,
+            ContainerInteractionTag.class,
+            MethodValidatorBean.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_bodytagsupp_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/bodytagsupport.tld", "bodytagsupport.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyTagEmptyTagTest.jsp")), "BodyTagEmptyTagTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyTagEvalBodyBufferedTest.jsp")), "BodyTagEvalBodyBufferedTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyTagEvalBodyIncludeTest.jsp")), "BodyTagEvalBodyIncludeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyTagSkipBodyTest.jsp")), "BodyTagSkipBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyTagSupportApiTest.jsp")), "BodyTagSupportApiTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/BodyTagSupportSynchronizationTest.jsp")), "BodyTagSupportSynchronizationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetBodyContentTest.jsp")), "GetBodyContentTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetPreviousOutTest.jsp")), "GetPreviousOutTest.jsp");
+
+    return archive;
+
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -69,6 +92,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate the constructor of BodyTagSupport
    */
+  @Test
   public void bodyTagSupportCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "bodyTagSupportCtorTest");
     invoke();
@@ -82,6 +106,7 @@ public void bodyTagSupportCtorTest() throws Exception {
    * @test_Strategy: Validate the default return value of
    * BodyTagSupport.doStartTag() is EVAL_BODY_BUFFERED.
    */
+  @Test
   public void bodyTagSupportDoStartTagTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "bodyTagSupportDoStartTagTest");
     invoke();
@@ -95,6 +120,7 @@ public void bodyTagSupportDoStartTagTest() throws Exception {
    * @test_Strategy: Validate the default return value of
    * BodyTagSupport.doEndTag() is EVAL_PAGE.
    */
+  @Test
   public void bodyTagSupportDoEndTagTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "bodyTagSupportDoEndTagTest");
     invoke();
@@ -108,6 +134,7 @@ public void bodyTagSupportDoEndTagTest() throws Exception {
    * @test_Strategy: Validate the default return value of
    * BodyTagSupport.doAfterBody() is SKIP_BODY.
    */
+  @Test
   public void bodyTagSupportDoAfterBodyTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "bodyTagSupportDoAfterBodyTest");
     invoke();
@@ -121,6 +148,7 @@ public void bodyTagSupportDoAfterBodyTest() throws Exception {
    * @test_Strategy: Validate the behavior of getBodyContent(). This indirectly
    * ensures that the container properly called setBodyContent().
    */
+  @Test
   public void bodyTagSupportGetBodyContentTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodytagsupp_web/GetBodyContentTest.jsp HTTP/1.1");
@@ -135,6 +163,7 @@ public void bodyTagSupportGetBodyContentTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of getPreviousOut.
    */
+  @Test
   public void bodyTagSupportGetPreviousOutTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodytagsupp_web/GetPreviousOutTest.jsp HTTP/1.1");
@@ -153,6 +182,7 @@ public void bodyTagSupportGetPreviousOutTest() throws Exception {
    * then doInitBody() after doStartTag() is called, prior to evaluating the
    * body.
    */
+  @Test
   public void bodyTagSupportEvalBodyBufferedTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodytagsupp_web/BodyTagEvalBodyBufferedTest.jsp HTTP/1.1");
@@ -168,6 +198,7 @@ public void bodyTagSupportEvalBodyBufferedTest() throws Exception {
    * @test_Strategy: Validate that the container doesn't call setBodyContent()
    * and doInitBody() if doStartTag() returns EVAL_BODY_INCLUDE.
    */
+  @Test
   public void bodyTagSupportEvalBodyIncludeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodytagsupp_web/BodyTagEvalBodyIncludeTest.jsp HTTP/1.1");
@@ -183,6 +214,7 @@ public void bodyTagSupportEvalBodyIncludeTest() throws Exception {
    * @test_Strategy: Validate that the container doesn't call setInitBody() and
    * doInitBody() after doStartTag() returns SKIP_BODY.
    */
+  @Test
   public void bodyTagSupportSkipBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodytagsupp_web/BodyTagSkipBodyTest.jsp HTTP/1.1");
@@ -199,6 +231,7 @@ public void bodyTagSupportSkipBodyTest() throws Exception {
    * doInitBody() if the tag is empty. 1. Empty Tag1:  2. Empty Tag2:
    *  3. Non-Empty Tag2:  
    */
+  @Test
   public void bodyTagSupportEmptyTagTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodytagsupp_web/BodyTagEmptyTagTest.jsp HTTP/1.1");
@@ -214,6 +247,7 @@ public void bodyTagSupportEmptyTagTest() throws Exception {
    * 
    * @test_Strategy: Validate scripting variables are properly synchornized.
    */
+  @Test
   public void bodyTagSupportVariableSynchronizationTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_bodytagsupp_web/BodyTagSupportSynchronizationTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/build.xml
deleted file mode 100644
index 6f9bcc7ef0..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-                
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/build.xml
deleted file mode 100644
index 5353c6443a..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-  
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClientIT.java
similarity index 58%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClientIT.java
index 0efa1ef6a6..0a510a9f4e 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,44 +24,55 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.dynamicattributes;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
 /**
  * Test client for the DynamicAttributes interface.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_bodytagsupp_web");
     setTestJsp("BodyTagSupportApiTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_dynattrib_web.war");
+    archive.addClasses(DynamicAttributesTag.class, SimpleExcTag.class,
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_dynattrib_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/dynamicattributes.tld", "dynamicattributes.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SetDynamicAttributesTest.jsp")), "SetDynamicAttributesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DynamicAttributesExceptionTest.jsp")), "DynamicAttributesExceptionTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -74,6 +85,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate undeclared attributes can be set on a tag handler
    * for attributes not specified in the TLD.
    */
+  @Test
   public void dynamicAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_dynattrib_web/SetDynamicAttributesTest.jsp HTTP/1.1");
@@ -91,6 +103,7 @@ public void dynamicAttributesTest() throws Exception {
    * setDynamicAttribute(), that doStartTag() or doTag() is not called on the
    * handler.
    */
+  @Test
   public void dynamicAttributesExceptionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_dynattrib_web/DynamicAttributesExceptionTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/build.xml
deleted file mode 100644
index 3b6d41caaf..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/build.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClientIT.java
similarity index 59%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClientIT.java
index 682abcf137..f886bb072d 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,43 +24,61 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.functioninfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
+import com.sun.ts.tests.jsp.common.util.JspFunctions;
+import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
 /**
  * Test client for FunctionInfo. Implementation note, all tests are performed
  * within a TagExtraInfo class. If the test fails, a translation error will be
  * generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_functioninfo_web.war");
+    archive.addClasses(FunctionInfoTEI.class,
+            JspTestUtil.class,
+            SimpleTag.class,
+            JspFunctions.class,
+            BaseTCKExtraInfo.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_functioninfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/functioninfo.tld", "functioninfo.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetFunctionClassTest.jsp")), "GetFunctionClassTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetFunctionSignatureTest.jsp")), "GetFunctionSignatureTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetNameTest.jsp")), "GetNameTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -74,6 +92,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * information in the provided TLD and the method calls, in this case,
    * FunctionInfo.getName(), returns the expected value.
    */
+  @Test
   public void functionInfoGetNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_functioninfo_web/GetNameTest.jsp HTTP/1.1");
@@ -90,6 +109,7 @@ public void functionInfoGetNameTest() throws Exception {
    * information in the provided TLD and the method calls, in this case,
    * FunctionInfo.getFunctionClass(), returns the expected value.
    */
+  @Test
   public void functionInfoGetFunctionClassTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_functioninfo_web/GetFunctionClassTest.jsp HTTP/1.1");
@@ -106,6 +126,7 @@ public void functionInfoGetFunctionClassTest() throws Exception {
    * information in the provided TLD and the method calls, in this case,
    * FunctionInfo.getFunctionSignature(), returns the expected value.
    */
+  @Test
   public void functionInfoGetFunctionSignatureTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_functioninfo_web/GetFunctionSignatureTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/build.xml
deleted file mode 100644
index 752e26ec68..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/URLClientIT.java
similarity index 62%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/URLClientIT.java
index 89108a9cba..309f20b882 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,53 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.jspidconsumer;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_jspidconsumer_web");
     // setTestJsp("SetJspIdTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspidconsumer_web.war");
+    archive.addClasses(MultiOneTag.class, MultiTwoTag.class,
+            MultiThreeTag.class, SameJspIdTag.class, SetJspIdTag.class,
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspidconsumer_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/jspidconsumer.tld", "jspidconsumer.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SetJspIdTest.jsp")), "SetJspIdTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/MultipleJspIdTest.jsp")), "MultipleJspIdTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SameJspIdTest.jsp")), "SameJspIdTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -68,6 +80,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * the setJspId() method in a tag handler. Verify that the ID generated
    * conforms to the rules set forth in the javadoc.
    */
+  @Test
   public void setJspIdTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_jspidconsumer_web/SetJspIdTest.jsp HTTP 1.1");
@@ -84,6 +97,7 @@ public void setJspIdTest() throws Exception {
    * the setJspId() method in multiple tag handlers. Verify that each tag has a
    * unique ID. [JspConsumerIdUniqueIdString]
    */
+  @Test
   public void multipleJspIdTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_jspidconsumer_web/MultipleJspIdTest.jsp HTTP 1.1");
@@ -101,6 +115,7 @@ public void multipleJspIdTest() throws Exception {
    * page is invoked multiple times, the tag's ID does not change.
    * [JspConsumerIdUniqueIdString]
    */
+  @Test
   public void sameJspIdTest() throws Exception {
 
     for (int i = 1; i < SameJspIdTag.NUM_INVOC; ++i) {
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/build.xml
deleted file mode 100644
index 056daccc6d..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClientIT.java
similarity index 57%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClientIT.java
index fa199e7ee5..d2b48f5a5f 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,43 +20,59 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
 /**
  * Test client for TagAttributeInfo. Implementation note, all tests are
  * performed within a TagExtraInfo class. If the test fails, a translation error
  * will be generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_pagedata_web.war");
+    archive.addClasses(PageDataValidator.class, TagFilePageDataValidator.class,
+            JspTestUtil.class,
+            SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_pagedata_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/pagedata.tld", "pagedata.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/pagedatatagfile.tld", "pagedatatagfile.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/pageDataTagFileTest.tag", "tags/pageDataTagFileTest.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/template.txt", "tags/template.txt");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/PageDataTagFileTest.jsp")), "PageDataTagFileTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/PageDataTest.jsp")), "PageDataTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/template.txt")), "template.txt");
+    
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -78,6 +94,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * '%=' '%' - Custom taglib usages are passed through - the jsp:root element
    * is present - the jsp namespace is present in the jsp:root element.
    */
+  @Test
   public void pageDataTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_pagedata_web/PageDataTest.jsp HTTP/1.1");
@@ -94,6 +111,7 @@ public void pageDataTest() throws Exception {
    * 
    * @test_Strategy: same as above.
    */
+  @Test
   public void pageDataTagFileTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_pagedata_web/PageDataTagFileTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/build.xml
deleted file mode 100644
index 5d65f9f497..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/build.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-	        
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClientIT.java
similarity index 62%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClientIT.java
index ace289ca15..06e897580d 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,44 +24,88 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
 
 /**
  * Test client for the default behavior of SimpleTagSupport.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_tagadapter_web");
     setTestJsp("TagAdapterTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_simtagsupport_web.war");
+    archive.addClasses(CheckInstanceSimpleTag.class,
+            ClassicJspFragmentGetJspContext.class,
+            ClassicParent.class,
+            ClassicSkipPage.class,
+            DefaultSimpleTag.class,
+            FailingTag.class,
+            SimpleAncestor.class,
+            SimpleEmptyBody.class,
+            SimpleGetSetJspBody.class,
+            SimpleGetSetJspContext.class,
+            SimpleGetSetParent.class,
+            SimpleJspFragmentGetJspContext.class,
+            SimpleNoParent.class,
+            SimpleParentTag.class,
+            SimpleSkipPage.class,
+            SimpleSyncTag.class,
+            SyncTEI.class,
+            JspTestUtil.class,
+            SetTag.class,
+            ExpressionTest.class);
+
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_simtagsupport_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag", "tags/simpletagsupport/ClassicSkipPageTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag", "tags/simpletagsupport/SimpleSkipPageTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/simpletagsupport/Sync.tag", "tags/simpletagsupport/Sync.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/simpletagsupport.tld", "simpletagsupport.tld");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/emptySetJspBodyTest.jsp")), "emptySetJspBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/jspFragmentGetJspContextTest.jsp")), "jspFragmentGetJspContextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noParentTest.jsp")), "noParentTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportDoTagDefault.jsp")), "SimpleTagSupportDoTagDefault.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportFindAncestorTest.jsp")), "SimpleTagSupportFindAncestorTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportJspBodyTest.jsp")), "SimpleTagSupportJspBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportJspContextTest.jsp")), "SimpleTagSupportJspContextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportParentTest.jsp")), "SimpleTagSupportParentTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportSkipPageClassicTest.jsp")), "SimpleTagSupportSkipPageClassicTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportSkipPageSimpleTest.jsp")), "SimpleTagSupportSkipPageSimpleTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SimpleTagSupportVariableSynchronizationTest.jsp")), "SimpleTagSupportVariableSynchronizationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/tagHandlerCacheTest.jsp")), "tagHandlerCacheTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -76,6 +120,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * output will be displayed by the tag nested within the SimpleTagSupport
    * instance.
    */
+  @Test
   public void simpleTagSupportDoTagDefaultTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_simtagsupport_web/SimpleTagSupportDoTagDefault.jsp HTTP/1.1");
@@ -94,6 +139,7 @@ public void simpleTagSupportDoTagDefaultTest() throws Exception {
    * generated from a tag file throws a SkipPageException if an invoked Simple
    * Tag Handler throws a SkipPageException.
    */
+  @Test
   public void simpleTagSupportSkipPageExceptionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_simtagsupport_web/SimpleTagSupportSkipPageClassicTest.jsp HTTP/1.1");
@@ -113,6 +159,7 @@ public void simpleTagSupportSkipPageExceptionTest() throws Exception {
    * @test_Strategy: Validate that getJspContext() returnes a non-null value as
    * the container called setJspContext() prior to invoking doGet().
    */
+  @Test
   public void simpleTagSupportGetSetJspContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_simtagsupport_web/SimpleTagSupportJspContextTest.jsp HTTP/1.1");
@@ -128,6 +175,7 @@ public void simpleTagSupportGetSetJspContextTest() throws Exception {
    * @test_Strategy: Validate that getJspBody() returnes a non-null value as the
    * container called setJspBody() prior to invoking doGet().
    */
+  @Test
   public void simpleTagSupportGetSetJspBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_simtagsupport_web/SimpleTagSupportJspBodyTest.jsp HTTP/1.1");
@@ -144,6 +192,7 @@ public void simpleTagSupportGetSetJspBodyTest() throws Exception {
    * @test_Strategy: Validate that getParent() returnes a non-null value as the
    * container called setParent() prior to invoking doGet().
    */
+  @Test
   public void simpleTagSupportGetSetParentTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_simtagsupport_web/SimpleTagSupportParentTest.jsp HTTP/1.1");
@@ -160,6 +209,7 @@ public void simpleTagSupportGetSetParentTest() throws Exception {
    * is preformed nested within a SimpleTag handler as well as a Classic Tag
    * handler.
    */
+  @Test
   public void simpleTagSupportFindAncestorTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_simtagsupport_web/SimpleTagSupportFindAncestorTest.jsp HTTP/1.1");
@@ -177,6 +227,7 @@ public void simpleTagSupportFindAncestorTest() throws Exception {
    * for SimpleTags declared as Tags in the TLD using either TEI or through
    * variable elements, or for Tag files.
    */
+  @Test
   public void simpleTagSupportVariableSynchronizationTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_simtagsupport_web/SimpleTagSupportVariableSynchronizationTest.jsp HTTP/1.1");
@@ -192,7 +243,7 @@ public void simpleTagSupportVariableSynchronizationTest() throws Exception {
    * @test_Strategy: compare instances of a simple tag handler class across
    * different invocations.
    */
-
+  @Test
   public void tagHandlerCacheTest() throws Exception {
     String testName = "tagHandlerCacheTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -209,7 +260,7 @@ public void tagHandlerCacheTest() throws Exception {
    * @test_Strategy: If the action element is empty in the page, setJpsBody
    * method is not called at all.
    */
-
+  @Test
   public void emptySetJspBodyTest() throws Exception {
     String testName = "emptySetJspBodyTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -226,7 +277,7 @@ public void emptySetJspBodyTest() throws Exception {
    * @test_Strategy: The container invokes setParent() method only if this tag
    * invocation is nested within another tag invocation.
    */
-
+  @Test
   public void noParentTest() throws Exception {
     String testName = "noParentTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -243,7 +294,7 @@ public void noParentTest() throws Exception {
    * @test_Strategy: jspFragment.getJspContext() returns the JspContext that is
    * bound to this JspFragment.
    */
-
+  @Test
   public void jspFragmentGetJspContextTest() throws Exception {
     String testName = "jspFragmentGetJspContextTest";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml
deleted file mode 100644
index dc948e188b..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/build.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClientIT.java
similarity index 74%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClientIT.java
index 7235db29cc..420b289c1f 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,10 +24,9 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagadapter;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
 /**
  * Test client for TagAdapter. There isn't much that can be done to really test
@@ -37,36 +36,48 @@
  * throw an UnsupportedOperationException. The last test will make sure that a
  * tag nested within a SimpleTag will be passed an instance of the TagAdapter.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_tagadapter_web");
     setTestJsp("TagAdapterTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagadapter_web.war");
+    archive.addClasses(TagAdapterVerifierTag.class,
+            TASimpleTag.class,
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagadapter_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagadapter.tld", "tagadapter.tld");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagAdapterValidationTest.jsp")), "TagAdapterValidationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagAdapterTest.jsp")), "TagAdapterTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -78,6 +89,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validates the constructor of the TagAdapter class.
    */
+  @Test
   public void tagAdapterCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "tagAdapterCtorTest");
     invoke();
@@ -91,6 +103,7 @@ public void tagAdapterCtorTest() throws Exception {
    * @test_Strategy: Validates that an UnsupportedOperationException is thrown
    * if a call to TagAdapter.setPageContext() is made.
    */
+  @Test
   public void tagAdapterSetPageContextTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "tagAdapterSetPageContextTest");
     invoke();
@@ -104,6 +117,7 @@ public void tagAdapterSetPageContextTest() throws Exception {
    * @test_Strategy: Validates that an UnsupportedOperationException is thrown
    * if a call to TagAdapter.setParent() is made.
    */
+  @Test
   public void tagAdapterSetParentTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "tagAdapterSetParentTest");
     invoke();
@@ -117,6 +131,7 @@ public void tagAdapterSetParentTest() throws Exception {
    * @test_Strategy: Validates that getParent always returns
    * getAdaptee().getParent()
    */
+  @Test
   public void tagAdapterGetParentTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "tagAdapterGetParentTest");
     invoke();
@@ -130,6 +145,7 @@ public void tagAdapterGetParentTest() throws Exception {
    * @test_Strategy: Validates that an UnsupportedOperationException is thrown
    * if a call to TagAdapter.doStartTag() is made.
    */
+  @Test
   public void tagAdapterDoStartTagTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "tagAdapterDoStartTagTest");
     invoke();
@@ -143,6 +159,7 @@ public void tagAdapterDoStartTagTest() throws Exception {
    * @test_Strategy: Validates that an UnsupportedOperationException is thrown
    * if a call to TagAdapter.doEndTag() is made.
    */
+  @Test
   public void tagAdapterDoEndTagTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "tagAdapterDoEndTagTest");
     invoke();
@@ -156,6 +173,7 @@ public void tagAdapterDoEndTagTest() throws Exception {
    * @test_Strategy: Validates that an UnsupportedOperationException is thrown
    * if a call to TagAdapter.release() is made.
    */
+  @Test
   public void tagAdapterReleaseTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "tagAdapterReleaseTest");
     invoke();
@@ -174,6 +192,7 @@ public void tagAdapterReleaseTest() throws Exception {
    * UnsupportedOperationException to be thrown if an illegal method call is
    * made on the TagAdapter.
    */
+  @Test
   public void tagAdapterValidationTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagadapter_web/TagAdapterValidationTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/build.xml
deleted file mode 100644
index efd47fbeb2..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-	        
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClientIT.java
similarity index 63%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClientIT.java
index cdcb0eb076..d37c8c7dc9 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,43 +24,63 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagattributeinfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
 
 /**
  * Test client for TagAttributeInfo. Implementation note, all tests are
  * performed within a TagExtraInfo class. If the test fails, a translation error
  * will be generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
-    return super.run(args, out, err);
+
+  public URLClientIT() throws Exception {
+
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagattrinfo_web.war");
+    archive.addClasses(TagAttributeInfoTEI.class,
+            JspTestUtil.class,
+            BaseTCKExtraInfo.class,
+            SimpleTag.class);
+
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagattrinfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagattributeinfo.tld", "tagattributeinfo.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CanBeRequestTimeTest.jsp")), "CanBeRequestTimeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetIdAttribute.jsp")), "GetIdAttribute.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetNameTest.jsp")), "GetNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTypeNameTest.jsp")), "GetTypeNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IsFragmentTest.jsp")), "IsFragmentTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IsRequiredTest.jsp")), "IsRequiredTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ToStringTest.jsp")), "ToStringTest.jsp");
+    
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -72,6 +92,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate the behavior of TagAttributeInfo.getName().
    */
+  @Test
   public void tagAttributeInfoGetNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagattrinfo_web/GetNameTest.jsp HTTP/1.1");
@@ -86,6 +107,7 @@ public void tagAttributeInfoGetNameTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagAttributeInfo.getTypeName().
    */
+  @Test
   public void tagAttributeInfoGetTypeNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagattrinfo_web/GetTypeNameTest.jsp HTTP/1.1");
@@ -101,6 +123,7 @@ public void tagAttributeInfoGetTypeNameTest() throws Exception {
    * @test_Strategy: Validate the behavior of
    * TagAttributeInfo.catBeRequestTime().
    */
+  @Test
   public void tagAttributeInfoCanBeRequestTimeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagattrinfo_web/CanBeRequestTimeTest.jsp HTTP/1.1");
@@ -115,6 +138,7 @@ public void tagAttributeInfoCanBeRequestTimeTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagAttributeInfo.isRequired().
    */
+  @Test
   public void tagAttributeInfoIsRequiredTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagattrinfo_web/IsRequiredTest.jsp HTTP/1.1");
@@ -129,6 +153,7 @@ public void tagAttributeInfoIsRequiredTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagAttributeInfo.siFragment().
    */
+  @Test
   public void tagAttributeInfoIsFragmentTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagattrinfo_web/IsFragmentTest.jsp HTTP/1.1");
@@ -143,6 +168,7 @@ public void tagAttributeInfoIsFragmentTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagAttributeInfo.toString().
    */
+  @Test
   public void tagAttributeInfoToStringTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagattrinfo_web/ToStringTest.jsp HTTP/1.1");
@@ -158,6 +184,7 @@ public void tagAttributeInfoToStringTest() throws Exception {
    * @test_Strategy: Convenience static method that goes through an array of
    * TagAttributeInfo objects and looks for "id".
    */
+  @Test
   public void tagAttributeInfoGetIdAttribute() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagattrinfo_web/GetIdAttribute.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/build.xml
deleted file mode 100644
index 0a2b5da52e..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/build.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/URLClientIT.java
similarity index 59%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/URLClientIT.java
index 485d68e0c5..392017e78a 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,43 +24,60 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagdata;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
 
 /**
  * Test client for TagData. Implementation note, all tests are performed within
  * a TagExtraInfo class. If the test fails, a translation error will be
  * generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
-    return super.run(args, out, err);
+
+  public URLClientIT() throws Exception {
+
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagdata_web.war");
+    archive.addClasses(TagDataTEI.class,
+            JspTestUtil.class,
+            BaseTCKExtraInfo.class,
+            SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagdata_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagdata.tld", "tagdata.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ConstructorTest.jsp")), "ConstructorTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetAttributesTest.jsp")), "GetAttributesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetAttributeStringTest.jsp")), "GetAttributeStringTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetAttributeTest.jsp")), "GetAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SetAttributeTest.jsp")), "SetAttributeTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -72,6 +89,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate the behavior of TagData.getAttribute().
    */
+  @Test
   public void tagDataGetAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagdata_web/GetAttributeTest.jsp HTTP/1.1");
@@ -86,6 +104,7 @@ public void tagDataGetAttributeTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagData.setAttribute().
    */
+  @Test
   public void tagDataSetAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagdata_web/SetAttributeTest.jsp HTTP/1.1");
@@ -100,6 +119,7 @@ public void tagDataSetAttributeTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagData.getAttributeString().
    */
+  @Test
   public void tagDataGetAttributeStringTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagdata_web/GetAttributeStringTest.jsp HTTP/1.1");
@@ -114,6 +134,7 @@ public void tagDataGetAttributeStringTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagData.getAttributes().
    */
+  @Test
   public void tagDataGetAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagdata_web/GetAttributesTest.jsp HTTP/1.1");
@@ -128,6 +149,7 @@ public void tagDataGetAttributesTest() throws Exception {
    * 
    * @test_Strategy: validate the constructor TagData(Object[][]).
    */
+  @Test
   public void tagDataConstructorTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagdata_web/ConstructorTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/build.xml
deleted file mode 100644
index 49976f4d83..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/build.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/URLClientIT.java
similarity index 56%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/URLClientIT.java
index 55e9e8023a..5dcc860306 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,44 +24,58 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagextrainfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
 
 /**
  * Test client for TagExtraInfo. If the test fails, a translation error will be
  * generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_tagextrainfo_web");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagextrainfo_web.war");
+    archive.addClasses(TagExtraInfoTEI.class,
+            JspTestUtil.class,
+            SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagextrainfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagextrainfo.tld", "tagextrainfo.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagExtraInfoDefaultImplTest.jsp")), "TagExtraInfoDefaultImplTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagExtraInfoEmptyReturnTest.jsp")), "TagExtraInfoEmptyReturnTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagExtraInfoNonEmptyReturnTest.jsp")), "TagExtraInfoNonEmptyReturnTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagExtraInfoNullReturnTest.jsp")), "TagExtraInfoNullReturnTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -80,6 +94,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * of TagExtraInfo.validate() calls isValid(). If isValid() returns false, a
    * default ValidationMessage array is returned.
    */
+  @Test
   public void tagExtraInfoTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagextrainfo_web/TagExtraInfoNullReturnTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/build.xml
deleted file mode 100644
index d366458a4c..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-	        
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClientIT.java
similarity index 56%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClientIT.java
index 141962d470..187311b240 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,45 +24,62 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagfileinfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
 /**
  * Test client for TagFileInfo. Implementation note, all tests are performed
  * within a TagExtraInfo class. If the test fails, a translation error will be
  * generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_taginfo_web");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfileinfo_web.war");
+    archive.addClasses(TagFileInfoTEI.class,
+            JspTestUtil.class,
+            BaseTCKExtraInfo.class,
+            SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfileinfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagfileinfo.tld", "tagfileinfo.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/tagfileinfo/TagFile1.tag", "tags/tagfileinfo/TagFile1.tag");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetNameTest.jsp")), "GetNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetPathTest.jsp")), "GetPathTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagInfoTest.jsp")), "GetTagInfoTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -75,6 +92,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate TagFileInfo.getName returns the expected values
    * based on what is defined in the TLD.
    */
+  @Test
   public void tagFileInfoGetNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfileinfo_web/GetNameTest.jsp HTTP/1.1");
@@ -90,6 +108,7 @@ public void tagFileInfoGetNameTest() throws Exception {
    * @test_Strategy: Validate TagFileInfo.getPath() returns the expected values
    * based on what is defined in the TLD.
    */
+  @Test
   public void tagFileInfoGetPathTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfileinfo_web/GetPathTest.jsp HTTP/1.1");
@@ -105,6 +124,7 @@ public void tagFileInfoGetPathTest() throws Exception {
    * @test_Strategy: Validate TagFileInfo.getTagInfo() returns the expected
    * values based on what is defined in the tag file.
    */
+  @Test
   public void tagFileInfoGetTagInfoTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfileinfo_web/GetTagInfoTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/build.xml
deleted file mode 100644
index 94dd67abac..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-        
-
-	
-		
-                  
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/URLClientIT.java
similarity index 68%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/URLClientIT.java
index 1867d042e7..eaabf2f94c 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,45 +24,74 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taginfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
+import com.sun.ts.tests.common.el.api.expression.ExpressionTest;
 
 /**
  * Test client for TagInfo. Implementation note, all tests are performed within
  * a TagExtraInfo class. If the test fails, a translation error will be
  * generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+import org.junit.jupiter.api.Disabled;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_taginfo_web");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_taginfo_web.war");
+    archive.addClasses(TagInfoTEI.class,
+            JspTestUtil.class,
+            BaseTCKExtraInfo.class,
+            SimpleTag.class,
+            ExpressionTest.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_taginfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/taginfo.tld", "taginfo.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetAttributesTest.jsp")), "GetAttributesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetBodyContentTest.jsp")), "GetBodyContentTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetDisplayNameTest.jsp")), "GetDisplayNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetInfoStringTest.jsp")), "GetInfoStringTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetLargeIconTest.jsp")), "GetLargeIconTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetSmallIconTest.jsp")), "GetSmallIconTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagClassNameTest.jsp")), "GetTagClassNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagExtraInfoTest.jsp")), "GetTagExtraInfoTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagLibraryTest.jsp")), "GetTagLibraryTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagNameTest.jsp")), "GetTagNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagVariableInfosTest.jsp")), "GetTagVariableInfosTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/HasDynamicAttributesTest.jsp")), "HasDynamicAttributesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SetTagExtraInfoTest.jsp")), "SetTagExtraInfoTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SetTagLibraryTest.jsp")), "SetTagLibraryTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -75,6 +104,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate TagInfo.getTagName() returns the expected values
    * based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetTagNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetTagNameTest.jsp HTTP/1.1");
@@ -90,6 +120,7 @@ public void tagInfoGetTagNameTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getAttributes() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetAttributesTest.jsp HTTP/1.1");
@@ -106,6 +137,7 @@ public void tagInfoGetAttributesTest() throws Exception {
    * values based on what is defined in the TLD. This implicitly tests
    * TagInfo.setTagExtraInfo().
    */
+  @Test
   public void tagInfoGetTagExtraInfoTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetTagExtraInfoTest.jsp HTTP/1.1");
@@ -121,6 +153,7 @@ public void tagInfoGetTagExtraInfoTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getTagClassName() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetTagClassNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetTagClassNameTest.jsp HTTP/1.1");
@@ -136,6 +169,7 @@ public void tagInfoGetTagClassNameTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getBodyContent() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetBodyContentTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetBodyContentTest.jsp HTTP/1.1");
@@ -151,6 +185,7 @@ public void tagInfoGetBodyContentTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getInfoString() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetInfoStringTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetInfoStringTest.jsp HTTP/1.1");
@@ -167,6 +202,7 @@ public void tagInfoGetInfoStringTest() throws Exception {
    * values based on what is defined in the TLD. This implicitly tests
    * TagInfo.setTagLibrary().
    */
+  @Test
   public void tagInfoGetTagLibraryTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetTagLibraryTest.jsp HTTP/1.1");
@@ -182,6 +218,7 @@ public void tagInfoGetTagLibraryTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getDisplayName() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetDisplayNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetDisplayNameTest.jsp HTTP/1.1");
@@ -197,6 +234,7 @@ public void tagInfoGetDisplayNameTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getSmallIconName() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetSmallIconTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetSmallIconTest.jsp HTTP/1.1");
@@ -212,6 +250,7 @@ public void tagInfoGetSmallIconTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getLargeIconName() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetLargeIconTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetLargeIconTest.jsp HTTP/1.1");
@@ -227,6 +266,7 @@ public void tagInfoGetLargeIconTest() throws Exception {
    * @test_Strategy: Validate TagInfo.getTagVariableInfos() returns the expected
    * values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoGetTagVariableInfosTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/GetTagVariableInfosTest.jsp HTTP/1.1");
@@ -242,6 +282,7 @@ public void tagInfoGetTagVariableInfosTest() throws Exception {
    * @test_Strategy: Validate TagInfo.hasDynamicAttributes() returns the
    * expected values based on what is defined in the TLD.
    */
+  @Test
   public void tagInfoHasDynamicAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/HasDynamicAttributesTest.jsp HTTP/1.1");
@@ -255,6 +296,8 @@ public void tagInfoHasDynamicAttributesTest() throws Exception {
    * on the associated TagExtraInfo class. This method should be exercised with
    * a jsp 1.1 tld. See tagInfoConstructor11Test.
    */
+  // @Test
+  // @Disabled("Disabled in legacy")
   public void tagInfoIsValidTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/IsValidTest.jsp HTTP/1.1");
@@ -269,6 +312,7 @@ public void tagInfoIsValidTest() throws Exception {
    * 
    * @test_Strategy: Set the instance for extra tag information
    */
+  @Test
   public void tagInfoSetTagExtraInfoTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/SetTagExtraInfoTest.jsp HTTP/1.1");
@@ -283,6 +327,7 @@ public void tagInfoSetTagExtraInfoTest() throws Exception {
    * 
    * @test_Strategy: Set the TagLibraryInfo property.
    */
+  @Test
   public void tagInfoSetTagLibraryTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taginfo_web/SetTagLibraryTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/build.xml
deleted file mode 100644
index ae6d4e7147..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-        
-
-	
-		
-                  
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/URLClientIT.java
similarity index 67%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/URLClientIT.java
index 5741afb545..773c9d3da1 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,45 +24,76 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taglibraryinfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.JspFunctions;
+import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
 
 /**
  * Test client for TagLibraryInfo. Implementation note, all tests are performed
  * within a TagExtraInfo class. If the test fails, a translation error will be
  * generated and a ValidationMessage array will be returned.
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_tagvarinfo_web");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_taglibinfo_web.war");
+    archive.addClasses(TagLibraryInfoTEI.class,
+            JspTestUtil.class,
+            JspFunctions.class,
+            BaseTCKExtraInfo.class,
+            SimpleTag.class);
+
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_taglibinfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/taglibinfo.tld", "taglibinfo.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/taglibinfo2.tld", "taglibinfo2.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/taglibinfo/TagFile1.tag", "tags/taglibinfo/TagFile1.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/taglibinfo/TagFile2.tag", "tags/taglibinfo/TagFile2.tag");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetFunctionsTest.jsp")), "GetFunctionsTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetFunctionTest.jsp")), "GetFunctionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetInfoStringTest.jsp")), "GetInfoStringTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetPrefixStringTest.jsp")), "GetPrefixStringTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetReliableURNTest.jsp")), "GetReliableURNTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetRequiredVersionTest.jsp")), "GetRequiredVersionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetShortNameTest.jsp")), "GetShortNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagFilesTest.jsp")), "GetTagFilesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagFileTest.jsp")), "GetTagFileTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagLibraryInfosTest.jsp")), "GetTagLibraryInfosTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagsTest.jsp")), "GetTagsTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetTagTest.jsp")), "GetTagTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetURITest.jsp")), "GetURITest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -75,6 +106,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate that TagLibaryInfo.getURI() returns the URI as
    * defined by the taglib directive within a JSP page.
    */
+  @Test
   public void tagLibraryInfoGetURITest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetURITest.jsp HTTP/1.1");
@@ -91,6 +123,7 @@ public void tagLibraryInfoGetURITest() throws Exception {
    * prefix as specified by the prefix attribute of the taglib directive within
    * a JSP page.
    */
+  @Test
   public void tagLibraryInfoGetPrefixStringTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetPrefixStringTest.jsp HTTP/1.1");
@@ -107,6 +140,7 @@ public void tagLibraryInfoGetPrefixStringTest() throws Exception {
    * short name of the tag library as specified by the <short-name>
    * element in a TLD.
    */
+  @Test
   public void tagLibraryInfoGetShortNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetShortNameTest.jsp HTTP/1.1");
@@ -122,6 +156,7 @@ public void tagLibraryInfoGetShortNameTest() throws Exception {
    * @testStrategy: Validate that TagLibraryInfo.getShortName() returns the uri
    * of the tag library as specified by the <uri> element in a TLD.
    */
+  @Test
   public void tagLibraryInfoGetReliableURNTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetReliableURNTest.jsp HTTP/1.1");
@@ -138,6 +173,7 @@ public void tagLibraryInfoGetReliableURNTest() throws Exception {
    * description of the tag library as specified by the <description>
    * element in a TLD.
    */
+  @Test
   public void tagLibraryInfoGetInfoStringTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetInfoStringTest.jsp HTTP/1.1");
@@ -154,6 +190,7 @@ public void tagLibraryInfoGetInfoStringTest() throws Exception {
    * the require version of the tag library as specified by the
    * <required-version> element in a TLD.
    */
+  @Test
   public void tagLibraryInfoGetRequiredVersionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetRequiredVersionTest.jsp HTTP/1.1");
@@ -170,6 +207,7 @@ public void tagLibraryInfoGetRequiredVersionTest() throws Exception {
    * TagInfo objects based off the tags defined by the <tag> elements in a
    * TLD.
    */
+  @Test
   public void tagLibraryInfoGetTagsTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetTagsTest.jsp HTTP/1.1");
@@ -186,6 +224,7 @@ public void tagLibraryInfoGetTagsTest() throws Exception {
    * of TagFileInfo objects based off the tags files defined by the
    * <tag-file> elements in a TLD.
    */
+  @Test
   public void tagLibraryInfoGetTagFilesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetTagFilesTest.jsp HTTP/1.1");
@@ -201,6 +240,7 @@ public void tagLibraryInfoGetTagFilesTest() throws Exception {
    * @testStrategy: Validate that TagLibraryInfo.getTag() returns a TagInfo
    * object based off the provided discriminate.
    */
+  @Test
   public void tagLibraryInfoGetTagTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetTagTest.jsp HTTP/1.1");
@@ -216,6 +256,7 @@ public void tagLibraryInfoGetTagTest() throws Exception {
    * @testStrategy: Validate that TagLibraryInfo.getTagFile() returns a
    * TagFileInfo object based off the provided discriminate.
    */
+  @Test
   public void tagLibraryInfoGetTagFileTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetTagFileTest.jsp HTTP/1.1");
@@ -232,6 +273,7 @@ public void tagLibraryInfoGetTagFileTest() throws Exception {
    * of FunctionInfo objects based off the functions defined by the
    * <function> elements in a TLD.
    */
+  @Test
   public void tagLibraryInfoGetFunctionsTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetFunctionsTest.jsp HTTP/1.1");
@@ -247,6 +289,7 @@ public void tagLibraryInfoGetFunctionsTest() throws Exception {
    * @testStrategy: Validate that TagLibraryInfo.getFunction() returns a
    * FunctionInfo object based off the provided discriminate.
    */
+  @Test
   public void tagLibraryInfoGetFunctionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetFunctionTest.jsp HTTP/1.1");
@@ -262,6 +305,7 @@ public void tagLibraryInfoGetFunctionTest() throws Exception {
    * @testStrategy: Validate TagLibaryInfo.getTagLibraryInfos() returns an array
    * of TagLibraryInfo objects for all taglibraries declared in the JSP.
    */
+  @Test
   public void tagLibraryInfoGetTagLibraryInfosTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibinfo_web/GetTagLibraryInfosTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/build.xml
deleted file mode 100644
index e84678d549..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-	        
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/URLClientIT.java
similarity index 61%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/URLClientIT.java
index f5501d005c..4f353b4304 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,40 +24,51 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taglibraryvalidator;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_taglibvalidator_web");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_taglibvalidator_web.war");
+    archive.addClasses(APIValidator.class, FailingValidator.class,
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_taglibvalidator_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/taglibvalfail.tld", "taglibvalfail.tld");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/taglibvalidator.tld", "taglibvalidator.tld");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TLVTranslationErrorTest.jsp")), "TLVTranslationErrorTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagLibraryValidatorTest.jsp")), "TagLibraryValidatorTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -75,6 +86,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * a null return value from validate() indicates the page is valid, thus no
    * translation error will occur.
    */
+  @Test
   public void tagLibraryValidatorAPITest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibvalidator_web/TagLibraryValidatorTest.jsp HTTP/1.1");
@@ -95,6 +107,7 @@ public void tagLibraryValidatorAPITest() throws Exception {
    * method is called. This also validates the use of the ValidationMessage
    * class.
    */
+  @Test
   public void tagLibraryValidatorTranslationFailureTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_taglibvalidator_web/TLVTranslationErrorTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/build.xml
deleted file mode 100644
index 72cbe8c5ff..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClientIT.java
similarity index 73%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClientIT.java
index 580ae0fbdc..79a47d7dc3 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,44 +24,67 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.MethodValidatorBean;
 
 /**
  * Test client for Container interaction with objects implementing Tag..
  */
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_tagsupport_web");
     setTestJsp("TagSupportApiTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagsupport_web.war");
+    archive.addClasses(ContainerInteractionTag.class,
+            FindAncestorTag.class, InitializationTag.class,
+            ParentTag.class, SynchronizationTag.class,
+            JspTestUtil.class,
+            MethodValidatorBean.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagsupport_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagsupport.tld", "tagsupport.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DoAfterBodyEvalBodyAgainTest.jsp")), "DoAfterBodyEvalBodyAgainTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DoAfterBodySkipBodyTest.jsp")), "DoAfterBodySkipBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DoEndTagEvalPageTest.jsp")), "DoEndTagEvalPageTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DoEndTagSkipPageTest.jsp")), "DoEndTagSkipPageTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DoStartEvalBodyIncludeTest.jsp")), "DoStartEvalBodyIncludeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DoStartSkipBodyTest.jsp")), "DoStartSkipBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/FindAncestorTest.jsp")), "FindAncestorTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/MethodValidation.jsp")), "MethodValidation.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagInitializationTest.jsp")), "TagInitializationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagSupportApiTest.jsp")), "TagSupportApiTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagSupportSynchronizationTest.jsp")), "TagSupportSynchronizationTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -79,6 +102,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * parent Tag (if any), and all attributes must be set prior to calling
    * doStartTag().
    */
+  @Test
   public void tagSupportTagInitializationTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/TagInitializationTest.jsp HTTP/1.1");
@@ -97,6 +121,7 @@ public void tagSupportTagInitializationTest() throws Exception {
    * body shouldn't be present in the stream after the flush. This also performs
    * validation on the method sequence called by the container.
    */
+  @Test
   public void tagSupportDoStartEvalBodyIncludeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/DoStartEvalBodyIncludeTest.jsp HTTP/1.1");
@@ -114,6 +139,7 @@ public void tagSupportDoStartEvalBodyIncludeTest() throws Exception {
    * the tag is not included in the current out as the body related methods are
    * not called..
    */
+  @Test
   public void tagSupportDoStartSkipBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/DoStartSkipBodyTest.jsp HTTP/1.1");
@@ -130,6 +156,7 @@ public void tagSupportDoStartSkipBodyTest() throws Exception {
    * @test_Strategy: Validate the doAfterBody() is called exactly once when
    * doStartTag() returns EVAL_BODY_INCLUDE and doAfterBody() returns SKIP_BODY.
    */
+  @Test
   public void tagSupportDoAfterBodySkipBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/DoAfterBodySkipBodyTest.jsp HTTP/1.1");
@@ -147,6 +174,7 @@ public void tagSupportDoAfterBodySkipBodyTest() throws Exception {
    * @test_Strategy: Validate the doAfterBody() is called subsequent of
    * doAfterBody() being called and returning EVAL_BODY_AGAIN.
    */
+  @Test
   public void tagSupportDoAfterBodyEvalBodyAgainTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/DoAfterBodyEvalBodyAgainTest.jsp HTTP/1.1");
@@ -166,6 +194,7 @@ public void tagSupportDoAfterBodyEvalBodyAgainTest() throws Exception {
    * SKIP_PAGE. This also ensures that doEndTag will not be called in any parent
    * tags.
    */
+  @Test
   public void tagSupportDoEndTagSkipPageTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/DoEndTagSkipPageTest.jsp HTTP/1.1");
@@ -189,6 +218,7 @@ public void tagSupportDoEndTagSkipPageTest() throws Exception {
    * @test_Strategy: Validate that if doEndTag() returns EVAL_PAGE, the page
    * continues to evaluate.
    */
+  @Test
   public void tagSupportDoEndTagEvalPageTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/DoEndTagEvalPageTest.jsp HTTP/1.1");
@@ -205,6 +235,7 @@ public void tagSupportDoEndTagEvalPageTest() throws Exception {
    * @test_Strategy: Validate the behavior of findAncestorWithClass when test
    * tag is nested with multiple tag instances of the same type.
    */
+  @Test
   public void tagSupportFindAncestorWithClassTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/FindAncestorTest.jsp HTTP/1.1");
@@ -220,6 +251,7 @@ public void tagSupportFindAncestorWithClassTest() throws Exception {
    * @test_Strategy: Validate the default return value of
    * TagSupport.doStartTag().
    */
+  @Test
   public void tagSupportDoStartTagDefaultValueTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "doStartTagTest");
     invoke();
@@ -232,6 +264,7 @@ public void tagSupportDoStartTagDefaultValueTest() throws Exception {
    * 
    * @test_Strategy: Validate the default return value of TagSupport.doEndTag().
    */
+  @Test
   public void tagSupportDoEndTagDefaultValueTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "doEndTagTest");
     invoke();
@@ -245,6 +278,7 @@ public void tagSupportDoEndTagDefaultValueTest() throws Exception {
    * @test_Strategy: Validate the default return value of
    * TagSupport.doAfterBody().
    */
+  @Test
   public void tagSupportDoAfterBodyDefaultValueTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "doAfterBodyTest");
     invoke();
@@ -258,6 +292,7 @@ public void tagSupportDoAfterBodyDefaultValueTest() throws Exception {
    * @test_Strategy: Validate the behavior of TagSupport.setValue() and
    * TagSupport.getValue().
    */
+  @Test
   public void tagSupportGetSetValueTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "setGetValue");
     invoke();
@@ -270,6 +305,7 @@ public void tagSupportGetSetValueTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagSupport.getValues().
    */
+  @Test
   public void tagSupportGetValuesTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "getValues");
     invoke();
@@ -282,6 +318,7 @@ public void tagSupportGetValuesTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of TagSupport.removeValue().
    */
+  @Test
   public void tagSupportRemoveValueTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "removeValue");
     invoke();
@@ -295,6 +332,7 @@ public void tagSupportRemoveValueTest() throws Exception {
    * @test_Strategy: Validate scripting variables are synchronized at the proper
    * locations by the container.
    */
+  @Test
   public void tagSupportVariableSynchronizationTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagsupport_web/TagSupportSynchronizationTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/build.xml
deleted file mode 100644
index c7e65261f0..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClientIT.java
similarity index 70%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClientIT.java
index 3c762f1b67..88b6ea9ee7 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,10 +24,11 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagvariableinfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
 
 /**
  * Test client for TagVariableInfo. Implementation note, all tests are performed
@@ -35,35 +36,51 @@
  * generated and a ValidationMessage array will be returned.
  */
 
-public class URLClient extends AbstractUrlClient {
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_tagvarinfo_web");
 
-    return super.run(args, out, err);
+    }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagvarinfo_web.war");
+    archive.addClasses(TagVarInfoTEI.class,
+            JspTestUtil.class,
+            BaseTCKExtraInfo.class,
+            SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagvarinfo_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagvarinfo.tld", "tagvarinfo.tld");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetClassNameTest.jsp")), "GetClassNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetDeclareTest.jsp")), "GetDeclareTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetNameFromAttributeTest.jsp")), "GetNameFromAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetNameGivenTest.jsp")), "GetNameGivenTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/GetScopeTest.jsp")), "GetScopeTest.jsp");
+
+    return archive;
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -78,6 +95,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * objects created at translation time return the expected values when calling
    * getClassName(). A translation error will occur if the test fails.
    */
+  @Test
   public void tagVariableInfoGetClassNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagvarinfo_web/GetClassNameTest.jsp HTTP/1.1");
@@ -97,6 +115,7 @@ public void tagVariableInfoGetClassNameTest() throws Exception {
    * objects created at translation time return the expected values when calling
    * getNameGiven(). A translation error will occur if the test fails.
    */
+  @Test
   public void tagVariableInfoGetNameGivenTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagvarinfo_web/GetNameGivenTest.jsp HTTP/1.1");
@@ -116,6 +135,7 @@ public void tagVariableInfoGetNameGivenTest() throws Exception {
    * objects created at translation time return the expected values when calling
    * getNameFromAttribute(). A translation error will occur if the test fails.
    */
+  @Test
   public void tagVariableInfoGetNameFromAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagvarinfo_web/GetNameFromAttributeTest.jsp HTTP/1.1");
@@ -135,6 +155,7 @@ public void tagVariableInfoGetNameFromAttributeTest() throws Exception {
    * objects created at translation time return the expected values when calling
    * getDeclare(). A translation error will occur if the test fails.
    */
+  @Test
   public void tagVariableInfoGetDeclareTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagvarinfo_web/GetDeclareTest.jsp HTTP/1.1");
@@ -154,6 +175,7 @@ public void tagVariableInfoGetDeclareTest() throws Exception {
    * objects created at translation time return the expected values when calling
    * getScope(). A translation error will occur if the test fails.
    */
+  @Test
   public void tagVariableInfoGetScopeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagvarinfo_web/GetScopeTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/build.xml
deleted file mode 100644
index 5bf63324e4..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/build.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/URLClientIT.java
index ecfd2549da..88087091d9 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,44 +24,55 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.trycatchfinally;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
 /**
  * Test client for TryCatchFinally tag tests.
  */
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_varinfo_web");
     setTestJsp("VariableInfoTest");
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tcfinally_web.war");
+    archive.addClasses(ResultVerifierBean.class,
+            TCFTestTag.class, ThrowTag.class,
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tcfinally_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/trycatchfinally.tld", "trycatchfinally.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TryCatchFinallyTest.jsp")), "TryCatchFinallyTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -74,6 +85,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate the behavior of the container when a tag
    * implements the TryCatchFinally interface.
    */
+  @Test
   public void tryCatchFinallyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tcfinally_web/TryCatchFinallyTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/build.xml
deleted file mode 100644
index b082258103..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/build.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClientIT.java
similarity index 66%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClientIT.java
index ab29cf3d8e..c46933cc00 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,49 @@
 
 package com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.variableinfo;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_varinfo_web");
     setTestJsp("VariableInfoTest");
 
-    return super.run(args, out, err);
-  }
+    }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_varinfo_web.war");
+    archive.addClasses(
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_varinfo_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/VariableInfoTest.jsp")), "VariableInfoTest.jsp");
+
+    return archive;
+  }
 
+  
   /* Run tests */
 
   // ============================================ Tests ======
@@ -66,6 +74,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate the construction of the VariableInfo object.
    */
+  @Test
   public void variableInfoCtorTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "variableInfoCtorTest");
     invoke();
@@ -78,6 +87,7 @@ public void variableInfoCtorTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of VariableInfo.getVarName().
    */
+  @Test
   public void variableInfoGetVarNameTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "variableInfoGetVarNameTest");
     invoke();
@@ -90,6 +100,7 @@ public void variableInfoGetVarNameTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of VariableInfo.getClassName().
    */
+  @Test
   public void variableInfoGetClassNameTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "variableInfoGetClassNameTest");
     invoke();
@@ -102,6 +113,7 @@ public void variableInfoGetClassNameTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of VariableInfo.getDeclare().
    */
+  @Test
   public void variableInfoGetDeclareTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "variableInfoGetDeclareTest");
     invoke();
@@ -114,6 +126,7 @@ public void variableInfoGetDeclareTest() throws Exception {
    * 
    * @test_Strategy: Validate the behavior of VariableInfo.getScopeTest();
    */
+  @Test
   public void variableInfoGetScopeTest() throws Exception {
     TEST_PROPS.setProperty(APITEST, "variableInfoGetScopeTest");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/build.xml
deleted file mode 100644
index 3404712f15..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-	
-	
-	
-
-	
-		
-                  
-                  
-		
-		
-	
-
-        
-          
-        
-
-
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/common/client/AbstractUrlClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/common/client/AbstractUrlClient.java
index 52326d186b..68c60bd2f1 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/common/client/AbstractUrlClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/common/client/AbstractUrlClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,11 +20,45 @@
 import com.sun.ts.tests.common.webclient.WebTestCase;
 import com.sun.ts.tests.common.webclient.http.HttpRequest;
 
+import java.net.URL;
+
+import java.util.stream.Collectors;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.lang.System.Logger;
+
 /**
  * Base client for JSP tests.
  */
 public abstract class AbstractUrlClient extends BaseUrlClient {
 
+  private static final Logger logger = System.getLogger(AbstractUrlClient.class.getName());
+
+  @BeforeEach
+  void logStartTest(TestInfo testInfo) {
+    logger.log(Logger.Level.INFO, "STARTING TEST : "+testInfo.getDisplayName());
+  }
+
+  @AfterEach
+  void logFinishTest(TestInfo testInfo) {
+    logger.log(Logger.Level.INFO, "FINISHED TEST : "+testInfo.getDisplayName());
+  }
+
+
+  @ArquillianResource
+	@OperateOnDeployment("_DEFAULT_")
+	public URL url;
+
   /**
    * Identifier for a set of properties to be used for API Tests.
    */
@@ -50,6 +84,16 @@ public abstract class AbstractUrlClient extends BaseUrlClient {
    */
   private String _jspName = null;
 
+  protected InputStream goldenFileStream = null;
+
+  public InputStream getGoldenFileStream() {
+    return goldenFileStream;
+  }
+
+  public void setGoldenFileStream(InputStream gfStream) {
+    goldenFileStream = gfStream;
+  }
+
   /**
    * Sets the test properties for this testCase.
    *
@@ -59,11 +103,44 @@ public abstract class AbstractUrlClient extends BaseUrlClient {
   protected void setTestProperties(WebTestCase testCase) {
 
     setStandardProperties(TEST_PROPS.getProperty(STANDARD), testCase);
+    setGoldenFileStreamProperty(testCase, goldenFileStream);
     setApiTestProperties(TEST_PROPS.getProperty(APITEST), testCase);
     setApiTest1Properties(TEST_PROPS.getProperty(APITEST1), testCase);
     super.setTestProperties(testCase);
   }
 
+  private void setGoldenFileStreamProperty(WebTestCase testCase, InputStream gfStream) {
+    testCase.setGoldenFileStream(gfStream);
+  }
+
+  protected boolean isNullOrEmpty(String val) {
+    if (val == null || val.equals("")) {
+      return true;
+    }
+    return false;
+  }
+
+  @BeforeEach
+  public void setup() throws Exception {
+
+    logger.log(Logger.Level.INFO, "setup method AbstractUrlClient");
+
+    if (url == null){
+      throw new Exception(
+          "[AbstractUrlClient] The url was not injected");
+    }
+
+		String hostname = url.getHost();
+		String portnum = Integer.toString(url.getPort());
+
+		assertFalse(isNullOrEmpty(hostname), "[AbstractUrlClient] 'webServerHost' was not set in the properties.");
+		_hostname = hostname.trim();
+		assertFalse(isNullOrEmpty(portnum), "[AbstractUrlClient] 'webServerPort' was not set in the properties.");
+		_port = Integer.parseInt(portnum.trim());
+
+    logger.log(Logger.Level.INFO, "[AbstractUrlClient] Test setup OK");
+  }
+
   /**
    * Sets the name of the JSP when building the request.
    *
@@ -183,4 +260,11 @@ private static String getApiTestRequest(String contextRoot, String jspName,
     sb.append(testName).append(HTTP11);
     return sb.toString();
   }
+
+  public static String toString(InputStream inStream) throws IOException{
+    try (BufferedReader bufReader = new BufferedReader(new InputStreamReader(inStream, StandardCharsets.UTF_8))) {
+      return bufReader.lines().collect(Collectors.joining(System.lineSeparator()));
+    }
+  }
+
 }
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/lib/implementation/sun/common/SunRIURL.java b/jsp/src/main/java/com/sun/ts/tests/jsp/lib/implementation/sun/common/SunRIURL.java
new file mode 100644
index 0000000000..753633ecab
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/lib/implementation/sun/common/SunRIURL.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.ts.tests.jsp.lib.implementation.sun.common;
+
+import java.net.*;
+import com.sun.ts.lib.util.*;
+import com.sun.ts.lib.porting.*;
+
+/**
+ * This is a J2EE Reference specific implementation of the TSURLInterface which
+ * is to be used for J2EE-TS testing. TS tests use this interface to obtain the
+ * URL String to use to access a given web component. If a given J2EE Server
+ * implmentation requires that URLs be created in a different manner, then this
+ * implementation can be replaced.
+ *
+ * @author Kyle Grucci
+ */
+public class SunRIURL implements TSURLInterface {
+  private URL url = null;
+
+  /**
+   * This method is called by TS tests to get the URL to use to access a given
+   * web component.
+   *
+   * @param protocol
+   *          - the name of the protocol.
+   * @param host
+   *          - the name of the host.
+   * @param port
+   *          - the port number.
+   * @param file
+   *          - the host file.
+   * @return a valid URL object.
+   */
+  public URL getURL(String protocol, String host, int port, String file)
+      throws MalformedURLException {
+    try {
+      url = new URL(protocol, host, port, file);
+    } catch (MalformedURLException e) {
+      TestUtil.logErr("Failed during URL creation", e);
+      throw e;
+    }
+    return url;
+  }
+
+  /**
+   * This method is called by TS tests to get the URL to use to access a given
+   * web component.
+   *
+   * @param protocol
+   *          - the name of the protocol.
+   * @param host
+   *          - the name of the host.
+   * @param port
+   *          - the port number.
+   * @param file
+   *          - the host file.
+   * @return a valid URL as a String.
+   */
+  public String getURLString(String protocol, String host, int port,
+      String file) {
+    if (file.startsWith("/"))
+      return protocol + "://" + host + ":" + port + file;
+    else
+      return protocol + "://" + host + ":" + port + "/" + file;
+  }
+
+  /**
+   * This method is called by TS tests to get the request string to use to
+   * access a given web component.
+   *
+   * @param request
+   *          - the request file.
+   * @return a valid String object.
+   */
+  public String getRequest(String request) {
+    return request;
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/charsequence/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/charsequence/URLClientIT.java
similarity index 63%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/charsequence/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/charsequence/URLClientIT.java
index 5bb305de2b..831151e837 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/charsequence/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/charsequence/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,34 +20,52 @@
 
 package com.sun.ts.tests.jsp.spec.configuration.charsequence;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-public class URLClient extends AbstractUrlClient {
   private static final String CONTEXT_ROOT = "/jsp_config_charsequence_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
     setGeneralURI("/jsp/spec/configuration/charsequence");
     setContextRoot(CONTEXT_ROOT);
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_charsequence_web.war");
+    archive.addClasses(DeferredSyntaxAllowedAsLiteralTag.class,
+            JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_charsequence_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/config_charsequence.tld", "config_charsequence.tld");    
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp")), "noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noDeferredSyntaxAllowedAsLiteralActionTest.jsp")), "noDeferredSyntaxAllowedAsLiteralActionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp")), "deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredSyntaxAllowedAsLiteralTrueActionTest.jsp")), "deferredSyntaxAllowedAsLiteralTrueActionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp")), "deferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredSyntaxAllowedAsLiteralFalseActionTest.jsp")), "deferredSyntaxAllowedAsLiteralFalseActionTest.jsp");
+    
+    return archive;
   }
 
   /*
@@ -68,8 +86,11 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * sequence is treated as literal characters.
    * [DeferredSyntaxAllowedAsLiteralElement]
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralTrueTemplateTextTest()
       throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD,
         "deferredSyntaxAllowedAsLiteralTrueTemplateTextTest");
     invoke();
@@ -85,6 +106,7 @@ public void deferredSyntaxAllowedAsLiteralTrueTemplateTextTest()
    * Verify that when the character sequence "#{" appears in template text, an
    * internal server error results. [TranslationError#{Sequence]
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralFalseTemplateTextTest()
       throws Exception {
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT
@@ -104,7 +126,10 @@ public void deferredSyntaxAllowedAsLiteralFalseTemplateTextTest()
    * action, the sequence is treated as literal characters.
    * [DeferredSyntaxAllowedAsLiteralElement]
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralTrueActionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/deferredSyntaxAllowedAsLiteralTrueActionTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD,
         "deferredSyntaxAllowedAsLiteralTrueActionTest");
     invoke();
@@ -121,7 +146,10 @@ public void deferredSyntaxAllowedAsLiteralTrueActionTest() throws Exception {
    * an action, and the tld does not specify a deferred-value element for the
    * attribute, an internal server error results. [TranslationError#{Sequence]
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralFalseActionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT
         + "/deferredSyntaxAllowedAsLiteralFalseActionTest.jsp HTTP/1.1");
     TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
@@ -138,6 +166,7 @@ public void deferredSyntaxAllowedAsLiteralFalseActionTest() throws Exception {
    * when the character sequence "#{" appears in template text, an internal
    * server error results. [TranslationError#{Sequence]
    */
+  @Test
   public void noDeferredSyntaxAllowedAsLiteralTemplateTextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT
         + "/noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp HTTP/1.1");
@@ -156,6 +185,7 @@ public void noDeferredSyntaxAllowedAsLiteralTemplateTextTest() throws Exception
    * and the tld does not specify a deferred-value element for the attribute, an
    * internal server error results. [TranslationError#{Sequence]
    */
+  @Test
   public void noDeferredSyntaxAllowedAsLiteralActionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT
         + "/noDeferredSyntaxAllowedAsLiteralActionTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/URLClientIT.java
similarity index 54%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/URLClientIT.java
index cccc5ec56f..e9ee679c16 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,34 +24,97 @@
 
 package com.sun.ts.tests.jsp.spec.configuration.elevaluation;
 
-import java.io.PrintWriter;
+import java.lang.System.Logger;
+import java.net.URL;
 
-import com.sun.javatest.Status;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+  private static final Logger logger = System.getLogger(URLClientIT.class.getName());
+
+  public URLClientIT() throws Exception {
 
     setGeneralURI("/jsp/spec/configuration/elevaluation");
     setContextRoot("/jsp_config_eleval_web");
 
-    return super.run(args, out, err);
+  }
+
+  public void setup2() throws Exception {
+
+    logger.log(Logger.Level.INFO, "setup2 method URLClientIT");
+
+    if (url2 == null){
+      throw new Exception(
+          "[URLClientIT] The url was not injected");
+    }
+
+    String hostname = url2.getHost();
+    String portnum = Integer.toString(url2.getPort()); 
+
+		assertFalse(isNullOrEmpty(hostname), "[URLClientIT] 'webServerHost' was not set in the properties.");
+		_hostname = hostname.trim();
+		assertFalse(isNullOrEmpty(portnum), "[URLClientIT] 'webServerPort' was not set in the properties.");
+		_port = Integer.parseInt(portnum.trim());
+
+    logger.log(Logger.Level.INFO, "[URLClientIT] Test setup2 OK");
+
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_eleval_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_eleval_web.xml"));
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/compat13/ElCompatTest.jsp")), "compat13/ElCompatTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elconffalse/ElEvaluationTest.jsp")), "elconffalse/ElEvaluationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elconffalsex/ElEvaluationTest.jspx")), "elconffalsex/ElEvaluationTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elconftrue/ElEvaluationTest.jsp")), "elconftrue/ElEvaluationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elconftruex/ElEvaluationTest.jspx")), "elconftruex/ElEvaluationTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elpagefalse/ElEvaluationTest.jsp")), "elpagefalse/ElEvaluationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elpagefalsex/ElEvaluationTest.jspx")), "elpagefalsex/ElEvaluationTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elpagetrue/ElEvaluationTest.jsp")), "elpagetrue/ElEvaluationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elpagetruex/ElEvaluationTest.jspx")), "elpagetruex/ElEvaluationTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elunspec/ElEvaluationTest.jsp")), "elunspec/ElEvaluationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elunspecx/ElEvaluationTest.jspx")), "elunspecx/ElEvaluationTest.jspx");
+  
+    return archive;
+
+  }
+
+  @ArquillianResource
+  @OperateOnDeployment("jsp_config_eleval23_web") 
+  public URL url2;
+
+
+  @Deployment(testable = false, name="jsp_config_eleval23_web")
+  public static WebArchive createDeployment23() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_eleval23_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_eleval23_web.xml"));
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/compat13/ElCompatTest.jsp")), "ElCompatTest.jsp");
+  
+    return archive;
+
   }
 
   /*
@@ -72,6 +135,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * evaluated by the container. This validates both JSPs in standard syntax and
    * JSP documents.
    */
+  @Test
   public void elEvaluationUnspecifiedTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_eleval_web/elunspec/ElEvaluationTest.jsp HTTP/1.1");
@@ -94,6 +158,7 @@ public void elEvaluationUnspecifiedTest() throws Exception {
    * expressions will be evaluated. This validates both JSPs in standard syntax
    * and JSP documents.
    */
+  @Test
   public void elEvaluationConfigurationFalseTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_eleval_web/elconffalse/ElEvaluationTest.jsp HTTP/1.1");
@@ -116,6 +181,7 @@ public void elEvaluationConfigurationFalseTest() throws Exception {
    * expressions will not be evaluated. This validates both JSPs in standard
    * syntax and JSP documents.
    */
+  @Test
   public void elEvaluationConfigurationTrueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_eleval_web/elconftrue/ElEvaluationTest.jsp HTTP/1.1");
@@ -136,6 +202,7 @@ public void elEvaluationConfigurationTrueTest() throws Exception {
    * descriptor, that the page directive attribute isELIgnored takes precedence
    * over the configuration of the JSP property group.
    */
+  @Test
   public void elEvaluationPageDirectiveOverrideTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_eleval_web/elpagetrue/ElEvaluationTest.jsp HTTP/1.1");
@@ -164,7 +231,9 @@ public void elEvaluationPageDirectiveOverrideTest() throws Exception {
    * based web application, and it encounters a JSP with an EL-like construct
    * (i.e. ${expr}), that EL Evaluation is not performed.
    */
+  @Test
   public void elEvaluation23WebApplicationTest() throws Exception {
+    setup2();
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_eleval23_web/ElCompatTest.jsp HTTP/1.1");
     TEST_PROPS.setProperty(SEARCH_STRING, "${testPassed}");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23.ear b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23.ear
deleted file mode 100644
index fe1a10345fd95e28ca64ef92951c6b8309fbc3e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2008
zcmaJ?3pkY98vYsgJwl@~6=9<^u7m6@91&y8G)ziFNQ~=DGhvME2IW?AEi^7?awlrr
zF4`NgnR)>7;g})KaZ-roDuNi%vl&Df=R#+?RFbRZ2`w`!)v3fD&<~u_%E!;w5!6%a%kM
z`I}P=GwYrsCE+j^R`iaYE=Wy(=vSp2%3PwZ`bN&yZ12@_?w;R_Lh8@
z8@p7Gw3ZQY(MvzNm2?fddF6*RWP(AZmy#LKGl_F*MlFb=|JqeJI_yr9CKsx`D9@(f
z-G%nJddu0?F6EOa`R>?zh=QiGT!~)PHl6#ILX97vLq}hyJ=5c|f|Ve2rMMRPkoY|e
zGUm`HZfN0+Q`L3%rI=Q#t5XM4!v@UX*1Rufw%QLV(hD7CtUH~|30ZX;xf1>yI+)3l
zD7TUD_kO$nrI|#UG(=hq09eBL?`8tRCqbY#AOE9mG8ZWU03nh9uv^&7;4recFX@7R
zP=Gg{fRFGYn3#G~@#hVxKB1ITKbZBMfNk(ebq#of6lY#prDYUj&+|ZfE;M<&-6X*)
z%))gi{8ku_r>qAjsj=pD+w>4ymEM;Qk3FH
z2bY4j%m-(A%lqZ~&)d^snOrLXZFgZ$ICDls{
z5)A72#rY@~L#+?~dsq9%dnt(K)4q;!F!Y6y@kx9L;IQQBF*d9Jn%>Pd0@uIlN8riM
zc?HmYwsS|khdlw=ngg0ek29=-q?vUj1@40tKi)5{^pMxtIRmOhos0G%(lv#H9{}@s
zDJ;^1>o5|^f0|eu_vDScVE!Gu;+3b$4Zc<9qg;;Eu{qjBLS;*I?pWU0c;&kOszl4l
znTP{ZeivRLxWBPveENM`BNhi{5twm?T(Yl4hX&PXJu;(dBHYwazI*WY&*k?rcepuo
z_gN@anPxJub^!~)j_DeEUm0QyO6}IUYTMYzjs2
zjK3%8H1k?ic=D&i9nrdPSWGk@74;s~vVLt+B_%er=IRN{XwE$m-Tc
zQ{BYEHJ6*C$3vS_!vklo%`2#DEg28l{d6F}mI?{+Th|>A`_&9qtk_~YLSrM5zNT8X
zC#~0l(-a?hsT7ylBstGLEr1(jSIOk5#4KOoULO32rIZMXInHg~7a{@EQ}w+trtTx~D?jo~m(
zaOWIJA#+(tJP));6QA{ejIX3`tZz39Fi||J5a_eeJNA!7O#yXh=0bKz)hyh50zCAT
z&=(6&JNYs`g_^T5Y2yOc7wb#icM`7In?)|TP;H5NZ(*7+-`<$@u#gB
zL{_p@7e!X`4KIb;%?#feizthg@CyH3L$$vq(a-<@i123rM^WVfAx8)?00u0h))S4E
X`^3IqaTrM{5l2EejD_-j^ULW^OmjA*

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23_web.war b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23_web.war
deleted file mode 100644
index c27b04a0b1d5a4b760e33303526f9a697dcf05a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1387
zcmWIWW@Zs#U|`^2@F?Hw6L6gA>2XE|1{r1s1_7X`YmRe%Zb4#6NNRD3URH5IZ9shX
zZ3BV&>&q<;G3g#Do3?ynX{sV`I3Qkkxu<9EEyd$4y`>(QEhGd_O*%U;13B*~I_`Vi{{5y!BpW>G@NWWtU)Ec#e{
zpyOdnsve7sl%#F#kDRsO5GQW+GMs)J08r}U1Qh0@8T-PvVB^fLKg&nrUrhgo&R{X!#k%~
zi8V_#FU;;aS?~NlR$Qb=Hr30NLA|8lPrcKMIfm=})!znMMxQe1@ZNM{;)T8qTP`h`
z+k1vX!1`*;lN~-%3Q9|PKQbyi@2Pzo5j|x|^3shlhrYcozp?13!dd&4nGM2iC$4R1
zh}+D#y8p-4iH21t^=FH>+AXc#e54|8mu5=unB&RHBFzVOhVs%N}g)k=5WxBYYG
zoa3hBLb{pfq^E7TX`A}8=Xw4H+yDP6Y-)C^LHN;WZ)6Y%+-zf$LW`+Q7b`Fp{6I2my
z&7gDy*X--)=jrAe9HQsz_SyH$X&-N0y^Flwx?1PXoZlQ|aK-q+(;_`DUmZ{1i>0er
zIA^?&JR&Wjk-;+kndXl)HSwq7;bPO5JQLHdc&7R~^Hb5sB1W)74%u5Ky92EOVUR<(
zz>d0&<_nN}!(E-go+Yxpiw(|vP4_!?*C=d|*eFT1F^x5GgyF*|kJ
z<&03<39~b%`QC{9I4S)7X`y{j+X|j1?A%p9>$!mNk?ZFUY!+Jk)mlE~@%h9&7FV5B
zO!uC!y_<8{>w|%S!a~iYogIq*cn;oGs{1%E_`al8PIKvsj|>s&ucz?U+8p2yGHYBI
zv3Aep8h4)jly5I$^Uk*4Dtjvz@M_a@D^E$ewY`4&fA7zBc_X{H!h~bh#BJO+zlt6X
z&h0sHnWydl^}kG@2({8*_5LZ)|31LX9^lQ$WY2)B5KsY!Fav`EltwQSxS%qO3=$00
zerw|Nzh7pYVIvlSOoMC?0os6^;$X=Ml;RNJE6_dgBm_!-=vt8z0LaM*U<5P~t`#Zu
zflT0Hz@1PKChP{9fJin7Cxa3Wa)5yn4gx$x(gjUM0p6@^AO);I7zFeYGuVp&V<_Ma

diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/encoding/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/encoding/URLClientIT.java
similarity index 64%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/encoding/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/encoding/URLClientIT.java
index 3078a8067a..c53ed59087 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/encoding/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/encoding/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,43 @@
 
 package com.sun.ts.tests.jsp.spec.configuration.encoding;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_config_encode_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_encode_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_encode_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DifferentEncodingSpecifiedTest.jsp")), "DifferentEncodingSpecifiedTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DifferentEncodingSpecifiedTest.jspx")), "DifferentEncodingSpecifiedTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/NoEncodingSpecifiedTest.jsp")), "NoEncodingSpecifiedTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/SameEncodingSpecifiedTest.jsp")), "SameEncodingSpecifiedTest.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -69,6 +79,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * encoding for a group of pages, the encoding is properly set for those pages
    * when no encoding is set by the page(s) themselves.
    */
+  @Test
   public void jspConfigurationEncodingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_encode_web/NoEncodingSpecifiedTest.jsp HTTP/1.1");
@@ -87,6 +98,7 @@ public void jspConfigurationEncodingTest() throws Exception {
    * encoding as that of the property group, no translation error occurs and the
    * encoding is properly set.
    */
+  @Test
   public void jspConfigurationSameEncodingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_encode_web/SameEncodingSpecifiedTest.jsp HTTP/1.1");
@@ -104,6 +116,7 @@ public void jspConfigurationSameEncodingTest() throws Exception {
    * encoding for a group of pages, and the target page specifies a different
    * encoding as that of the property group, a translation error occurs.
    */
+  @Test
   public void jspConfigurationDifferentEncodingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_encode_web/DifferentEncodingSpecifiedTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/general/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/general/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/general/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/general/URLClientIT.java
index 193c7058a4..83ae0cea4e 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/general/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/general/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,52 @@
 
 package com.sun.ts.tests.jsp.spec.configuration.general;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_config_general_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_general_web.war");
+    archive.addClass(AServlet.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_general_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/prelude3.jsp")), "prelude3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/prelude2.jsp")), "prelude2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/prelude1.jsp")), "prelude1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/coda3.jsp")), "coda3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/coda2.jsp")), "coda2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/coda1.jsp")), "coda1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/mostSpecific/page/willSee.jsp")), "mostSpecific/page/willSee.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/identical/willSee.jsp")), "identical/willSee.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/specific/svr/willNotSee.jsp")), "specific/svr/willNotSee.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/specific/svr/page/willSee.jsp")), "specific/svr/page/willSee.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -66,6 +83,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy:
    */
 
+  @Test
   public void moreSpecificMappingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/specific/svr/willNotSee.jsp HTTP/1.1");
@@ -86,6 +104,7 @@ public void moreSpecificMappingTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void identicalMappingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/identical/willSee.jsp HTTP/1.1");
@@ -102,6 +121,7 @@ public void identicalMappingTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void mostSpecificMappingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/mostSpecific/page/willSee.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/includes/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/includes/URLClientIT.java
similarity index 58%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/includes/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/includes/URLClientIT.java
index 9ae0aba92d..22fc6dade2 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/includes/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/includes/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,48 @@
 
 package com.sun.ts.tests.jsp.spec.configuration.includes;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public URLClientIT() throws Exception {
 
     setContextRoot("/jsp_config_includes_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_includes_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_includes_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/jspf/prelude3.jspf", "jspf/prelude3.jspf");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/jspf/prelude2.jspf", "jspf/prelude2.jspf");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/jspf/prelude1.jspf", "jspf/prelude1.jspf");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/jspf/coda3.jspf", "jspf/coda3.jspf");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/jspf/coda2.jspf", "jspf/coda2.jspf");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/jspf/coda1.jspf", "jspf/coda1.jspf");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IncludesTest.jsp")), "IncludesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/two/Includes2Test.jsp")), "two/Includes2Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/three/Includes3Test.jspx")), "three/Includes3Test.jspx");
+
+    return archive;
+
   }
 
   /*
@@ -73,6 +88,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * url-pattern, and are included in the order they appear in the deployment
    * descriptor. - Validate with both standard syntax JSPs and JSP documents.
    */
+  @Test
   public void jspConfigurationIncludesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_includes_web/IncludesTest.jsp HTTP/1.1");
@@ -87,6 +103,7 @@ public void jspConfigurationIncludesTest() throws Exception {
    * 
    * @test_Strategy: Validate the same as above test.
    */
+  @Test
   public void jspConfigurationIncludes2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_includes_web/two/Includes2Test.jsp HTTP/1.1");
@@ -104,6 +121,7 @@ public void jspConfigurationIncludes2Test() throws Exception {
    * implicit includes can use either the same syntax as the including page, or
    * a different syntax.
    */
+  @Test
   public void jspConfigurationIncludes3Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_includes_web/three/Includes3Test.jspx HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/scripting/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/scripting/URLClientIT.java
similarity index 55%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/scripting/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/scripting/URLClientIT.java
index 50a1f613af..b41815f6c2 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/scripting/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/scripting/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,31 +24,71 @@
 
 package com.sun.ts.tests.jsp.spec.configuration.scripting;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
+
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
+
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
   }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_scr_web.war");
+    archive.addClasses(SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_scr_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tag.tld", "tag.tld");    
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspecx/ScriptletTest.jspx")), "scrunspecx/ScriptletTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspecx/ExpressionTest.jspx")), "scrunspecx/ExpressionTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspecx/DeclarationTest.jspx")), "scrunspecx/DeclarationTest.jspx");
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspec/ScriptletTest.jsp")), "scrunspec/ScriptletTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspec/ExpressionTest.jsp")), "scrunspec/ExpressionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspec/DeclarationTest.jsp")), "scrunspec/DeclarationTest.jsp");
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtruex/ScriptletTest.jspx")), "scrtruex/ScriptletTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtruex/ExpressionTest.jspx")), "scrtruex/ExpressionTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtruex/AttributeExpressionTest.jspx")), "scrtruex/AttributeExpressionTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtruex/DeclarationTest.jspx")), "scrtruex/DeclarationTest.jspx");
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspecx/ScriptletTest.jspx")), "scrunspecx/ScriptletTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspecx/DeclarationTest.jspx")), "scrunspecx/DeclarationTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrunspecx/ExpressionTest.jspx")), "scrunspecx/ExpressionTest.jspx");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtrue/ScriptletTest.jsp")), "scrtrue/ScriptletTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtrue/ExpressionTest.jsp")), "scrtrue/ExpressionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtrue/DeclarationTest.jsp")), "scrtrue/DeclarationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrtrue/AttributeExpressionTest.jsp")), "scrtrue/AttributeExpressionTest.jsp");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrfalsex/ScriptletTest.jspx")), "scrfalsex/ScriptletTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrfalsex/ExpressionTest.jspx")), "scrfalsex/ExpressionTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrfalsex/DeclarationTest.jspx")), "scrfalsex/DeclarationTest.jspx");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrfalse/ScriptletTest.jsp")), "scrfalse/ScriptletTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrfalse/ExpressionTest.jsp")), "scrfalse/ExpressionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scrfalse/DeclarationTest.jsp")), "scrfalse/DeclarationTest.jsp");
 
-    return super.run(args, out, err);
+    return archive;
   }
 
   /*
@@ -68,6 +108,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * scripting elements are evaluated. This test is performed against standard
    * syntax JSP pages as well as JSP documents.
    */
+  @Test
   public void jspConfigurationScriptingUnspecifiedTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_scr_web/scrunspec/DeclarationTest.jsp HTTP/1.1");
@@ -105,6 +146,7 @@ public void jspConfigurationScriptingUnspecifiedTest() throws Exception {
    * scripting elements are evaluated. This test is performed against standard
    * syntax JSP pages as well as JSP documents.
    */
+  @Test
   public void jspConfigurationScriptingFalseTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_scr_web/scrfalse/DeclarationTest.jsp HTTP/1.1");
@@ -146,6 +188,7 @@ public void jspConfigurationScriptingFalseTest() throws Exception {
    * case of RT expressions). This test is performed against standard syntax JSP
    * pages as well as JSP documents.
    */
+  @Test
   public void jspConfigurationScriptingTrueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_scr_web/scrtrue/DeclarationTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/xml/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/xml/URLClientIT.java
similarity index 64%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/xml/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/xml/URLClientIT.java
index 37dcc88781..61d6579ae8 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/xml/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/configuration/xml/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,42 @@
 
 package com.sun.ts.tests.jsp.spec.configuration.xml;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_config_xml_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_config_xml_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_config_xml_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/xmltrue/XmlJspTest.xsp")), "xmltrue/XmlJspTest.xsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/xmlfalse/NonXmlTest.jsp")), "xmlfalse/NonXmlTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/unspec/NonXmlTest.jsp")), "unspec/NonXmlTest.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -70,6 +79,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * documents.
    * 
    */
+  @Test
   public void jspConfigurationIsXmlUnspecTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_xml_web/unspec/NonXmlTest.jsp HTTP/1.1");
@@ -86,6 +96,7 @@ public void jspConfigurationIsXmlUnspecTest() throws Exception {
    * group, that the files matched by the url-pattern will not be considered JSP
    * documents.
    */
+  @Test
   public void jspConfigurationIsXmlFalseTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_xml_web/xmlfalse/NonXmlTest.jsp HTTP/1.1");
@@ -102,6 +113,7 @@ public void jspConfigurationIsXmlFalseTest() throws Exception {
    * group, that the files matched by the url-pattern will be considered JSP
    * documents.
    */
+  @Test
   public void jspConfigurationIsXmlTrueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_config_xml_web/xmltrue/XmlJspTest.xsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/URLClientIT.java
similarity index 67%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/URLClientIT.java
index 2f6de6e161..8a13efcac8 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,69 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute;
 
-import java.io.PrintWriter;
+import java.io.IOException;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_attribute_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_attribute_web.war");
+    archive.addClasses(
+            JspTestUtil.class);
+    archive.addPackages(true, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_attribute_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/attribute.tld", "attribute.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeDuplicatedAttributeTest.jsp")), "JspAttributeDuplicatedAttributeTest.jsp");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeDynamicTest1.jsp")), "JspAttributeDynamicTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeDynamicTest2.jsp")), "JspAttributeDynamicTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeElementInteractionTest.jspx")), "JspAttributeElementInteractionTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeEmptyBodyTest.jsp")), "JspAttributeEmptyBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeFragmentNonScrBodyTest1.jsp")), "JspAttributeFragmentNonScrBodyTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeFragmentNonScrBodyTest2.jsp")), "JspAttributeFragmentNonScrBodyTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeFragmentNonScrBodyTest3.jsp")), "JspAttributeFragmentNonScrBodyTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeFragmentNonScrBodyTest4.jsp")), "JspAttributeFragmentNonScrBodyTest4.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeFragmentNonScrBodyTest5.jsp")), "JspAttributeFragmentNonScrBodyTest5.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeFragmentNonScrBodyTest6.jsp")), "JspAttributeFragmentNonScrBodyTest6.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeFragmentTest.jsp")), "JspAttributeFragmentTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeNameReqAttributeTest.jsp")), "JspAttributeNameReqAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeNoAttributeFoundTest.jsp")), "JspAttributeNoAttributeFoundTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeQNameTest1.jsp")), "JspAttributeQNameTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeQNameTest2.jsp")), "JspAttributeQNameTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeQNameTest3.jspx")), "JspAttributeQNameTest3.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeQNameTest4.jsp")), "JspAttributeQNameTest4.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeRtTest.jsp")), "JspAttributeRtTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeTrimTest.jsp")), "JspAttributeTrimTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeUsageContextTest1.jsp")), "JspAttributeUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeUsageContextTest2.jspx")), "JspAttributeUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspAttributeUsageContextTest3.jsp")), "JspAttributeUsageContextTest3.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -69,6 +105,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * when the target attribute is being set by jsp:attribute. This test will
    * validate the above statement using both Classic and Simple tag handlers.
    */
+  @Test
   public void jspAttributeFragmentTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeFragmentTest.jsp HTTP/1.1");
@@ -87,6 +124,7 @@ public void jspAttributeFragmentTest() throws Exception {
    * jsp:attribute is used to provide the attribute of another jsp:attribute
    * action.
    */
+  @Test
   public void jspAttributeUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeUsageContextTest3.jsp HTTP/1.1");
@@ -113,6 +151,7 @@ public void jspAttributeUsageContextTest() throws Exception {
    * values and the body of the jsp:attribute action contains scripting elements
    * (<%=, <%, <%!).
    */
+  @Test
   public void jspAttributeFragmentNonScriptingBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeFragmentNonScrBodyTest1.jsp HTTP/1.1");
@@ -148,6 +187,7 @@ public void jspAttributeFragmentNonScriptingBodyTest() throws Exception {
    * @test_Strategy: Validate that dynamic attribute values provided via
    * jsp:attribute are provided to the tag handler as java.lang.String objects.
    */
+  @Test
   public void jspAttributeDynamicAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeDynamicTest1.jsp HTTP/1.1");
@@ -171,6 +211,7 @@ public void jspAttributeDynamicAttributesTest() throws Exception {
    * jsp:attribute actions, type conversions are properly performed and the
    * attributes are set.
    */
+  @Test
   public void jspAttributeRtExprTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeRtTest.jsp HTTP/1.1");
@@ -192,6 +233,7 @@ public void jspAttributeRtExprTest() throws Exception {
    * jsp:attribute element.
    *
    */
+  @Test
   public void jspAttributeElementInteractionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeElementInteractionTest.jspx HTTP/1.1");
@@ -209,6 +251,7 @@ public void jspAttributeElementInteractionTest() throws Exception {
    * true or false, or when not specified when handling static values at
    * translation time vs. runtime.
    */
+  @Test
   public void jspAttributeTrimTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeTrimTest.jsp HTTP/1.1");
@@ -226,6 +269,7 @@ public void jspAttributeTrimTest() throws Exception {
    * action (using the xml style) and a jsp:attribute action is used to define
    * the value for that same attribute, a translation-time error occurs.
    */
+  @Test
   public void jspAttributeDuplicatedAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeDuplicatedAttributeTest.jsp HTTP/1.1");
@@ -244,6 +288,7 @@ public void jspAttributeDuplicatedAttributeTest() throws Exception {
    * surrounding action. - If the qname prefix doesn't match the prefix of the
    * surrounding action, a translation error must occur.
    */
+  @Test
   public void jspAttributeQNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeQNameTest1.jsp HTTP/1.1");
@@ -272,6 +317,7 @@ public void jspAttributeQNameTest() throws Exception {
    * @test_Strategy: Validate that if the body of jsp:attribute is empty, it
    * sets the value of the attribute to "".
    */
+  @Test
   public void jspAttributeEmptyBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeEmptyBodyTest.jsp HTTP/1.1");
@@ -288,6 +334,7 @@ public void jspAttributeEmptyBodyTest() throws Exception {
    * action that does not exist, and that action does not accept dynamic
    * attributes, a translation-time error occurs.
    */
+  @Test
   public void jspAttributeNoAttributeFoundTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeNoAttributeFoundTest.jsp HTTP/1.1");
@@ -304,6 +351,7 @@ public void jspAttributeNoAttributeFoundTest() throws Exception {
    * of the jsp:attribute standard action by omitting it and checking for a
    * translation-time error.
    */
+  @Test
   public void jspAttributeNameRequiredAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_attribute_web/JspAttributeNameReqAttributeTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/URLClientIT.java
similarity index 55%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/URLClientIT.java
index 12f75afd36..29da127645 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,52 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.body;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_body_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_body_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.addPackages(true, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_body_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/body.tld", "body.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspBodyTest.jsp")), "JspBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspBodyEmptyBodyTest.jsp")), "JspBodyEmptyBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspBodyUsageContextTest1.jsp")), "JspBodyUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspBodyUsageContextTest2.jsp")), "JspBodyUsageContextTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspBodyUsageContextTest3.jsp")), "JspBodyUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspBodyUsageContextTest4.jsp")), "JspBodyUsageContextTest4.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspBodyUsageContextTest5.jsp")), "JspBodyUsageContextTest5.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -68,6 +87,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate that the body of an action is properly delivered
    * to a custom action when provided through jsp:body.
    */
+  @Test
   public void jspBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_body_web/JspBodyTest.jsp HTTP/1.1");
@@ -87,6 +107,7 @@ public void jspBodyTest() throws Exception {
    * a body - jsp:body nested within a jsp:body - jsp:body nested within
    * jsp:attribute
    */
+  @Test
   public void jspBodyUsageContextTest() throws Exception {
     for (int i = 0; i < 5; i++) {
       TEST_PROPS.setProperty(REQUEST,
@@ -108,6 +129,7 @@ public void jspBodyUsageContextTest() throws Exception {
    * be provided via jsp:body in the forms of <jsp:body/> and
    * <jsp:body></jsp:body>
    */
+  @Test
   public void jspBodyEmptyBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_body_web/JspBodyEmptyBodyTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/URLClientIT.java
similarity index 50%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/URLClientIT.java
index c16f362c90..0e3a66fcf1 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,48 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.declaration;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_decl_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_decl_web.war");
+    // archive.addPackages(true, Filters.exclude(URLClient.class),
+    //         URLClient.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_decl_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspDeclarationTag2.tagx", "tags/JspDeclarationTag2.tagx");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspDeclarationTag1.tag", "tags/JspDeclarationTag1.tag");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDeclarationUsageContextTest1.jsp")), "JspDeclarationUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDeclarationUsageContextTest2.jspx")), "JspDeclarationUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDeclarationUsageContextTest3.jsp")), "JspDeclarationUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDeclarationUsageContextTest4.jspx")), "JspDeclarationUsageContextTest4.jspx");
+
+    return archive;
+
   }
 
   /*
@@ -69,6 +84,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp:declaration in standard JSP pages, JSP documents and Tag files in both
    * standard and XML syntax.
    */
+  @Test
   public void jspDeclarationUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_decl_web/JspDeclarationUsageContextTest1.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/URLClientIT.java
similarity index 54%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/URLClientIT.java
index ede6868948..39a57b973c 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,42 +20,81 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.dobody;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-public class URLClient extends AbstractUrlClient {
   private static final String CONTEXT_ROOT = "/jsp_core_act_dobody_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/core_syntax/action/dobody");
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_dobody_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_dobody_web.xml"));
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyVarVarReaderTag.tag", "tags/DoBodyVarVarReaderTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyVarTag.tag", "tags/DoBodyVarTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyVarReaderTag.tag", "tags/DoBodyVarReaderTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyUsageContextTagB.tagx", "tags/DoBodyUsageContextTagB.tagx");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyUsageContextTagA.tag", "tags/DoBodyUsageContextTagA.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyScopeTag.tag", "tags/DoBodyScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyNoVarVarReaderScopeTag.tag", "tags/DoBodyNoVarVarReaderScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyNonEmptyBodyTag2.tag", "tags/DoBodyNonEmptyBodyTag2.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyNonEmptyBodyTag1.tag", "tags/DoBodyNonEmptyBodyTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyInvalidSessionScopeTag.tag", "tags/DoBodyNonEmptyBodyTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyInvalidScopeTag.tag", "tags/DoBodyInvalidScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyInvalidRequestScopeTag.tag", "tags/DoBodyInvalidRequestScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyInvalidPageScopeTag.tag", "tags/DoBodyInvalidPageScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyInvalidApplicationScopeTag.tag", "tags/DoBodyInvalidApplicationScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DoBodyAttributeTag.tag", "tags/DoBodyAttributeTag.tag");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyVarVarReaderTest.jsp")), "JspDoBodyVarVarReaderTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyVarTest.jsp")), "JspDoBodyVarTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyVarReaderTest.jsp")), "JspDoBodyVarReaderTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyUsageContextTest3.jsp")), "JspDoBodyUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyUsageContextTest2.jspx")), "JspDoBodyUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyUsageContextTest1.jsp")), "JspDoBodyUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyScopeTest.jsp")), "JspDoBodyScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyNoVarVarReaderScopeTest.jsp")), "JspDoBodyNoVarVarReaderScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyNonEmptyBodyTest2.jsp")), "JspDoBodyNonEmptyBodyTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyNonEmptyBodyTest1.jsp")), "JspDoBodyNonEmptyBodyTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyJspAttributeTest.jsp")), "JspDoBodyJspAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyInvalidSessionScopeTest.jsp")), "JspDoBodyInvalidSessionScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyInvalidScopeTest.jsp")), "JspDoBodyInvalidScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyInvalidRequestScopeTest.jsp")), "JspDoBodyInvalidRequestScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyInvalidPageScopeTest.jsp")), "JspDoBodyInvalidPageScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspDoBodyInvalidApplicationScopeTest.jsp")), "JspDoBodyInvalidApplicationScopeTest.jsp");
+    
+    return archive;
+
+  }
 
+  
   /*
    * @testName: jspDoBodyNonEmptyBodyTest
    * 
@@ -64,6 +103,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyNonEmptyBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT + "/"
         + "JspDoBodyNonEmptyBodyTest1.jsp HTTP/1.1");
@@ -83,6 +123,7 @@ public void jspDoBodyNonEmptyBodyTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyInvalidPageScopeTest() throws Exception {
     String testName = "JspDoBodyInvalidPageScopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -99,6 +140,7 @@ public void jspDoBodyInvalidPageScopeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyInvalidRequestScopeTest() throws Exception {
     String testName = "JspDoBodyInvalidRequestScopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -115,6 +157,7 @@ public void jspDoBodyInvalidRequestScopeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyInvalidApplicationScopeTest() throws Exception {
     String testName = "JspDoBodyInvalidApplicationScopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -130,6 +173,7 @@ public void jspDoBodyInvalidApplicationScopeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyInvalidSessionScopeTest() throws Exception {
     String testName = "JspDoBodyInvalidSessionScopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -145,6 +189,7 @@ public void jspDoBodyInvalidSessionScopeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyInvalidScopeTest() throws Exception {
     String testName = "JspDoBodyInvalidScopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -161,6 +206,7 @@ public void jspDoBodyInvalidScopeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyJspAttributeTest() throws Exception {
     String testName = "JspDoBodyJspAttributeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -177,6 +223,7 @@ public void jspDoBodyJspAttributeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyVarTest() throws Exception {
     String testName = "JspDoBodyVarTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -193,6 +240,7 @@ public void jspDoBodyVarTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyVarReaderTest() throws Exception {
     String testName = "JspDoBodyVarReaderTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -209,6 +257,7 @@ public void jspDoBodyVarReaderTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyScopeTest() throws Exception {
     String testName = "JspDoBodyScopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -225,6 +274,7 @@ public void jspDoBodyScopeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyNoVarVarReaderScopeTest() throws Exception {
     String testName = "JspDoBodyNoVarVarReaderScopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -241,6 +291,7 @@ public void jspDoBodyNoVarVarReaderScopeTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void jspDoBodyVarVarReaderTest() throws Exception {
     String testName = "JspDoBodyVarVarReaderTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -257,6 +308,7 @@ public void jspDoBodyVarVarReaderTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void negativeJspDoBodyUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT + "/"
         + "JspDoBodyUsageContextTest1.jsp HTTP/1.1");
@@ -276,6 +328,7 @@ public void negativeJspDoBodyUsageContextTest() throws Exception {
    * @test_Strategy:
    */
 
+  @Test
   public void positiveJspDoBodyUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT + "/"
         + "JspDoBodyUsageContextTest3.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/URLClientIT.java
similarity index 58%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/URLClientIT.java
index fe3d5034cd..d105dd5bc4 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,62 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.element;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_element_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_element_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_element_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/NameAttrTag.tag", "tags/NameAttrTag.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspElementTag.tag", "tags/JspElementTag.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspElementJspBodyTag.tag", "tags/JspElementJspBodyTag.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspElementJspAttributeTag.tag", "tags/JspElementJspAttributeTag.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspElementDynAttrTag.tag", "tags/JspElementDynAttrTag.tag");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementTest3.jsp")), "JspElementTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementTest2.jspx")), "JspElementTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementTest1.jsp")), "JspElementTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementNameReqAttributeTest3.jsp")), "JspElementNameReqAttributeTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementNameReqAttributeTest2.jspx")), "JspElementNameReqAttributeTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementNameReqAttributeTest1.jsp")), "JspElementNameReqAttributeTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementJspBodyTest3.jsp")), "JspElementJspBodyTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementJspBodyTest2.jspx")), "JspElementJspBodyTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementJspBodyTest1.jsp")), "JspElementJspBodyTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementJspAttributeTest3.jsp")), "JspElementJspAttributeTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementJspAttributeTest2.jspx")), "JspElementJspAttributeTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementJspAttributeTest1.jsp")), "JspElementJspAttributeTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementDynamicAttributeTest3.jsp")), "JspElementDynamicAttributeTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementDynamicAttributeTest2.jspx")), "JspElementDynamicAttributeTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspElementDynamicAttributeTest1.jsp")), "JspElementDynamicAttributeTest1.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -68,6 +97,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate the use of jsp:element with a simple body (not
    * using jsp:body).
    */
+  @Test
   public void jspElementTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_element_web/JspElementTest1.jsp HTTP/1.1");
@@ -94,6 +124,7 @@ public void jspElementTest() throws Exception {
    * jsp:element. The attributes specified by jsp:attribute should be translated
    * into the attributes of the new XML element.
    */
+  @Test
   public void jspElementJspAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_element_web/JspElementJspAttributeTest1.jsp HTTP/1.1");
@@ -119,6 +150,7 @@ public void jspElementJspAttributeTest() throws Exception {
    * @test_Strategy: Validate the use of jsp:body as a chile of jsp:element. The
    * body of the generated element should be that specified by jsp:body.
    */
+  @Test
   public void jspElementJspBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_element_web/JspElementJspBodyTest1.jsp HTTP/1.1");
@@ -144,6 +176,7 @@ public void jspElementJspBodyTest() throws Exception {
    * @test_Strategy: Validate that the name attribute of the jsp:element action
    * is indeed required by the container.
    */
+  @Test
   public void jspElementNameReqAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_element_web/JspElementNameReqAttributeTest1.jsp HTTP/1.1");
@@ -168,6 +201,7 @@ public void jspElementNameReqAttributeTest() throws Exception {
    * @test_Strategy: Validate the name attribute of jsp:element can accept both
    * EL and RT expressions.
    */
+  @Test
   public void jspElementDynamicAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_element_web/JspElementDynamicAttributeTest1.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/URLClientIT.java
similarity index 52%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/URLClientIT.java
index 6cc8e942e2..fceb79bfd0 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,46 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.expression;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_decl_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_expr_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_expr_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspExpressionTag1.tag", "tags/JspExpressionTag1.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspExpressionTag2.tagx", "tags/JspExpressionTag2.tagx");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspExpressionUsageContextTest1.jsp")), "JspExpressionUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspExpressionUsageContextTest2.jspx")), "JspExpressionUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspExpressionUsageContextTest3.jsp")), "JspExpressionUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspExpressionUsageContextTest4.jspx")), "JspExpressionUsageContextTest4.jspx");
+
+    return archive;
+
   }
 
   /*
@@ -69,6 +82,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp:expression in standard JSP pages, JSP documents and Tag files in both
    * standard and XML syntax.
    */
+  @Test
   public void jspExpressionUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_expr_web/JspExpressionUsageContextTest1.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClient.java
deleted file mode 100644
index 25dd96349a..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClient.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jsp.spec.core_syntax.actions.forward;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setGeneralURI("/jsp/spec/core_syntax/actions/forward");
-    setContextRoot("/jsp_coresyntx_act_forward_web");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   *
-   */
-
-  /* Run test */
-
-  /*
-   * @testName: positiveForwardCtxRelativeTest
-   * 
-   * @assertion_ids: JSP:SPEC:165.1
-   * 
-   * @test_Strategy: Validate that jsp:forward can forward a request to a JSP
-   * page within the same context using a page relative-path. PENDING Merege
-   * existing forward tests
-   */
-
-  public void positiveForwardCtxRelativeTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveForwardCtxRelative");
-    invoke();
-  }
-
-  /*
-   * @testName: positiveForwardCtxRelativeHtmlTest
-   * 
-   * @assertion_ids: JSP:SPEC:165.1
-   * 
-   * @test_Strategy: Validate that jsp:forward can forward a request to a static
-   * resource within the same context using a page-relative path.
-   */
-
-  public void positiveForwardCtxRelativeHtmlTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveForwardCtxRelativeHtml");
-    invoke();
-  }
-
-  /*
-   * @testName: positiveForwardPageRelativeTest
-   * 
-   * @assertion_ids: JSP:SPEC:165.1
-   * 
-   * @test_Strategy: Validate that jsp:forward can forward a request to a JSP
-   * page within the same context using a page-relative path.
-   */
-
-  public void positiveForwardPageRelativeTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveForwardPageRelative");
-    invoke();
-  }
-
-  /*
-   * @testName: positiveForwardPageRelativeHtmlTest
-   * 
-   * @assertion_ids: JSP:SPEC:165.1
-   * 
-   * @test_Strategy: Validate that jsp:forward can forward a request to a static
-   * resource within the same context using a page-relative path.
-   */
-
-  public void positiveForwardPageRelativeHtmlTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveForwardPageRelativeHtml");
-    invoke();
-  }
-
-  /*
-   * @testName: positiveRequestAttrCtxRelativeTest
-   * 
-   * @assertion_ids: JSP:SPEC:165.8
-   * 
-   * @test_Strategy: Validate that jsp:forward can properly accept a
-   * request-time attribute containing a context-relative path value.
-   */
-
-  public void positiveRequestAttrCtxRelativeTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveRequestAttrCtxRelative");
-    invoke();
-  }
-
-  /*
-   * @testName: positiveRequestAttrPageRelativeTest
-   * 
-   * @assertion_ids: JSP:SPEC:165.8
-   * 
-   * @test_Strategy: Validate that jsp:forward can properly accept a
-   * request-time attribute containing a page-relative path value.
-   */
-
-  public void positiveRequestAttrPageRelativeTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveRequestAttrPageRelative");
-    invoke();
-  }
-
-  /*
-   * @testName: unbufferedWriteForwardTest
-   * 
-   * @assertion_ids: JSP:SPEC:165.5
-   * 
-   * @test_Strategy:If the page output was unbuffered and anything has been
-   * written to it, an attempt to forward the request will result in an
-   * IllegalStateException.
-   */
-
-  public void unbufferedWriteForwardTest() throws Exception {
-    String testName = "unbufferedWriteForwardTest";
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_coresyntx_act_forward_web/unbufferedWriteForwardTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(SEARCH_STRING, "Got IllegalStateException");
-    invoke();
-  }
-
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClientIT.java
new file mode 100644
index 0000000000..c67a3603ec
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/URLClientIT.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jsp.spec.core_syntax.actions.forward;
+
+
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
+
+    setGeneralURI("/jsp/spec/core_syntax/actions/forward");
+    setContextRoot("/jsp_coresyntx_act_forward_web");
+
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_act_forward_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_act_forward_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/unbufferedWriteForwardTest.jsp")), "unbufferedWriteForwardTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/unbufferedWriteForwardTest_error.jsp")), "unbufferedWriteForwardTest_error.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveRequestAttrPageRelative.jsp")), "positiveRequestAttrPageRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveRequestAttrCtxRelative.jsp")), "positiveRequestAttrCtxRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveForwardPageRelativeHtml.jsp")), "positiveForwardPageRelativeHtml.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveForwardPageRelative.jsp")), "positiveForwardPageRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveForwardCtxRelativeHtml.jsp")), "positiveForwardCtxRelativeHtml.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveForwardCtxRelative.jsp")), "positiveForwardCtxRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/forwardcommon.jsp")), "forwardcommon.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/forwardcommon.html")), "forwardcommon.html");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/flushedBufferForwardTest1.jsp")), "flushedBufferForwardTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/flushedBufferForwardTest.jsp")), "flushedBufferForwardTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/flushedBufferForwardTest_error.jsp")), "flushedBufferForwardTest_error.jsp");
+  
+    return archive;
+
+  }
+
+  /*
+   * @class.setup_props: webServerHost; webServerPort; ts_home;
+   *
+   */
+
+  /* Run test */
+
+  /*
+   * @testName: positiveForwardCtxRelativeTest
+   * 
+   * @assertion_ids: JSP:SPEC:165.1
+   * 
+   * @test_Strategy: Validate that jsp:forward can forward a request to a JSP
+   * page within the same context using a page relative-path. PENDING Merege
+   * existing forward tests
+   */
+
+  @Test
+  public void positiveForwardCtxRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveForwardCtxRelative.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveForwardCtxRelative");
+    invoke();
+  }
+
+  /*
+   * @testName: positiveForwardCtxRelativeHtmlTest
+   * 
+   * @assertion_ids: JSP:SPEC:165.1
+   * 
+   * @test_Strategy: Validate that jsp:forward can forward a request to a static
+   * resource within the same context using a page-relative path.
+   */
+
+  @Test
+  public void positiveForwardCtxRelativeHtmlTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveForwardCtxRelativeHtml.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveForwardCtxRelativeHtml");
+    invoke();
+  }
+
+  /*
+   * @testName: positiveForwardPageRelativeTest
+   * 
+   * @assertion_ids: JSP:SPEC:165.1
+   * 
+   * @test_Strategy: Validate that jsp:forward can forward a request to a JSP
+   * page within the same context using a page-relative path.
+   */
+
+  @Test
+  public void positiveForwardPageRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveForwardPageRelative.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveForwardPageRelative");
+    invoke();
+  }
+
+  /*
+   * @testName: positiveForwardPageRelativeHtmlTest
+   * 
+   * @assertion_ids: JSP:SPEC:165.1
+   * 
+   * @test_Strategy: Validate that jsp:forward can forward a request to a static
+   * resource within the same context using a page-relative path.
+   */
+
+  @Test
+  public void positiveForwardPageRelativeHtmlTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveForwardPageRelativeHtml.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveForwardPageRelativeHtml");
+    invoke();
+  }
+
+  /*
+   * @testName: positiveRequestAttrCtxRelativeTest
+   * 
+   * @assertion_ids: JSP:SPEC:165.8
+   * 
+   * @test_Strategy: Validate that jsp:forward can properly accept a
+   * request-time attribute containing a context-relative path value.
+   */
+
+  @Test
+  public void positiveRequestAttrCtxRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveRequestAttrCtxRelative.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveRequestAttrCtxRelative");
+    invoke();
+  }
+
+  /*
+   * @testName: positiveRequestAttrPageRelativeTest
+   * 
+   * @assertion_ids: JSP:SPEC:165.8
+   * 
+   * @test_Strategy: Validate that jsp:forward can properly accept a
+   * request-time attribute containing a page-relative path value.
+   */
+
+  @Test
+  public void positiveRequestAttrPageRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveRequestAttrPageRelative.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveRequestAttrPageRelative");
+    invoke();
+  }
+
+  /*
+   * @testName: unbufferedWriteForwardTest
+   * 
+   * @assertion_ids: JSP:SPEC:165.5
+   * 
+   * @test_Strategy:If the page output was unbuffered and anything has been
+   * written to it, an attempt to forward the request will result in an
+   * IllegalStateException.
+   */
+
+  @Test
+  public void unbufferedWriteForwardTest() throws Exception {
+    String testName = "unbufferedWriteForwardTest";
+    TEST_PROPS.setProperty(REQUEST,
+        "GET /jsp_coresyntx_act_forward_web/unbufferedWriteForwardTest.jsp HTTP/1.1");
+    TEST_PROPS.setProperty(SEARCH_STRING, "Got IllegalStateException");
+    invoke();
+  }
+
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/URLClientIT.java
similarity index 55%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/URLClientIT.java
index 977f1c7f66..c59017a6e6 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,37 +20,50 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.getproperty;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
 
   private static final String CONTEXT_ROOT = "/jsp_coresyntx_act_getproperty_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/core_syntax/actions/getproperty");
     setContextRoot("/jsp_coresyntx_act_getproperty_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_act_getproperty_web.war");
+    archive.addClasses(StringBean.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_act_getproperty_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveGetProps.jsp")), "positiveGetProps.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/nullPropertyValueTest.jsp")), "nullPropertyValueTest.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -69,7 +82,10 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * access and validate the property.
    */
 
+  @Test
   public void positiveGetPropsTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveGetProps.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveGetProps");
     invoke();
   }
@@ -83,6 +99,7 @@ public void positiveGetPropsTest() throws Exception {
    * must be outputed, done as in println method.
    */
 
+  @Test
   public void nullPropertyValueTest() throws Exception {
     String testName = "nullPropertyValueTest";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/URLClientIT.java
index 86927d421a..2f6abcf8af 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,36 +20,70 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.include;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_coresyntx_act_include_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/core_syntax/actions/include");
     setContextRoot("/jsp_coresyntx_act_include_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_act_include_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_act_include_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/staticStatic_A.jsp")), "staticStatic_A.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/staticDynamic_A.jsp")), "staticDynamic_A.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveRequestAttrPageRelative.jsp")), "positiveRequestAttrPageRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveRequestAttrCtxRelative.jsp")), "positiveRequestAttrCtxRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludePageRelativeHtml.jsp")), "positiveIncludePageRelativeHtml.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludePageRelative2.jsp")), "positiveIncludePageRelative2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludePageRelative.jsp")), "positiveIncludePageRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludeForward.jsp")), "positiveIncludeForward.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludeCtxRelativeHtml.jsp")), "positiveIncludeCtxRelativeHtml.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludeCtxRelative.jsp")), "positiveIncludeCtxRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/includeMappedServletTest.jsp")), "includeMappedServletTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/includeforward.jsp")), "includeforward.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/includecommon.jsp")), "includecommon.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/includecommon.html")), "includecommon.html");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/forwardtarget.html")), "forwardtarget.html");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/dynamicStatic_A.jsp")), "dynamicStatic_A.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/dynamicDynamic_A.jsp")), "dynamicDynamic_A.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/C.jsp")), "C.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/include/static_B.jsp")), "include/static_B.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/include/includeMappedServlet.jsp")), "include/includeMappedServlet.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/include/includeMappedServlet.html")), "include/includeMappedServlet.html");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/include/include2.jsp")), "include/include2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/include/dynamic_B.jsp")), "include/dynamic_B.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/include/C.jsp")), "include/C.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -72,7 +106,10 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * v1.2, Sec. 4.4
    */
 
+  @Test
   public void positiveIncludeCtxRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveIncludeCtxRelative.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveIncludeCtxRelative");
     invoke();
   }
@@ -87,7 +124,10 @@ public void positiveIncludeCtxRelativeTest() throws Exception {
    * into one test.
    */
 
+  @Test
   public void positiveIncludeCtxRelativeHtmlTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveIncludeCtxRelativeHtml.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveIncludeCtxRelativeHtml");
     invoke();
   }
@@ -100,7 +140,10 @@ public void positiveIncludeCtxRelativeHtmlTest() throws Exception {
    * @test_Strategy: Include content, using a page-relative path, from a JSP
    * page into the current JSP page.
    */
+  @Test
   public void positiveIncludePageRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveIncludePageRelative.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveIncludePageRelative");
     invoke();
   }
@@ -114,7 +157,10 @@ public void positiveIncludePageRelativeTest() throws Exception {
    * accept request-time attribute values which contain context-relative paths.
    */
 
+  @Test
   public void positiveRequestAttrCtxRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveRequestAttrCtxRelative.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveRequestAttrCtxRelative");
     invoke();
   }
@@ -128,7 +174,10 @@ public void positiveRequestAttrCtxRelativeTest() throws Exception {
    * accept request-time attribute values which contain page-relative paths.
    */
 
+  @Test
   public void positiveRequestAttrPageRelativeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveRequestAttrPageRelative.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveRequestAttrPageRelative");
     invoke();
   }
@@ -142,7 +191,10 @@ public void positiveRequestAttrPageRelativeTest() throws Exception {
    * page in a different dir into the current JSP page, with a jsp-config
    * url-pattern in web.xml
    */
+  @Test
   public void positiveIncludePageRelative2Test() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveIncludePageRelative2.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveIncludePageRelative2");
     invoke();
   }
@@ -158,7 +210,10 @@ public void positiveIncludePageRelative2Test() throws Exception {
    * the response buffer (SVR 8.4).
    * 
    */
+  @Test
   public void positiveIncludeForwardTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveIncludeForward.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveIncludeForward");
     invoke();
   }
@@ -171,6 +226,7 @@ public void positiveIncludeForwardTest() throws Exception {
    * @test_Strategy: set page attribute to a mapped servlet.
    */
 
+  @Test
   public void includeMappedServletTest() throws Exception {
     String testName = "includeMappedServletTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -188,6 +244,7 @@ public void includeMappedServletTest() throws Exception {
    * @test_Strategy:complex set of inclusions in JSP.5.4
    */
 
+  @Test
   public void staticStaticTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/staticStatic_A.jsp HTTP/1.1");
@@ -203,6 +260,7 @@ public void staticStaticTest() throws Exception {
    * @test_Strategy: complex set of inclusions in JSP.5.4
    */
 
+  @Test
   public void dynamicDynamicTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/dynamicDynamic_A.jsp HTTP/1.1");
@@ -218,6 +276,7 @@ public void dynamicDynamicTest() throws Exception {
    * @test_Strategy: complex set of inclusions in JSP.5.4
    */
 
+  @Test
   public void dynamicStaticTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/dynamicStatic_A.jsp HTTP/1.1");
@@ -233,6 +292,7 @@ public void dynamicStaticTest() throws Exception {
    * @test_Strategy: complex set of inclusions in JSP.5.4
    */
 
+  @Test
   public void staticDynamicTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/staticDynamic_A.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/URLClientIT.java
similarity index 59%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/URLClientIT.java
index 8b182012f8..d9238c6c54 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,78 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.invoke;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_invoke_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_invoke_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_invoke_web.xml"));
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeVarVarReaderTest.jsp")), "JspInvokeVarVarReaderTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeVarTest.jsp")), "JspInvokeVarTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeVarReaderTest.jsp")), "JspInvokeVarReaderTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeUsageContextTest3.jsp")), "JspInvokeUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeUsageContextTest2.jspx")), "JspInvokeUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeUsageContextTest1.jsp")), "JspInvokeUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeScopeTest.jsp")), "JspInvokeScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeNoVarVarReaderScopeTest.jsp")), "JspInvokeNoVarVarReaderScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeNotInSessionTest.jsp")), "JspInvokeNotInSessionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeNonEmptyBodyTest.jsp")), "JspInvokeNonEmptyBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeJspAttributeTest.jsp")), "JspInvokeJspAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeInvalidSessionScopeTest.jsp")), "JspInvokeInvalidSessionScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeInvalidScopeTest.jsp")), "JspInvokeInvalidScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeInvalidRequestScopeTest.jsp")), "JspInvokeInvalidRequestScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeInvalidPageScopeTest.jsp")), "JspInvokeInvalidPageScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeInvalidApplicationScopeTest.jsp")), "JspInvokeInvalidApplicationScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspInvokeFragmentReqAttributeTest.jsp")), "JspInvokeFragmentReqAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/jspFragmentNullTest.jsp")), "jspFragmentNullTest.jsp");
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/VarVarReaderTag.tag", "tags/VarVarReaderTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/ScopeTag.tag", "tags/ScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/NoVarVarReaderScopeTag.tag", "tags/NoVarVarReaderScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/NotInSessionTag.tag", "tags/NotInSessionTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/NonEmptyBodyTag.tag", "tags/NonEmptyBodyTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspInvokeVarTag.tag", "tags/JspInvokeVarTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspInvokeVarReaderTag.tag", "tags/JspInvokeVarReaderTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspInvokeUsageContextTag3b.tagx", "tags/JspInvokeUsageContextTag3b.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspInvokeUsageContextTag3a.tag", "tags/JspInvokeUsageContextTag3a.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/jspFragmentNullTest.tag", "tags/jspFragmentNullTest.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspAttributeTag.tag", "tags/JspAttributeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/InvalidSessionScopeTag.tag", "tags/InvalidSessionScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/InvalidScopeTag.tag", "tags/InvalidScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/InvalidRequestScopeTag.tag", "tags/InvalidRequestScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/InvalidPageScopeTag.tag", "tags/InvalidPageScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/InvalidApplicationScopeTag.tag", "tags/InvalidApplicationScopeTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/FragmentReqAttributeTag.tag", "tags/FragmentReqAttributeTag.tag");
+    return archive;
+
   }
 
   /*
@@ -69,6 +114,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp:invoke present in a JSP or JSP document is a translation error. -
    * jsp:invoke is valid within a tag file.
    */
+  @Test
   public void jspInvokeUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeUsageContextTest1.jsp HTTP/1.1");
@@ -94,6 +140,7 @@ public void jspInvokeUsageContextTest() throws Exception {
    * request-scoped variable. The type and value of the exported variable will
    * be validated by the invoking page.
    */
+  @Test
   public void jspInvokeVarTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeVarTest.jsp HTTP/1.1");
@@ -113,6 +160,7 @@ public void jspInvokeVarTest() throws Exception {
    * variable will be validated by the invoking page as well as verification
    * that the exported reader is resettable.
    */
+  @Test
   public void jspInvokeVarReaderTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeVarReaderTest.jsp HTTP/1.1");
@@ -134,6 +182,7 @@ public void jspInvokeVarReaderTest() throws Exception {
    * result of the invocation should be in the page context of the invoking
    * page.
    */
+  @Test
   public void jspInvokeScopeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeScopeTest.jsp HTTP/1.1");
@@ -152,6 +201,7 @@ public void jspInvokeScopeTest() throws Exception {
    * within one particular jsp:invoke action, a translation- time error is
    * raised.
    */
+  @Test
   public void jspInvokeVarVarReaderTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeVarVarReaderTest.jsp HTTP/1.1");
@@ -168,6 +218,7 @@ public void jspInvokeVarVarReaderTest() throws Exception {
    * specified but neither the var nor varReader are specified, a
    * translation-time error is raised.
    */
+  @Test
   public void jspInvokeNoVarVarReaderTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeNoVarVarReaderScopeTest.jsp HTTP/1.1");
@@ -185,6 +236,7 @@ public void jspInvokeNoVarVarReaderTest() throws Exception {
    * a result into the session scope where the calling page does not participate
    * in a session.
    */
+  @Test
   public void jspInvokeNotInSessionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeNotInSessionTest.jsp HTTP/1.1");
@@ -201,6 +253,7 @@ public void jspInvokeNotInSessionTest() throws Exception {
    * @test_Strategy: Validate the attributes of jspInvoke can all be specified
    * using the jsp:attribute action.
    */
+  @Test
   public void jspInvokeJspAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeJspAttributeTest.jsp HTTP/1.1");
@@ -218,6 +271,7 @@ public void jspInvokeJspAttributeTest() throws Exception {
    * scope attribute of jsp:invoke is provided an invalid value (i.e. not
    * 'page', 'request', 'session', or 'application').
    */
+  @Test
   public void jspInvokeInvalidScopeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeInvalidScopeTest.jsp HTTP/1.1");
@@ -250,6 +304,7 @@ public void jspInvokeInvalidScopeTest() throws Exception {
    * indeed required by the container. Validate by calling jsp:invoke without
    * the attribute and look for a translation- time error.
    */
+  @Test
   public void jspInvokeFragmentReqAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeFragmentReqAttributeTest.jsp HTTP/1.1");
@@ -265,6 +320,7 @@ public void jspInvokeFragmentReqAttributeTest() throws Exception {
    * @test_Strategy: Validate a translation-time error is raised if the
    * jsp:invoke action has a non-empty body.
    */
+  @Test
   public void jspInvokeNonEmptyBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/JspInvokeNonEmptyBodyTest.jsp HTTP/1.1");
@@ -280,6 +336,7 @@ public void jspInvokeNonEmptyBodyTest() throws Exception {
    * @test_Strategy: If the fragment identified by the given name is null, will
    * behave as though a fragment was passed in that produces no output.
    */
+  @Test
   public void jspFragmentNullTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_invoke_web/jspFragmentNullTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/URLClientIT.java
similarity index 63%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/URLClientIT.java
index 435db0efeb..c10e3cb46e 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,35 +24,78 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.output;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
 
-public class URLClient extends AbstractUrlClient {
   private static final String CONTEXT_ROOT = "/jsp_core_act_output_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_output_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_output_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_output_web.xml"));
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/simpleDefaultTest.jspx")), "simpleDefaultTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeMultipleDoctypeTest.jspx")), "negativeMultipleDoctypeTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDoctypeSystemNoRoot.jspx")), "negativeDoctypeSystemNoRoot.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDoctypeRootNoSystem.jspx")), "negativeDoctypeRootNoSystem.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDoctypePublicNoSystemTest.jspx")), "negativeDoctypePublicNoSystemTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputUsageContextTest4.jsp")), "JspOutputUsageContextTest4.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputUsageContextTest3.jspx")), "JspOutputUsageContextTest3.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputUsageContextTest2.jsp")), "JspOutputUsageContextTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputUsageContextTest1.jsp")), "JspOutputUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest8.jsp")), "JspOutputOmitDeclValidValuesTest8.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest7.jsp")), "JspOutputOmitDeclValidValuesTest7.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest6.jsp")), "JspOutputOmitDeclValidValuesTest6.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest5.jsp")), "JspOutputOmitDeclValidValuesTest5.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest4.jspx")), "JspOutputOmitDeclValidValuesTest4.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest3.jspx")), "JspOutputOmitDeclValidValuesTest3.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest2.jspx")), "JspOutputOmitDeclValidValuesTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclValidValuesTest1.jspx")), "JspOutputOmitDeclValidValuesTest1.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclDefaultTest.jspx")), "JspOutputOmitDeclDefaultTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputOmitDeclDefaultTagTest.jsp")), "JspOutputOmitDeclDefaultTagTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputJspRootOmitDeclDefaultTest.jspx")), "JspOutputJspRootOmitDeclDefaultTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputBodyTest2.jsp")), "JspOutputBodyTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspOutputBodyTest1.jspx")), "JspOutputBodyTest1.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/doctypeSystemTest.jspx")), "doctypeSystemTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/doctypeSystemPublicTest.jspx")), "doctypeSystemPublicTest.jspx");
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputUsageXMLTag.tagx", "tags/JspOutputUsageXMLTag.tagx");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputUsageTag.tag", "tags/JspOutputUsageTag.tag");  
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputOmitDeclYesTag.tagx", "tags/JspOutputOmitDeclYesTag.tagx");  
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputOmitDeclTrueTag.tagx", "tags/JspOutputOmitDeclTrueTag.tagx");  
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputOmitDeclNoTag.tagx", "tags/JspOutputOmitDeclNoTag.tagx");  
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputOmitDeclFalseTag.tagx", "tags/JspOutputOmitDeclFalseTag.tagx");  
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputDefaultTag.tagx", "tags/JspOutputDefaultTag.tagx");  
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspOutputBodyTag.tagx", "tags/JspOutputBodyTag.tagx");  
+    
+    return archive;
+
   }
 
   /*
@@ -71,6 +114,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * and Tag files in XML syntax and that a translation-time error is raised if
    * used within the context of a standard syntax JSP or Tag file.
    */
+  @Test
   public void jspOutputUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_output_web/JspOutputUsageContextTest1.jsp HTTP/1.1");
@@ -102,6 +146,7 @@ public void jspOutputUsageContextTest() throws Exception {
    * 'no', then the xml declaration will be generated. If 'true' or 'yes' no
    * declaration will be generated.
    */
+  @Test
   public void jspOutputOmitDeclValidValuesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_output_web/JspOutputOmitDeclValidValuesTest1.jspx HTTP/1.1");
@@ -150,6 +195,7 @@ public void jspOutputOmitDeclValidValuesTest() throws Exception {
    * jsp:output action is present without the omit-xml-declaration attribute,
    * the xml declaration will not be generated.
    */
+  @Test
   public void jspOutputJspRootOmitDeclDefaultTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_output_web/JspOutputJspRootOmitDeclDefaultTest.jspx HTTP/1.1");
@@ -166,6 +212,7 @@ public void jspOutputJspRootOmitDeclDefaultTest() throws Exception {
    * without a jsp:root element, and the omit-xml-declaration attribute is not
    * present, the default behavior is that an xml declaration is generated.
    */
+  @Test
   public void jspOutputOmitDeclDefaultTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_output_web/JspOutputOmitDeclDefaultTest.jspx HTTP/1.1");
@@ -183,6 +230,7 @@ public void jspOutputOmitDeclDefaultTest() throws Exception {
    * syntax, and the omit-xml-declaration attribute is not present, the default
    * behavior will be the generation of an XML declaration.
    */
+  @Test
   public void jspOutputOmitDeclDefaultTagTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_output_web/JspOutputOmitDeclDefaultTest.jspx HTTP/1.1");
@@ -199,6 +247,7 @@ public void jspOutputOmitDeclDefaultTagTest() throws Exception {
    * @test_Strategy: Validate that a translation error occurs if the body of
    * jsp:output is not empty.
    */
+  @Test
   public void jspOutputBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_output_web/JspOutputBodyTest1.jspx HTTP/1.1");
@@ -219,6 +268,7 @@ public void jspOutputBodyTest() throws Exception {
    * not set so use default for jsp document
    */
 
+  @Test
   public void simpleDefaultTest() throws Exception {
     String testName = "simpleDefaultTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -239,6 +289,7 @@ public void simpleDefaultTest() throws Exception {
    * SYSTEM "doctypeSystem">
    */
 
+  @Test
   public void doctypeSystemTest() throws Exception {
     String testName = "doctypeSystemTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -259,6 +310,7 @@ public void doctypeSystemTest() throws Exception {
    * PUBLIC "doctypePublic" "doctypeSystem">
    */
 
+  @Test
   public void doctypeSystemPublicTest() throws Exception {
     String testName = "doctypeSystemPublicTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -277,6 +329,7 @@ public void doctypeSystemPublicTest() throws Exception {
    * if the doctype-system property appears, or a translation error must occur.
    */
 
+  @Test
   public void negativeDoctypeRootTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/negativeDoctypeRootNoSystem.jspx HTTP/1.1");
@@ -298,6 +351,7 @@ public void negativeDoctypeRootTest() throws Exception {
    * must occur.
    */
 
+  @Test
   public void negativeDoctypePublicNoSystemTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST, "GET " + CONTEXT_ROOT
         + "/negativeDoctypePublicNoSystemTest.jspx HTTP/1.1");
@@ -315,6 +369,7 @@ public void negativeDoctypePublicNoSystemTest() throws Exception {
    * if the values for the properties differ from the previous occurrence.
    */
 
+  @Test
   public void negativeMultipleDoctypeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET " + CONTEXT_ROOT + "/negativeMultipleDoctypeTest.jspx HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/URLClientIT.java
similarity index 61%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/URLClientIT.java
index 99008a84a0..3034094330 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,33 +20,57 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.param;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_param_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_param_web.war");
+    archive.addClasses(JspTestUtil.class, SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_param_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/simple.tld", "simple.tld");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/Resource.jsp")), "Resource.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamUsageContextTest4.jsp")), "JspParamUsageContextTest4.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamUsageContextTest3.jsp")), "JspParamUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamUsageContextTest2.jsp")), "JspParamUsageContextTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamUsageContextTest1.jsp")), "JspParamUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamNoValueAttributeTest.jsp")), "JspParamNoValueAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamNoNameAttributeTest.jsp")), "JspParamNoNameAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamNameRtValuesTest.jsp")), "JspParamNameRtValuesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamNameElValuesTest.jsp")), "JspParamNameElValuesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamIncludeTest.jsp")), "JspParamIncludeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamForwardTest.jsp")), "JspParamForwardTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamAttributesTest.jsp")), "JspParamAttributesTest.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -65,6 +89,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp:param element is not a child of jsp:forward, jsp:include, or
    * jsp:params.
    */
+  @Test
   public void jspParamUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_param_web/JspParamUsageContextTest1.jsp HTTP/1.1");
@@ -97,6 +122,7 @@ public void jspParamUsageContextTest() throws Exception {
    * or EL expressions by looking for a translation-time error if the attribute
    * is provided with either. - The attributes can be set using jsp:attribute
    */
+  @Test
   public void jspParamAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_param_web/JspParamAttributesTest.jsp?param1=value1 HTTP/1.1");
@@ -129,6 +155,7 @@ public void jspParamAttributesTest() throws Exception {
    * @test_Strategy: Validate that params added to a jsp:forward are properly
    * aggregated and available to the target resource.
    */
+  @Test
   public void jspParamForwardTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_param_web/JspParamForwardTest.jsp?param1=value1 HTTP/1.1");
@@ -146,6 +173,7 @@ public void jspParamForwardTest() throws Exception {
    * aggregated and available to the target resource, and are not available to
    * the calling page after the include completes.
    */
+  @Test
   public void jspParamIncludeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_param_web/JspParamIncludeTest.jsp?param1=value1 HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClientIT.java
similarity index 70%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClientIT.java
index 2b0378351f..fee0ba37fc 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClientIT.java
@@ -25,33 +25,79 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_plugin_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_plugin_web.war");
+    archive.addClasses(JspPluginValidator.class, JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_plugin_web.xml"));
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginWidthRtAttributeValueTest.jsp")), "JspPluginWidthRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginWidthElAttributeValueTest.jsp")), "JspPluginWidthElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginVspaceRtAttributeValueTest.jsp")), "JspPluginVspaceRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginVspaceElAttributeValueTest.jsp")), "JspPluginVspaceElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginTypeRtAttributeValueTest.jsp")), "JspPluginTypeRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginTypeElAttributeValueTest.jsp")), "JspPluginTypeElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNsPluginUrlRtAttributeValueTest.jsp")), "JspPluginNsPluginUrlRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNsPluginUrlElAttributeValueTest.jsp")), "JspPluginNsPluginUrlElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNameRtAttributeValueTest.jsp")), "JspPluginNameRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNameElAttributeValueTest.jsp")), "JspPluginNameElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJspParamsNoParametersTest.jsp")), "JspPluginJspParamsNoParametersTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJspAttributeTest.jsp")), "JspPluginJspAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJreversionRtAttributeValueTest.jsp")), "JspPluginJreversionRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJreversionElAttributeValueTest.jsp")), "JspPluginJreversionElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginInvalidTypeTest.jsp")), "JspPluginInvalidTypeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginIePluginUrlRtAttributeValueTest.jsp")), "JspPluginIePluginUrlRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginIePluginUrlElAttributeValueTest.jsp")), "JspPluginIePluginUrlElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHspaceRtAttributeValueTest.jsp")), "JspPluginHspaceRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHspaceElAttributeValueTest.jsp")), "JspPluginHspaceElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHeightRtAttributeValueTest.jsp")), "JspPluginHeightRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHeightElAttributeValueTest.jsp")), "JspPluginHeightElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeRtAttributeValueTest.jsp")), "JspPluginCodeRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeReqAttributeTest.jsp")), "JspPluginCodeReqAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeElAttributeValueTest.jsp")), "JspPluginCodeElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeBaseRtAttributeValueTest.jsp")), "JspPluginCodeBaseRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeBaseReqAttributeTest.jsp")), "JspPluginCodeBaseReqAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeBaseElAttributeValueTest.jsp")), "JspPluginCodeBaseElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginBeanTest.jsp")), "JspPluginBeanTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginArchiveRtAttributeValueTest.jsp")), "JspPluginArchiveRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginArchiveElAttributeValueTest.jsp")), "JspPluginArchiveElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginAppletTest.jsp")), "JspPluginAppletTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginAlignRtAttributeValueTest.jsp")), "JspPluginAlignRtAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginAlignElAttributeValueTest.jsp")), "JspPluginAlignElAttributeValueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamsUsageContextTest.jsp")), "JspParamsUsageContextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamsBodyTest.jsp")), "JspParamsBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspFallbackUsageContextTest.jsp")), "JspFallbackUsageContextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspFallbackBodyTest.jsp")), "JspFallbackBodyTest.jsp");
+    return archive;
+
   }
 
   /*
@@ -72,6 +118,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Validate, rather loosely as the output will be
    * implementation dependent, the output of a jsp:plugin action.
    */
+  @Test
   public void jspPluginTest() throws Exception {
     TEST_PROPS.setProperty(STRATEGY,
         "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
@@ -111,6 +158,7 @@ public void jspPluginTest() throws Exception {
    * @test_Strategy: Validate that the only the height and width attributes of
    * jsp:plugin accept RT and EL Expressions.
    */
+  @Test
   public void jspPluginDynamicAttributesTest() throws Exception {
     TEST_PROPS.setProperty(STRATEGY,
         "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
@@ -286,6 +334,7 @@ public void jspPluginDynamicAttributesTest() throws Exception {
    * @test_Strategy: Validate that if the jsp:params action is not nested within
    * a jsp:plugin action, a translation-time error will occur.
    */
+  @Test
   public void jspParamsUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_plugin_web/JspParamsUsageContextTest.jsp HTTP/1.1");
@@ -304,6 +353,7 @@ public void jspParamsUsageContextTest() throws Exception {
    * context other than a nested child of the jsp:plugin action, a
    * translation-time error is generated.
    */
+  @Test
   public void jspFallbackUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_plugin_web/JspFallbackUsageContextTest.jsp HTTP/1.1");
@@ -321,6 +371,7 @@ public void jspFallbackUsageContextTest() throws Exception {
    * @test_Strategy: Validate the body of the jsp:fallback action can be
    * supplied using the jsp:body action.
    */
+  @Test
   public void jspFallbackBodyTest() throws Exception {
     TEST_PROPS.setProperty(STRATEGY,
         "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
@@ -341,6 +392,7 @@ public void jspFallbackBodyTest() throws Exception {
    * @test_Strategy: Validate the body of the jsp:params action can be supplied
    * using the jsp:body action.
    */
+  @Test
   public void jspParamsBodyTest() throws Exception {
     TEST_PROPS.setProperty(STRATEGY,
         "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
@@ -361,6 +413,7 @@ public void jspParamsBodyTest() throws Exception {
    * @test_Strategy: Validate that if the type attribute is provided a value
    * other than 'bean', or 'applet' that a translation error occurs.
    */
+  @Test
   public void jspPluginInvalidTypeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_plugin_web/JspPluginInvalidTypeTest.jsp HTTP/1.1");
@@ -378,6 +431,7 @@ public void jspPluginInvalidTypeTest() throws Exception {
    * @test_Strategy: Validate the attributes of the jsp:plugin action can be
    * described by the jsp:attribute action.
    */
+  @Test
   public void jspPluginJspAttributeTest() throws Exception {
     TEST_PROPS.setProperty(STRATEGY,
         "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/URLClientIT.java
similarity index 58%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/URLClientIT.java
index fc0bceaf33..ec11c507dd 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,59 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.root;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_root_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_root_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_root_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspRootJspBodyTag.tagx", "tags/JspRootJspBodyTag.tagx");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspRootUsageContextTag1.tagx", "tags/JspRootUsageContextTag1.tagx");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspRootUsageContextTag2.tag", "tags/JspRootUsageContextTag2.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspRootVersionInvalidValueTag.tagx", "tags/JspRootVersionInvalidValueTag.tagx");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspRootVersionReqAttrTag.tagx", "tags/JspRootVersionReqAttrTag.tagx");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootVersionReqAttrTest2.jsp")), "JspRootVersionReqAttrTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootVersionReqAttrTest1.jspx")), "JspRootVersionReqAttrTest1.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootVersionAttrInvalidValueTest2.jsp")), "JspRootVersionAttrInvalidValueTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootVersionAttrInvalidValueTest1.jspx")), "JspRootVersionAttrInvalidValueTest1.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootVersionAttrAllowableValuesTest2.jspx")), "JspRootVersionAttrAllowableValuesTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootVersionAttrAllowableValuesTest1.jspx")), "JspRootVersionAttrAllowableValuesTest1.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootUsageContextTest4.jsp")), "JspRootUsageContextTest4.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootUsageContextTest3.jsp")), "JspRootUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootUsageContextTest2.jspx")), "JspRootUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootUsageContextTest1.jsp")), "JspRootUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootJspBodyTest2.jsp")), "JspRootJspBodyTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspRootJspBodyTest1.jspx")), "JspRootJspBodyTest1.jspx");
+
+    return archive;
+
   }
 
   /*
@@ -69,6 +95,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp:root is used in JSP or Tag files in standard syntax but not in JSP
    * Documents, or Tag files in XML syntax.
    */
+  @Test
   public void jspRootUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_root_web/JspRootUsageContextTest1.jsp HTTP/1.1");
@@ -98,6 +125,7 @@ public void jspRootUsageContextTest() throws Exception {
    * @test_Strategy: Validate the container accepts both "1.2" and "2.0" as
    * allowable values for the version attribute of the jsp:root element.
    */
+  @Test
   public void jspRootVersionAttrAllowableValuesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_root_web/JspRootVersionAttrAllowableValuesTest1.jspx HTTP/1.1");
@@ -120,6 +148,7 @@ public void jspRootVersionAttrAllowableValuesTest() throws Exception {
    * when the version attribute of jsp:root is provided a value other than "1.2"
    * or "2.0"
    */
+  @Test
   public void jspRootVersionAttrInvalidValueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_root_web/JspRootVersionAttrInvalidValueTest1.jspx HTTP/1.1");
@@ -140,6 +169,7 @@ public void jspRootVersionAttrInvalidValueTest() throws Exception {
    * required by looking for a translation error from the container when the
    * attribute is not present.
    */
+  @Test
   public void jspRootVersionReqAttrTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_root_web/JspRootVersionReqAttrTest1.jspx HTTP/1.1");
@@ -159,6 +189,7 @@ public void jspRootVersionReqAttrTest() throws Exception {
    * @test_Strategy: Validate that jsp:body can be used to specify the body of
    * the jsp:root action.
    */
+  @Test
   public void jspRootJspBodyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_root_web/JspRootJspBodyTest1.jspx HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/URLClientIT.java
similarity index 52%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/URLClientIT.java
index b2351e12b4..2193bcf793 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,45 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.scriptlet;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_decl_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_scr_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_scr_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspScriptletTag1.tag", "tags/JspScriptletTag1.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspScriptletTag2.tagx", "tags/JspScriptletTag2.tagx");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspScriptletUsageContextTest1.jsp")), "JspScriptletUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspScriptletUsageContextTest2.jspx")), "JspScriptletUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspScriptletUsageContextTest3.jsp")), "JspScriptletUsageContextTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspScriptletUsageContextTest4.jspx")), "JspScriptletUsageContextTest4.jspx");
+    return archive;
+
   }
 
   /*
@@ -69,6 +81,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp:scriptlet in standard JSP pages, JSP documents and Tag files in both
    * standard and XML syntax.
    */
+  @Test
   public void jspScriptletUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_scr_web/JspScriptletUsageContextTest1.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/URLClientIT.java
similarity index 57%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/URLClientIT.java
index f4079326b8..6874fab1a1 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,71 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.setproperty;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
 
     setGeneralURI("/jsp/spec/core_syntax/actions/setproperty");
     setContextRoot("/jsp_coresyntx_act_setproperty_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_act_setproperty_web.war");
+    // archive.addClasses(SetpropBean.class, MiscBean.class);
+    archive.addPackages(true, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_act_setproperty_web.xml"));
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetPropValue.jsp")), "positiveSetPropValue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetPropReqTimeSingleQuotes.jsp")), "positiveSetPropReqTimeSingleQuotes.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetPropReqTimeDoubleQuotes.jsp")), "positiveSetPropReqTimeDoubleQuotes.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetPropParam.jsp")), "positiveSetPropParam.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetPropNoParam.jsp")), "positiveSetPropNoParam.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetPropAll.jsp")), "positiveSetPropAll.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetLongPrim.jsp")), "positiveSetLongPrim.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetLongObj.jsp")), "positiveSetLongObj.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetIntPrim.jsp")), "positiveSetIntPrim.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetIntObj.jsp")), "positiveSetIntObj.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetIndexedProp.jsp")), "positiveSetIndexedProp.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetFloatPrim.jsp")), "positiveSetFloatPrim.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetFloatObj.jsp")), "positiveSetFloatObj.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetDoublePrim.jsp")), "positiveSetDoublePrim.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetDoubleObj.jsp")), "positiveSetDoubleObj.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetCharPrim.jsp")), "positiveSetCharPrim.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetCharObj.jsp")), "positiveSetCharObj.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetBytePrim.jsp")), "positiveSetBytePrim.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetByteObj.jsp")), "positiveSetByteObj.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetBooleanPrim.jsp")), "positiveSetBooleanPrim.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSetBooleanObj.jsp")), "positiveSetBooleanObj.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveBeanPropertyEditor.jsp")), "positiveBeanPropertyEditor.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/Errorpage.jsp")), "Errorpage.jsp");
+    return archive;
+
   }
 
   /*
@@ -68,7 +104,10 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * prim test
    */
 
+  @Test
   public void positiveSetBooleanObjTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetBooleanObj.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetBooleanObj");
     invoke();
   }
@@ -83,7 +122,10 @@ public void positiveSetBooleanObjTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveSetBooleanPrimTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetBooleanPrim.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetBooleanPrim");
     invoke();
   }
@@ -98,7 +140,10 @@ public void positiveSetBooleanPrimTest() throws Exception {
    * test
    */
 
+  @Test
   public void positiveSetByteObjTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetByteObj.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetByteObj");
     invoke();
   }
@@ -112,7 +157,10 @@ public void positiveSetByteObjTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveSetBytePrimTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetBytePrim.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetBytePrim");
     invoke();
   }
@@ -127,7 +175,10 @@ public void positiveSetBytePrimTest() throws Exception {
    * prim test
    */
 
+  @Test
   public void positiveSetCharObjTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetCharObj.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetCharObj");
     invoke();
   }
@@ -142,7 +193,10 @@ public void positiveSetCharObjTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveSetCharPrimTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetCharPrim.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetCharPrim");
     invoke();
   }
@@ -156,7 +210,10 @@ public void positiveSetCharPrimTest() throws Exception {
    * constant. PENDING Merge with prim test
    */
 
+  @Test
   public void positiveSetDoubleObjTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetDoubleObj.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetDoubleObj");
     invoke();
   }
@@ -171,7 +228,10 @@ public void positiveSetDoubleObjTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveSetDoublePrimTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetDoublePrim.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetDoublePrim");
     invoke();
   }
@@ -185,7 +245,10 @@ public void positiveSetDoublePrimTest() throws Exception {
    * constant. PENDING Merge with prim test
    */
 
+  @Test
   public void positiveSetFloatObjTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetFloatObj.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetFloatObj");
     invoke();
   }
@@ -200,7 +263,10 @@ public void positiveSetFloatObjTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveSetFloatPrimTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetFloatPrim.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetFloatPrim");
     invoke();
   }
@@ -218,7 +284,10 @@ public void positiveSetFloatPrimTest() throws Exception {
    * the array, and display the values.
    */
 
+  @Test
   public void positiveSetIndexedPropTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetIndexedProp.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetIndexedProp");
     invoke();
   }
@@ -233,7 +302,10 @@ public void positiveSetIndexedPropTest() throws Exception {
    * prim test
    */
 
+  @Test
   public void positiveSetIntObjTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetIntObj.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetIntObj");
     invoke();
   }
@@ -247,7 +319,10 @@ public void positiveSetIntObjTest() throws Exception {
    * int property of the bean using a String constant.
    */
 
+  @Test
   public void positiveSetIntPrimTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetIntPrim.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetIntPrim");
     invoke();
   }
@@ -261,7 +336,10 @@ public void positiveSetIntPrimTest() throws Exception {
    * Long property of the bean using a String constant.
    */
 
+  @Test
   public void positiveSetLongObjTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetLongObj.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetLongObj");
     invoke();
   }
@@ -275,7 +353,10 @@ public void positiveSetLongObjTest() throws Exception {
    * long property of the bean using a String constant. PENDING Merge with prim
    * test
    */
+  @Test
   public void positiveSetLongPrimTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetLongPrim.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetLongPrim");
     invoke();
   }
@@ -290,7 +371,10 @@ public void positiveSetLongPrimTest() throws Exception {
    * tag: name, num, str.
    */
 
+  @Test
   public void positiveSetPropAllTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetPropAll.gf");
+    setGoldenFileStream(gfStream);
     String testName = "positiveSetPropAll";
     TEST_PROPS.setProperty(TEST_NAME, testName);
     TEST_PROPS.setProperty(GOLDENFILE, testName + ".gf");
@@ -312,7 +396,10 @@ public void positiveSetPropAllTest() throws Exception {
    * attribute.
    */
 
+  @Test
   public void positiveSetPropNoParamTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetPropNoParam.gf");
+    setGoldenFileStream(gfStream);
     String testName = "positiveSetPropNoParam";
     TEST_PROPS.setProperty(TEST_NAME, testName);
     TEST_PROPS.setProperty(GOLDENFILE, testName + ".gf");
@@ -333,7 +420,10 @@ public void positiveSetPropNoParamTest() throws Exception {
    * has the same name as specified by the param attribute.
    */
 
+  @Test
   public void positiveSetPropParamTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetPropParam.gf");
+    setGoldenFileStream(gfStream);
     String testName = "positiveSetPropParam";
     TEST_PROPS.setProperty(TEST_NAME, testName);
     TEST_PROPS.setProperty(GOLDENFILE, testName + ".gf");
@@ -354,7 +444,10 @@ public void positiveSetPropParamTest() throws Exception {
    * positiveSetPropReqTimeDoubleQuotesTest
    */
 
+  @Test
   public void positiveSetPropReqTimeSingleQuotesTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetPropReqTimeSingleQuotes.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetPropReqTimeSingleQuotes");
     invoke();
   }
@@ -370,7 +463,10 @@ public void positiveSetPropReqTimeSingleQuotesTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveSetPropReqTimeDoubleQuotesTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetPropReqTimeDoubleQuotes.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetPropReqTimeDoubleQuotes");
     invoke();
   }
@@ -384,7 +480,10 @@ public void positiveSetPropReqTimeDoubleQuotesTest() throws Exception {
    * value of a bean property using the value attribute.
    */
 
+  @Test
   public void positiveSetPropValueTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveSetPropValue.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveSetPropValue");
     invoke();
   }
@@ -398,7 +497,10 @@ public void positiveSetPropValueTest() throws Exception {
    * verfiy results using getProperty.
    */
 
+  @Test
   public void positiveBeanPropertyEditorTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveBeanPropertyEditor.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveBeanPropertyEditor");
     invoke();
   }
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/URLClientIT.java
similarity index 54%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/URLClientIT.java
index faf98bc65d..4563255350 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,33 +20,51 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.text;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_core_act_text_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_text_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_text_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspTextTag.tag", "tags/JspTextTag.tag");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextBodyRestrictionsTest1.jsp")), "JspTextBodyRestrictionsTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextBodyRestrictionsTest2.jsp")), "JspTextBodyRestrictionsTest2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextBodyRestrictionsTest3.jsp")), "JspTextBodyRestrictionsTest3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextBodyRestrictionsTest4.jsp")), "JspTextBodyRestrictionsTest4.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextBodyRestrictionsTest5.jspx")), "JspTextBodyRestrictionsTest5.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextUsageContextTest1.jsp")), "JspTextUsageContextTest1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextUsageContextTest2.jspx")), "JspTextUsageContextTest2.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTextUsageContextTest3.jsp")), "JspTextUsageContextTest3.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -63,6 +81,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 
    * @test_Strategy: Validate the behavior of jsp:text.
    */
+  @Test
   public void jspTextUsageContextTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_text_web/JspTextUsageContextTest1.jsp HTTP/1.1");
@@ -86,6 +105,7 @@ public void jspTextUsageContextTest() throws Exception {
    * @test_Strategy: Validate that neiter nested actions nor scripting elements
    * are allowed in the body of jsp:text.
    */
+  @Test
   public void jspTextBodyRestrictionsTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_act_text_web/JspTextBodyRestrictionsTest1.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/URLClientIT.java
similarity index 67%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/URLClientIT.java
index b03abbc6a6..0a0d100bbe 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,34 +20,68 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.usebean;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/core_syntax/actions/usebean");
     setContextRoot("/jsp_coresyntx_act_usebean_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_act_usebean_web.war");
+    archive.addClasses(Counter.class, NewCounter.class, String_IntBean.class);
+    
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_act_usebean_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/date.ser")), "WEB-INF/classes/date.ser");
+
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/serBeanName.jsp")), "serBeanName.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ScopeResult.jsp")), "ScopeResult.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/requestTimeBeanName.jsp")), "requestTimeBeanName.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSessionScopedObject.jsp")), "positiveSessionScopedObject.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveRequestScopedObject.jsp")), "positiveRequestScopedObject.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positivePageScopedObject.jsp")), "positivePageScopedObject.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveNoBody.jsp")), "positiveNoBody.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveClassTypeCast.jsp")), "positiveClassTypeCast.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveBodyNew.jsp")), "positiveBodyNew.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveBeanNameTypeCast.jsp")), "positiveBeanNameTypeCast.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveBeanNameType.jsp")), "positiveBeanNameType.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveApplicationScopedObject.jsp")), "positiveApplicationScopedObject.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeTypeAssignable.jsp")), "negativeTypeAssignable.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeSessionScopeFatalTranslationError.jsp")), "negativeSessionScopeFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeInvalidScope.jsp")), "negativeInvalidScope.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIDFatalTranslationError.jsp")), "negativeDuplicateIDFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeClassCastExceptionFwd.jsp")), "negativeClassCastExceptionFwd.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeClassCastException.jsp")), "negativeClassCastException.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/errorPage.jsp")), "errorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultScope.jsp")), "defaultScope.jsp");
+    
+    return archive;
   }
 
   /*
@@ -67,7 +101,10 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * invoking a method on the bean inside a scriplet.
    */
 
+  @Test
   public void positiveBeanNameTypeTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveBeanNameType.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveBeanNameType");
     invoke();
   }
@@ -83,7 +120,10 @@ public void positiveBeanNameTypeTest() throws Exception {
    * method on the bean inside a scriplet.
    */
 
+  @Test
   public void positiveBeanNameTypeCastTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveBeanNameTypeCast.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveBeanNameTypeCast");
     invoke();
   }
@@ -99,7 +139,10 @@ public void positiveBeanNameTypeCastTest() throws Exception {
    * validate that the property was indeed set.
    */
 
+  @Test
   public void positiveBodyNewTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveBodyNew.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveBodyNew");
     invoke();
   }
@@ -116,6 +159,7 @@ public void positiveBodyNewTest() throws Exception {
    * PageContext.
    */
 
+  @Test
   public void positivePageScopedObjectTest() throws Exception {
     String testName = "positivePageScopedObject";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -137,6 +181,7 @@ public void positivePageScopedObjectTest() throws Exception {
    * HttpServletRequest.
    */
 
+  @Test
   public void positiveRequestScopedObjectTest() throws Exception {
     String testName = "positiveRequestScopedObject";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -158,6 +203,7 @@ public void positiveRequestScopedObjectTest() throws Exception {
    * HttpSession.
    */
 
+  @Test
   public void positiveSessionScopedObjectTest() throws Exception {
     String testName = "positiveSessionScopedObject";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -179,6 +225,7 @@ public void positiveSessionScopedObjectTest() throws Exception {
    * current ServletContext.
    */
 
+  @Test
   public void positiveApplicationScopedObjectTest() throws Exception {
     String testName = "positiveApplicationScopedObject";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -197,7 +244,10 @@ public void positiveApplicationScopedObjectTest() throws Exception {
    * used without a body.
    */
 
+  @Test
   public void positiveNoBodyTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveNoBody.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveNoBody");
     invoke();
   }
@@ -212,7 +262,10 @@ public void positiveNoBodyTest() throws Exception {
    * That the instance is cast without an Exception.
    */
 
+  @Test
   public void positiveClassTypeCastTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveClassTypeCast.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveClassTypeCast");
     invoke();
   }
@@ -226,6 +279,7 @@ public void positiveClassTypeCastTest() throws Exception {
    * a Fatal Translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateIDFatalTranslationErrorTest() throws Exception {
     String testName = "negativeDuplicateIDFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -245,6 +299,7 @@ public void negativeDuplicateIDFatalTranslationErrorTest() throws Exception {
    * Translation error occurs.
    */
 
+  @Test
   public void negativeSessionScopeFatalTranslationErrorTest() throws Exception {
     String testName = "negativeSessionScopeFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -265,8 +320,11 @@ public void negativeSessionScopeFatalTranslationErrorTest() throws Exception {
    * scope, but will define the type attribute with an incompatible type.
    */
 
+  @Test
   public void negativeClassCastExceptionTest() throws Exception {
     String testName = "negativeClassCastException";
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/negativeClassCastException.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(TEST_NAME, testName);
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_act_usebean_web/" + testName + "Fwd.jsp HTTP/1.0");
@@ -283,6 +341,7 @@ public void negativeClassCastExceptionTest() throws Exception {
    * assignable to type
    */
 
+  @Test
   public void negativeTypeAssignableTest() throws Exception {
     String testName = "negativeTypeAssignable";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -301,6 +360,7 @@ public void negativeTypeAssignableTest() throws Exception {
    * assignable to type
    */
 
+  @Test
   public void negativeInvalidScopeTest() throws Exception {
     String testName = "negativeInvalidScope";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -318,6 +378,7 @@ public void negativeInvalidScopeTest() throws Exception {
    * @test_Strategy: check if the default scope is page
    */
 
+  @Test
   public void defaultScopeTest() throws Exception {
     String testName = "defaultScope";
     TEST_PROPS.setProperty(REQUEST,
@@ -334,6 +395,7 @@ public void defaultScopeTest() throws Exception {
    * @test_Strategy: use a request-time attribute expression for beanName
    */
 
+  @Test
   public void requestTimeBeanNameTest() throws Exception {
     String testName = "requestTimeBeanName";
     TEST_PROPS.setProperty(REQUEST,
@@ -351,6 +413,7 @@ public void requestTimeBeanNameTest() throws Exception {
    * @test_Strategy: use beanName of the form a.b.c.ser
    */
 
+  @Test
   public void serBeanNameTest() throws Exception {
     String testName = "serBeanName";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/URLClientIT.java
similarity index 63%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/URLClientIT.java
index a7275805ef..150b035e6d 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,36 +20,51 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.actions.usebean2;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_coresyntx_act_usebean2_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/core_syntax/actions/usebean2");
     setContextRoot("/jsp_coresyntx_act_usebean2_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_act_usebean2_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_act_usebean2_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/beanBody.tag", "tags/beanBody.tag");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/unrestrictedBodyTestInclude.jsp")), "unrestrictedBodyTestInclude.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/unrestrictedBodyTest.jsp")), "unrestrictedBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noClassNoBeanNameTest.jsp")), "noClassNoBeanNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/inScriptlessTest.jsp")), "inScriptlessTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/existingWithBodyTestInclude.jsp")), "existingWithBodyTestInclude.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/existingWithBodyTest.jsp")), "existingWithBodyTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/blockSCopeTest.jsp")), "blockSCopeTest.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -65,6 +80,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: when used in scriptless context, an EL variable is created.
    */
 
+  @Test
   public void inScriptlessTest() throws Exception {
     String testName = "inScriptlessTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -84,6 +100,7 @@ public void inScriptlessTest() throws Exception {
    * upon the scoping rules and capabilities of the scripting language
    */
 
+  @Test
   public void blockSCopeTest() throws Exception {
     String testName = "blockSCopeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -102,6 +119,7 @@ public void blockSCopeTest() throws Exception {
    * ignored if this bean already exists.
    */
 
+  @Test
   public void existingWithBodyTest() throws Exception {
     String testName = "existingWithBodyTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -122,6 +140,7 @@ public void existingWithBodyTest() throws Exception {
    * shall occur.
    */
 
+  @Test
   public void noClassNoBeanNameTest() throws Exception {
     String testName = "noClassNoBeanNameTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -140,6 +159,7 @@ public void noClassNoBeanNameTest() throws Exception {
    * of the body. Body content is not restricted.
    */
 
+  @Test
   public void unrestrictedBodyTest() throws Exception {
     String testName = "unrestrictedBodyTest";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClient.java
deleted file mode 100644
index 8adb397f91..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClient.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jsp.spec.core_syntax.directives.include;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setGeneralURI("/jsp/spec/core_syntax/directives/include");
-    setContextRoot("/jsp_coresyntx_direct_include_web");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   *
-   */
-
-  /*
-   * @testName: positiveIncludeCtxRelativeDirectiveTest
-   * 
-   * @assertion_ids: JSP:SPEC:69
-   * 
-   * @test_Strategy: Using an include directive, include content referenced by a
-   * context-relative path. PENDING Merge with test below
-   */
-
-  public void positiveIncludeCtxRelativeDirectiveTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveIncludeCtxRelativeDirective");
-    invoke();
-  }
-
-  /*
-   * @testName: positiveIncludePageRelativeDirectiveTest
-   * 
-   * @assertion_ids: JSP:SPEC:69
-   * 
-   * @test_Strategy: Using an include directive, include content referenced by a
-   * page-relative path.
-   */
-
-  public void positiveIncludePageRelativeDirectiveTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveIncludePageRelativeDirective");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClientIT.java
new file mode 100644
index 0000000000..1dc67bb67f
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/URLClientIT.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jsp.spec.core_syntax.directives.include;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
+
+    setGeneralURI("/jsp/spec/core_syntax/directives/include");
+    setContextRoot("/jsp_coresyntx_direct_include_web");
+
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_direct_include_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_direct_include_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/includecommon.jsp")), "includecommon.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludeCtxRelativeDirective.jsp")), "positiveIncludeCtxRelativeDirective.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludePageRelativeDirective.jsp")), "positiveIncludePageRelativeDirective.jsp");
+
+    return archive;
+
+  }
+
+  /*
+   * @class.setup_props: webServerHost; webServerPort; ts_home;
+   *
+   */
+
+  /*
+   * @testName: positiveIncludeCtxRelativeDirectiveTest
+   * 
+   * @assertion_ids: JSP:SPEC:69
+   * 
+   * @test_Strategy: Using an include directive, include content referenced by a
+   * context-relative path. PENDING Merge with test below
+   */
+
+  @Test
+  public void positiveIncludeCtxRelativeDirectiveTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveIncludeCtxRelativeDirective.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveIncludeCtxRelativeDirective");
+    invoke();
+  }
+
+  /*
+   * @testName: positiveIncludePageRelativeDirectiveTest
+   * 
+   * @assertion_ids: JSP:SPEC:69
+   * 
+   * @test_Strategy: Using an include directive, include content referenced by a
+   * page-relative path.
+   */
+
+  @Test
+  public void positiveIncludePageRelativeDirectiveTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveIncludePageRelativeDirective.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveIncludePageRelativeDirective");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClientIT.java
similarity index 70%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClientIT.java
index da1bbd36c3..ea7ccafe82 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClientIT.java
@@ -21,35 +21,128 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.directives.page;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
 
     setGeneralURI("/jsp/spec/core_syntax/directives/page");
     setContextRoot("/jsp_coresyntx_directive_page_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_directive_page_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.addPackages(false, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_directive_page_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/iselignoredaction.tld", "iselignoredaction.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/deferredsyntaxaction.tld", "deferredsyntaxaction.tld");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/willNotSee.jsp")), "willNotSee.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSessionDefault.jsp")), "positiveSessionDefault.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveSession.jsp")), "positiveSession.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveMultipleImport.jsp")), "positiveMultipleImport.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveLang.jsp")), "positiveLang.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveInfo.jsp")), "positiveInfo.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveImport.jsp")), "positiveImport.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveExtends.jsp")), "positiveExtends.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveErrorPage.jsp")), "positiveErrorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateSession.jsp")), "positiveDuplicateSession.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateLanguage.jsp")), "positiveDuplicateLanguage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateIsThreadSafe.jsp")), "positiveDuplicateIsThreadSafe.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateIsErrorPage.jsp")), "positiveDuplicateIsErrorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateIsELIgnored.jsp")), "positiveDuplicateIsELIgnored.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateInfo.jsp")), "positiveDuplicateInfo.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateExtends.jsp")), "positiveDuplicateExtends.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateErrorPage.jsp")), "positiveDuplicateErrorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateContent.jsp")), "positiveDuplicateContent.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateBuffer.jsp")), "positiveDuplicateBuffer.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateAutoFlush.jsp")), "positiveDuplicateAutoFlush.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDefaultIsErrorPage.jsp")), "positiveDefaultIsErrorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveContenttype.jsp")), "positiveContenttype.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveBuffCreate.jsp")), "positiveBuffCreate.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveBuffAutoflush.jsp")), "positiveBuffAutoflush.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeSessionFatalTranslationError.jsp")), "negativeSessionFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeMultiplePageEncoding.jsp")), "negativeMultiplePageEncoding.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeImportUtil.jsp")), "negativeImportUtil.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeImportIo.jsp")), "negativeImportIo.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeFatalTranslationError.jsp")), "negativeFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateSessionFatalTranslationError2.jsp")), "negativeDuplicateSessionFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateSessionFatalTranslationError.jsp")), "negativeDuplicateSessionFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateLanguageFatalTranslationError2.jsp")), "negativeDuplicateLanguageFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateLanguageFatalTranslationError.jsp")), "negativeDuplicateLanguageFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp")), "negativeDuplicateIsThreadSafeFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsThreadSafeFatalTranslationError.jsp")), "negativeDuplicateIsThreadSafeFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsErrorPageFatalTranslationError2.jsp")), "negativeDuplicateIsErrorPageFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsErrorPageFatalTranslationError.jsp")), "negativeDuplicateIsErrorPageFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsELIgnoredFatalTranslationError2.jsp")), "negativeDuplicateIsELIgnoredFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsELIgnoredFatalTranslationError.jsp")), "negativeDuplicateIsELIgnoredFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateInfoFatalTranslationError2.jsp")), "negativeDuplicateInfoFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateInfoFatalTranslationError.jsp")), "negativeDuplicateInfoFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateExtendsFatalTranslationError2.jsp")), "negativeDuplicateExtendsFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateExtendsFatalTranslationError.jsp")), "negativeDuplicateExtendsFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateErrorPageFatalTranslationError2.jsp")), "negativeDuplicateErrorPageFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateErrorPageFatalTranslationError.jsp")), "negativeDuplicateErrorPageFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateContentFatalTranslationError2.jsp")), "negativeDuplicateContentFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateContentFatalTranslationError.jsp")), "negativeDuplicateContentFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateBufferFatalTranslationError2.jsp")), "negativeDuplicateBufferFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateBufferFatalTranslationError.jsp")), "negativeDuplicateBufferFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateAutoFlushFatalTranslationError2.jsp")), "negativeDuplicateAutoFlushFatalTranslationError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateAutoFlushFatalTranslationError.jsp")), "negativeDuplicateAutoFlushFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeBufferSuffix2.jsp")), "negativeBufferSuffix2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeBufferSuffix.jsp")), "negativeBufferSuffix.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeBufferOverflowException.jsp")), "negativeBufferOverflowException.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeBuffAutoflush.jsp")), "negativeBuffAutoflush.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/myerrorpage.jsp")), "myerrorpage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IsELIgnoredTrueTemplateTextTest.jsp")), "IsELIgnoredTrueTemplateTextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IsELIgnoredTrueActionTest.jsp")), "IsELIgnoredTrueActionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IsELIgnoredFalseTemplateTextPoundTest.jsp")), "IsELIgnoredFalseTemplateTextPoundTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IsELIgnoredFalseTemplateTextDollarTest.jsp")), "IsELIgnoredFalseTemplateTextDollarTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IsELIgnoredFalseActionTest.jsp")), "IsELIgnoredFalseActionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportServlet.jsp")), "implicitImportServlet.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportLang.jsp")), "implicitImportLang.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportJsp.jsp")), "implicitImportJsp.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportHttp.jsp")), "implicitImportHttp.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicit.jsp")), "implicit.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/FatalTranslationErrorPage.jsp")), "FatalTranslationErrorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/errorPageExceptionAttributeTestError.jsp")), "errorPageExceptionAttributeTestError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/errorPageExceptionAttributeTest.jsp")), "errorPageExceptionAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/errorpagedefault.jsp")), "errorpagedefault.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ErrorOnELNotFoundTrueTest.jsp")), "ErrorOnELNotFoundTrueTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ErrorOnELNotFoundFalseTest.jsp")), "ErrorOnELNotFoundFalseTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/duplicateErrorPage.jsp")), "duplicateErrorPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp")), "DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueActionTest.jsp")), "DeferredSyntaxAllowedAsLiteralTrueActionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp")), "DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralFalseActionTest.jsp")), "DeferredSyntaxAllowedAsLiteralFalseActionTest.jsp");
+
+    return archive;
   }
 
   /*
@@ -68,6 +161,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * that the buffer is automatically flushed once the buffer is full.
    */
 
+  @Test
   public void positiveBuffAutoflushTest() throws Exception {
     String testName = "positiveBuffAutoflush";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -87,6 +181,7 @@ public void positiveBuffAutoflushTest() throws Exception {
    * translation error.
    */
 
+  @Test
   public void negativeBuffAutoflushTest() throws Exception {
     String testName = "negativeBuffAutoflush";
     TEST_PROPS.setProperty(REQUEST,
@@ -105,6 +200,7 @@ public void negativeBuffAutoflushTest() throws Exception {
    * flush the content
    */
 
+  @Test
   public void positiveBuffCreateTest() throws Exception {
     String testName = "positiveBuffCreate";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -124,6 +220,7 @@ public void positiveBuffCreateTest() throws Exception {
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateBufferFatalTranslationErrorTest() throws Exception {
     String testName = "negativeDuplicateBufferFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -142,6 +239,7 @@ public void negativeDuplicateBufferFatalTranslationErrorTest() throws Exception
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateBufferFatalTranslationError2Test() throws Exception {
     String testName = "negativeDuplicateBufferFatalTranslationError2";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -160,6 +258,7 @@ public void negativeDuplicateBufferFatalTranslationError2Test() throws Exception
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateAutoFlushFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateAutoFlushFatalTranslationError";
@@ -178,6 +277,7 @@ public void negativeDuplicateAutoFlushFatalTranslationErrorTest()
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateAutoFlushFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateAutoFlushFatalTranslationError2";
@@ -197,6 +297,7 @@ public void negativeDuplicateAutoFlushFatalTranslationError2Test()
    * of different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateIsThreadSafeFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateIsThreadSafeFatalTranslationError";
@@ -215,6 +316,7 @@ public void negativeDuplicateIsThreadSafeFatalTranslationErrorTest()
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateIsThreadSafeFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateIsThreadSafeFatalTranslationError2";
@@ -234,6 +336,7 @@ public void negativeDuplicateIsThreadSafeFatalTranslationError2Test()
    * different values Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateIsErrorPageFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateIsErrorPageFatalTranslationError";
@@ -252,6 +355,7 @@ public void negativeDuplicateIsErrorPageFatalTranslationErrorTest()
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateIsErrorPageFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateIsErrorPageFatalTranslationError2";
@@ -271,6 +375,7 @@ public void negativeDuplicateIsErrorPageFatalTranslationError2Test()
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateIsELIgnoredFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateIsELIgnoredFatalTranslationError";
@@ -289,6 +394,7 @@ public void negativeDuplicateIsELIgnoredFatalTranslationErrorTest()
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateIsELIgnoredFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateIsELIgnoredFatalTranslationError2";
@@ -308,7 +414,10 @@ public void negativeDuplicateIsELIgnoredFatalTranslationError2Test()
    * Overflow the buffer and verify the Exception is caught.
    */
 
+  @Test
   public void negativeBufferOverflowExceptionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/negativeBufferOverflowException.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "negativeBufferOverflowException");
     TEST_PROPS.setProperty(STATUS_CODE, OK);
     invoke();
@@ -323,6 +432,7 @@ public void negativeBufferOverflowExceptionTest() throws Exception {
    * "text/plain;charset=ISO-8859-1". Verify on the client side that the
    * Content-Type header was properly set in the response.
    */
+  @Test
   public void positiveContentTypeTest() throws Exception {
     String testName = "positiveContenttype";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -345,6 +455,7 @@ public void positiveContentTypeTest() throws Exception {
    *
    */
 
+  @Test
   public void negativeDuplicateContentFatalTranslationErrorTest() throws Exception {
     String testName = "negativeDuplicateContentFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -363,6 +474,7 @@ public void negativeDuplicateContentFatalTranslationErrorTest() throws Exception
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateContentFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateContentFatalTranslationError2";
@@ -383,6 +495,7 @@ public void negativeDuplicateContentFatalTranslationError2Test()
    * attempt to access the implicit exception object.
    */
 
+  @Test
   public void positiveDefaultIsErrorPageTest() throws Exception {
     String testName = "positiveDefaultIsErrorPage";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -404,7 +517,10 @@ public void positiveDefaultIsErrorPageTest() throws Exception {
    * in web.xml
    */
 
+  @Test
   public void positiveErrorPageTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveErrorPage.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveErrorPage");
     TEST_PROPS.setProperty(IGNORE_STATUS_CODE, "true");
     invoke();
@@ -423,6 +539,7 @@ public void positiveErrorPageTest() throws Exception {
    * isErrorPage attribute set to false and an attempt is made to access the
    * implicit exception object. JavaServer Pages Specification v1.2, Sec 2.10.1
    */
+  @Test
   public void negativeFatalTranslationErrorTest() throws Exception {
     String testName = "negativeFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -446,6 +563,7 @@ public void negativeFatalTranslationErrorTest() throws Exception {
    * Sec 2.10.1
    */
 
+  @Test
   public void negativeDuplicateErrorPageFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateErrorPageFatalTranslationError";
@@ -465,6 +583,7 @@ public void negativeDuplicateErrorPageFatalTranslationErrorTest()
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateErrorPageFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateErrorPageFatalTranslationError2";
@@ -485,7 +604,10 @@ public void negativeDuplicateErrorPageFatalTranslationError2Test()
    * this page instance is an instance of the class that it extends.
    */
 
+  @Test
   public void positiveExtendsTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveExtends.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveExtends");
     invoke();
   }
@@ -503,6 +625,7 @@ public void positiveExtendsTest() throws Exception {
    * distinct values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateExtendsFatalTranslationErrorTest() throws Exception {
     String testName = "negativeDuplicateExtendsFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -524,6 +647,7 @@ public void negativeDuplicateExtendsFatalTranslationErrorTest() throws Exception
    * distinct values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateExtendsFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateExtendsFatalTranslationError2";
@@ -543,7 +667,10 @@ public void negativeDuplicateExtendsFatalTranslationError2Test()
    * Validated that a Properties object can be created and used.
    */
 
+  @Test
   public void positiveImportTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveImport.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveImport");
     invoke();
   }
@@ -558,7 +685,10 @@ public void positiveImportTest() throws Exception {
    * PENDING Merge with exising import tests.
    */
 
+  @Test
   public void implicitImportLangTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/implicitImportLang.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "implicitImportLang");
     invoke();
   }
@@ -572,7 +702,10 @@ public void implicitImportLangTest() throws Exception {
    * are implicitly imported by calling JspFactory.getDefaultFactory() method.
    */
 
+  @Test
   public void implicitImportJspTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/implicitImportJsp.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "implicitImportJsp");
     invoke();
   }
@@ -586,7 +719,10 @@ public void implicitImportJspTest() throws Exception {
    * implicitly imported by creating and using an instance of RequestDispatcher.
    */
 
+  @Test
   public void implicitImportServletTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/implicitImportServlet.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "implicitImportServlet");
     invoke();
   }
@@ -600,7 +736,10 @@ public void implicitImportServletTest() throws Exception {
    * are implicitly imported by creating and using an instance of Cookie.
    */
 
+  @Test
   public void implicitImportHttpTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/implicitImportHttp.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "implicitImportHttp");
     invoke();
   }
@@ -614,6 +753,7 @@ public void implicitImportHttpTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveMultipleImportTest() throws Exception {
     String testName = "positiveMultipleImport";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -632,6 +772,7 @@ public void positiveMultipleImportTest() throws Exception {
    *
    */
 
+  @Test
   public void negativeMultiplePageEncodingTest() throws Exception {
     String testName = "negativeMultiplePageEncoding";
     TEST_PROPS.setProperty(REQUEST,
@@ -649,7 +790,10 @@ public void negativeMultiplePageEncodingTest() throws Exception {
    * getServletInfo().
    */
 
+  @Test
   public void positiveInfoTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveInfo.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveInfo");
     invoke();
   }
@@ -664,6 +808,7 @@ public void positiveInfoTest() throws Exception {
    *
    */
 
+  @Test
   public void negativeDuplicateInfoFatalTranslationErrorTest() throws Exception {
     String testName = "negativeDuplicateInfoFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -682,6 +827,7 @@ public void negativeDuplicateInfoFatalTranslationErrorTest() throws Exception {
    * different values and Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateInfoFatalTranslationError2Test() throws Exception {
     String testName = "negativeDuplicateInfoFatalTranslationError2";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -700,7 +846,10 @@ public void negativeDuplicateInfoFatalTranslationError2Test() throws Exception {
    * without an error.
    */
 
+  @Test
   public void positiveLangTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveLang.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveLang");
     invoke();
   }
@@ -714,6 +863,7 @@ public void positiveLangTest() throws Exception {
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateLanguageFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateLanguageFatalTranslationError";
@@ -733,6 +883,7 @@ public void negativeDuplicateLanguageFatalTranslationErrorTest()
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateLanguageFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateLanguageFatalTranslationError2";
@@ -752,6 +903,7 @@ public void negativeDuplicateLanguageFatalTranslationError2Test()
    * implicit session variable can be accessed and used.
    */
 
+  @Test
   public void positiveSessionTest() throws Exception {
     String testName = "positiveSession";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -771,6 +923,7 @@ public void positiveSessionTest() throws Exception {
    * the implicit session variable can be accessed and used.
    */
 
+  @Test
   public void positiveSessionDefaultTest() throws Exception {
     String testName = "positiveSessionDefault";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -791,6 +944,7 @@ public void positiveSessionDefaultTest() throws Exception {
    * referenced.
    */
 
+  @Test
   public void negativeSessionFatalTranslationErrorTest() throws Exception {
     String testName = "negativeSessionFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -809,6 +963,7 @@ public void negativeSessionFatalTranslationErrorTest() throws Exception {
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateSessionFatalTranslationErrorTest() throws Exception {
     String testName = "negativeDuplicateSessionFatalTranslationError";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -827,6 +982,7 @@ public void negativeDuplicateSessionFatalTranslationErrorTest() throws Exception
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateSessionFatalTranslationError2Test()
       throws Exception {
     String testName = "negativeDuplicateSessionFatalTranslationError2";
@@ -846,6 +1002,7 @@ public void negativeDuplicateSessionFatalTranslationError2Test()
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateBufferTest() throws Exception {
     String testName = "positiveDuplicateBuffer";
     TEST_PROPS.setProperty(REQUEST,
@@ -863,6 +1020,7 @@ public void positiveDuplicateBufferTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateAutoFlushTest() throws Exception {
     String testName = "positiveDuplicateAutoFlush";
     TEST_PROPS.setProperty(REQUEST,
@@ -880,6 +1038,7 @@ public void positiveDuplicateAutoFlushTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateIsThreadSafeTest() throws Exception {
     String testName = "positiveDuplicateIsThreadSafe";
     TEST_PROPS.setProperty(REQUEST,
@@ -897,6 +1056,7 @@ public void positiveDuplicateIsThreadSafeTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateIsErrorPageTest() throws Exception {
     String testName = "positiveDuplicateIsErrorPage";
     TEST_PROPS.setProperty(REQUEST,
@@ -914,6 +1074,7 @@ public void positiveDuplicateIsErrorPageTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateIsELIgnoredTest() throws Exception {
     String testName = "positiveDuplicateIsELIgnored";
     TEST_PROPS.setProperty(REQUEST,
@@ -932,6 +1093,7 @@ public void positiveDuplicateIsELIgnoredTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveDuplicateContentTest() throws Exception {
     String testName = "positiveDuplicateContent";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -950,6 +1112,7 @@ public void positiveDuplicateContentTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateErrorPageTest() throws Exception {
     String testName = "positiveDuplicateErrorPage";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -968,6 +1131,7 @@ public void positiveDuplicateErrorPageTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateExtendsTest() throws Exception {
     String testName = "positiveDuplicateExtends";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -987,6 +1151,7 @@ public void positiveDuplicateExtendsTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveDuplicateInfoTest() throws Exception {
     String testName = "positiveDuplicateInfo";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -1005,6 +1170,7 @@ public void positiveDuplicateInfoTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateLanguageTest() throws Exception {
     String testName = "positiveDuplicateLanguage";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -1023,6 +1189,7 @@ public void positiveDuplicateLanguageTest() throws Exception {
    * attributes.
    */
 
+  @Test
   public void positiveDuplicateSessionTest() throws Exception {
     String testName = "positiveDuplicateSession";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -1041,6 +1208,7 @@ public void positiveDuplicateSessionTest() throws Exception {
    * occur.
    */
 
+  @Test
   public void negativeBufferSuffixTest() throws Exception {
     String testName = "negativeBufferSuffix";
     TEST_PROPS.setProperty(REQUEST,
@@ -1066,6 +1234,7 @@ public void negativeBufferSuffixTest() throws Exception {
    * compatibility with the servlet specification).
    */
 
+  @Test
   public void errorPageExceptionAttributeTest() throws Exception {
     String testName = "errorPageExceptionAttributeTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -1084,6 +1253,7 @@ public void errorPageExceptionAttributeTest() throws Exception {
    * @test_Strategy: Verify that a jsp page does not import java.util.* by
    * default.
    */
+  @Test
   public void negativeImportUtilTest() throws Exception {
     String testName = "negativeImportUtil";
     TEST_PROPS.setProperty(REQUEST,
@@ -1100,6 +1270,7 @@ public void negativeImportUtilTest() throws Exception {
    * @test_Strategy: Verify that a jsp page does not import java.io.* by
    * default.
    */
+  @Test
   public void negativeImportIoTest() throws Exception {
     String testName = "negativeImportIo";
     TEST_PROPS.setProperty(REQUEST,
@@ -1117,7 +1288,10 @@ public void negativeImportIoTest() throws Exception {
    * container in template text when the IsELIgnored page directive attribute is
    * set to true.
    */
+  @Test
   public void isELIgnoredTrueTemplateTextTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/IsELIgnoredTrueTemplateTextTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "IsELIgnoredTrueTemplateTextTest");
     invoke();
   }
@@ -1131,7 +1305,10 @@ public void isELIgnoredTrueTemplateTextTest() throws Exception {
    * the container in template text when the IsELIgnored page directive
    * attribute is set to false and the '$' character is used.
    */
+  @Test
   public void isELIgnoredFalseTemplateTextDollarTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/IsELIgnoredFalseTemplateTextDollarTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "IsELIgnoredFalseTemplateTextDollarTest");
     invoke();
   }
@@ -1147,6 +1324,7 @@ public void isELIgnoredFalseTemplateTextDollarTest() throws Exception {
    * the '#' character is illegal in template text, a translation error is
    * expected.
    */
+  @Test
   public void isELIgnoredFalseTemplateTextPoundTest() throws Exception {
     String testName = "IsELIgnoredFalseTemplateTextPoundTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -1164,7 +1342,10 @@ public void isELIgnoredFalseTemplateTextPoundTest() throws Exception {
    * the container in actions when the IsELIgnored page directive attribute is
    * set to false.
    */
+  @Test
   public void isELIgnoredFalseActionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/IsELIgnoredFalseActionTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "IsELIgnoredFalseActionTest");
     invoke();
   }
@@ -1178,7 +1359,10 @@ public void isELIgnoredFalseActionTest() throws Exception {
    * container in actions when the IsELIgnored page directive attribute is set
    * to true.
    */
+  @Test
   public void isELIgnoredTrueActionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/IsELIgnoredTrueActionTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "IsELIgnoredTrueActionTest");
     invoke();
   }
@@ -1193,6 +1377,7 @@ public void isELIgnoredTrueActionTest() throws Exception {
    * false, a translation error occurs when the '{#' character sequence is used
    * in template text.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralFalseTemplateTextTest()
       throws Exception {
     String testName = "DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest";
@@ -1211,8 +1396,11 @@ public void deferredSyntaxAllowedAsLiteralFalseTemplateTextTest()
    * when the DeferredSyntaxAllowedAsLiteral page directive attribute is set to
    * true, the '{#' character sequence is allowed in template text.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralTrueTemplateTextTest()
       throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD,
         "DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest");
     invoke();
@@ -1228,6 +1416,7 @@ public void deferredSyntaxAllowedAsLiteralTrueTemplateTextTest()
    * false, a translation error occurs when the '{#' character sequence is used
    * in an action.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralFalseActionTest() throws Exception {
     String testName = "DeferredSyntaxAllowedAsLiteralFalseActionTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -1245,7 +1434,10 @@ public void deferredSyntaxAllowedAsLiteralFalseActionTest() throws Exception {
    * when the DeferredSyntaxAllowedAsLiteral page directive attribute is set to
    * true, the '{#' character sequence is allowed in an action.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralTrueActionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueActionTest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD,
         "DeferredSyntaxAllowedAsLiteralTrueActionTest");
     invoke();
@@ -1260,6 +1452,7 @@ public void deferredSyntaxAllowedAsLiteralTrueActionTest() throws Exception {
    * ErrorOnELNotFound page directive attribute is set to false, a reference
    * to an unresolved identifier results in the empty string being used.
    */
+  @Test
   public void errorOnELNotFoundFalseTest()
       throws Exception {
     String testName = "ErrorOnELNotFoundFalseTest";
@@ -1277,6 +1470,7 @@ public void errorOnELNotFoundFalseTest()
    * ErrorOnELNotFound page directive attribute is set to false, a reference
    * to an unresolved identifier results in the empty string being used.
    */
+  @Test
   public void errorOnELNotFoundTrueTest()
       throws Exception {
     String testName = "ErrorOnELNotFoundTrueTest";
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/URLClientIT.java
similarity index 51%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/URLClientIT.java
index f34c63edec..5fb059d296 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,34 +20,45 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.directives.taglib;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.tags.tck.SimpleTag;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
+
 
     setContextRoot("/jsp_core_syntx_direct_taglib_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_syntx_direct_taglib_web.war");
+    archive.addClasses(SimpleTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_syntx_direct_taglib_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/common.tld", "common.tld");    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveTagLib.jsp")), "positiveTagLib.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -66,6 +77,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * container by declaring a new tag and calling an action against that tag.
    */
 
+  @Test
   public void positiveTagLibTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_core_syntx_direct_taglib_web/positiveTagLib.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClientIT.java
similarity index 57%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClientIT.java
index 448efee526..68da817bd6 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,53 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.implicitobjects;
 
-import java.io.PrintWriter;
+import java.io.IOException;
+import java.io.InputStream;
 
-import com.sun.javatest.Status;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
 
     setGeneralURI("/jsp/spec/core_syntax/implicitobjects");
     setContextRoot("/jsp_coresyntx_implicitobjects_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_implicitobjects_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_implicitobjects_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/Errorpage.jsp")), "Errorpage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkSession.jsp")), "checkSession.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkResponse.jsp")), "checkResponse.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkRequest.jsp")), "checkRequest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkPageContext.jsp")), "checkPageContext.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkPage.jsp")), "checkPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkOut.jsp")), "checkOut.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkException.jsp")), "checkException.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkConfig.jsp")), "checkConfig.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkApplication.jsp")), "checkApplication.jsp");
+  
+    return archive;
   }
 
   /*
@@ -68,7 +86,10 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * method can be called against it.
    */
 
+  @Test
   public void checkSessionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkSession.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "checkSession");
     invoke();
   }
@@ -83,7 +104,10 @@ public void checkSessionTest() throws Exception {
    * can be called against it.
    */
 
+  @Test
   public void checkConfigTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkConfig.gf");
+    setGoldenFileStream(gfStream);
     String testName = "checkConfig";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
     TEST_PROPS.setProperty(GOLDENFILE, testName + ".gf");
@@ -102,7 +126,10 @@ public void checkConfigTest() throws Exception {
    * subclass of java.lang.Throwable).
    */
 
+  @Test
   public void checkExceptionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkException.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "checkException");
     TEST_PROPS.setProperty(IGNORE_STATUS_CODE, "true");
     invoke();
@@ -117,7 +144,10 @@ public void checkExceptionTest() throws Exception {
    * variable is of type jakarta.servlet.jsp.JspWriter.
    */
 
+  @Test
   public void checkOutTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkOut.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "checkOut");
     invoke();
   }
@@ -131,7 +161,10 @@ public void checkOutTest() throws Exception {
    * variable is of type java.lang.Object.
    */
 
+  @Test
   public void checkPageTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkPage.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "checkPage");
     invoke();
   }
@@ -146,7 +179,10 @@ public void checkPageTest() throws Exception {
    * method can be called against it.
    */
 
+  @Test
   public void checkPageContextTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkPageContext.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "checkPageContext");
     invoke();
   }
@@ -161,8 +197,11 @@ public void checkPageContextTest() throws Exception {
    * HttpServletRequest) and that a method can be called against it.
    */
 
+  @Test
   public void checkRequestTest() throws Exception {
     String testName = "checkRequest";
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkRequest.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
     TEST_PROPS.setProperty(GOLDENFILE, testName + ".gf");
     TEST_PROPS.setProperty(REQUEST, "GET /jsp_coresyntx_implicitobjects_web/"
@@ -180,7 +219,10 @@ public void checkRequestTest() throws Exception {
    * HttpServletResponse) and that a method can be called against it.
    */
 
+  @Test
   public void checkResponseTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkResponse.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "checkResponse");
     TEST_PROPS.setProperty(EXPECTED_HEADERS, "TestHeader:Method call OK");
     invoke();
@@ -196,7 +238,10 @@ public void checkResponseTest() throws Exception {
    * can be called against it.
    */
 
+  @Test
   public void checkApplicationTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/checkApplication.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "checkApplication");
     invoke();
   }
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/URLClientIT.java
similarity index 52%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/URLClientIT.java
index 3cbe8f9ba3..8b6bd36398 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,46 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.scripting.declaration;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
 
     setGeneralURI("/jsp/spec/core_syntax/scripting/declaration");
     setContextRoot("/jsp_coresyntx_script_declaration_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_script_declaration_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_script_declaration_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDeclaration.jsp")), "positiveDeclaration.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDeclaration.jspx")), "positiveDeclaration.jspx");
+    return archive;
+
   }
 
   /*
@@ -69,7 +80,10 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * syntax.
    */
 
+  @Test
   public void positiveDeclarationTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveDeclaration.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveDeclaration");
     invoke();
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/URLClientIT.java
similarity index 68%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/URLClientIT.java
index a4dff2e1c1..7da939d8ad 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,32 +20,90 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.scripting.el;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
 
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
   }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_script_el_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.addPackages(true, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_script_el_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/el.tld", "el.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/nonstatic.tld", "nonstatic.tld");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElAttributeSearchTest.jsp")), "ElAttributeSearchTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/elBinaryOperatorParenthesesTest.jsp")), "elBinaryOperatorParenthesesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElBinaryOperators1Test.jsp")), "ElBinaryOperators1Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElBinaryOperators2Test.jsp")), "ElBinaryOperators2Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElBinaryOperators3Test.jsp")), "ElBinaryOperators3Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElBinaryOperators4Test.jsp")), "ElBinaryOperators4Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElBooleanCoercionTest.jsp")), "ElBooleanCoercionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElBooleanLiteralTest.jsp")), "ElBooleanLiteralTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElCharacterCoercionTest.jsp")), "ElCharacterCoercionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElEcmaBeanAccessTest.jsp")), "ElEcmaBeanAccessTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElEcmaListArrayTest.jsp")), "ElEcmaListArrayTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElEcmaMapTest.jsp")), "ElEcmaMapTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElEcmaNullValuesTest.jsp")), "ElEcmaNullValuesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElEmptyOperatorTest.jsp")), "ElEmptyOperatorTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElFloatingPointLiteralTest.jsp")), "ElFloatingPointLiteralTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElFunctionInvocationTest.jsp")), "ElFunctionInvocationTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElFunctionNamespaceTest.jsp")), "ElFunctionNamespaceTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitApplicationScopeTest.jsp")), "ElImplicitApplicationScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitCookieTest.jsp")), "ElImplicitCookieTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitHeaderTest.jsp")), "ElImplicitHeaderTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitHeaderValuesTest.jsp")), "ElImplicitHeaderValuesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitInitParamTest.jsp")), "ElImplicitInitParamTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitPageContextTest.jsp")), "ElImplicitPageContextTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitPageScopeTest.jsp")), "ElImplicitPageScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitParamTest.jsp")), "ElImplicitParamTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitParamValuesTest.jsp")), "ElImplicitParamValuesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitRequestScopeTest.jsp")), "ElImplicitRequestScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElImplicitSessionScopeTest.jsp")), "ElImplicitSessionScopeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElIntegerLiteralTest.jsp")), "ElIntegerLiteralTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElInvocationAndUsageTest.jsp")), "ElInvocationAndUsageTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElNonExistingFunctionNameTest.jsp")), "ElNonExistingFunctionNameTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElNonMatchingFunctionSignatureTest.jsp")), "ElNonMatchingFunctionSignatureTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElNonStaticPublicFunctionTest.jsp")), "ElNonStaticPublicFunctionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElNullLiteralTest.jsp")), "ElNullLiteralTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElNumberCoercionTest.jsp")), "ElNumberCoercionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElOtherTypeCoercionTest.jsp")), "ElOtherTypeCoercionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElPrimitiveBoxedTypeConversionTest.jsp")), "ElPrimitiveBoxedTypeConversionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElRelationalOperators1Test.jsp")), "ElRelationalOperators1Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElRelationalOperators2Test.jsp")), "ElRelationalOperators2Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElStaticAttributeTest.jsp")), "ElStaticAttributeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElStringCoercionTest.jsp")), "ElStringCoercionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElStringLiteralTest.jsp")), "ElStringLiteralTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELTernaryOperatorTest.jsp")), "ELTernaryOperatorTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElUnaryOperators1Test.jsp")), "ElUnaryOperators1Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ElUnaryOperators2Test.jsp")), "ElUnaryOperators2Test.jsp");
+    return archive;
 
-    return super.run(args, out, err);
   }
 
   /*
@@ -66,6 +124,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * text, and that the expression is only evaluated using the construct
    * ${expr}.
    */
+  @Test
   public void elInvocationAndUsageTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElInvocationAndUsageTest.jsp HTTP/1.1");
@@ -86,6 +145,7 @@ public void elInvocationAndUsageTest() throws Exception {
    * @test_Strategy: Validate EL expressions provided to an action that does not
    * accept dynamic attributes will result in a translation error.
    */
+  @Test
   public void elStaticAttributeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElStaticAttributeTest.jsp HTTP/1.1");
@@ -103,6 +163,7 @@ public void elStaticAttributeTest() throws Exception {
    * PageContext.findAttribute(String). If no attribute can be found, the
    * expression evaluation must be null.
    */
+  @Test
   public void elAttributeSearchTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElAttributeSearchTest.jsp HTTP/1.1");
@@ -118,6 +179,7 @@ public void elAttributeSearchTest() throws Exception {
    * 
    * @test_Strategy: Validate that the EL Boolean literal evaluated as expected.
    */
+  @Test
   public void elBooleanLiteralTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElBooleanLiteralTest.jsp HTTP/1.1");
@@ -133,6 +195,7 @@ public void elBooleanLiteralTest() throws Exception {
    * 
    * @test_Strategy: Validate that EL Null literal evaluated as expected.
    */
+  @Test
   public void elNullLiteralTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElNullLiteralTest.jsp HTTP/1.1");
@@ -148,6 +211,7 @@ public void elNullLiteralTest() throws Exception {
    * 
    * @test_Strategy: Validate that EL Integer literal evaluated as expected.
    */
+  @Test
   public void elIntegerLiteralTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElIntegerLiteralTest.jsp HTTP/1.1");
@@ -164,6 +228,7 @@ public void elIntegerLiteralTest() throws Exception {
    * @test_Strategy: Validate that EL Floating Point literal evaluated as
    * expected.
    */
+  @Test
   public void elFloatingPointLiteralTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElFloatingPointLiteralTest.jsp HTTP/1.1");
@@ -179,6 +244,7 @@ public void elFloatingPointLiteralTest() throws Exception {
    * 
    * @test_Strategy: Validate that EL String literal evaluated as expected.
    */
+  @Test
   public void elStringLiteralTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElStringLiteralTest.jsp HTTP/1.1");
@@ -195,6 +261,7 @@ public void elStringLiteralTest() throws Exception {
    * @test_Strategy: Validate the binary operators, '+', '-', and '*' when using
    * Doubles, Floats, and Strings.
    */
+  @Test
   public void elBinaryOperators1Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElBinaryOperators1Test.jsp HTTP/1.1");
@@ -211,6 +278,7 @@ public void elBinaryOperators1Test() throws Exception {
    * @test_Strategy: Validate the binary operators, '/' and 'div' when using
    * different types.
    */
+  @Test
   public void elBinaryOperators2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElBinaryOperators2Test.jsp HTTP/1.1");
@@ -227,6 +295,7 @@ public void elBinaryOperators2Test() throws Exception {
    * @test_Strategy: Validate the binary operator '%' and 'mod' when using
    * different types.
    */
+  @Test
   public void elBinaryOperators3Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElBinaryOperators3Test.jsp HTTP/1.1");
@@ -243,6 +312,7 @@ public void elBinaryOperators3Test() throws Exception {
    * @test_Strategy: Validate the binary operator '&&', 'and', '||', and "or'
    * when using different types.
    */
+  @Test
   public void elBinaryOperators4Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElBinaryOperators4Test.jsp HTTP/1.1");
@@ -260,6 +330,7 @@ public void elBinaryOperators4Test() throws Exception {
    * @test_Strategy: Validate the unary minus ('-') operator with variaous types
    * and validate the evaluation of the expression returns the expected value.
    */
+  @Test
   public void elUnaryOperators1Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElUnaryOperators1Test.jsp HTTP/1.1");
@@ -276,6 +347,7 @@ public void elUnaryOperators1Test() throws Exception {
    * @test_Strategy: Validate the unary minus ('!' and 'not') returns the
    * expected value.
    */
+  @Test
   public void elUnaryOperators2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElUnaryOperators2Test.jsp HTTP/1.1");
@@ -295,6 +367,7 @@ public void elUnaryOperators2Test() throws Exception {
    * (Double, Float, Short, etc). Verify the relational operation behaves as
    * expected.
    */
+  @Test
   public void elRelationalOperators1Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElRelationalOperators1Test.jsp HTTP/1.1");
@@ -314,6 +387,7 @@ public void elRelationalOperators1Test() throws Exception {
    * types (Double, Float, Short, etc). Verify the relational operation behaves
    * as expected.
    */
+  @Test
   public void elRelationalOperators2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElRelationalOperators2Test.jsp HTTP/1.1");
@@ -332,6 +406,7 @@ public void elRelationalOperators2Test() throws Exception {
    * to evaluate null, String, array, Map, and Collection values (on the case of
    * the array, map, and Collection, provide emtpy and non-empty values)
    */
+  @Test
   public void elEmptyOperatorTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElEmptyOperatorTest.jsp HTTP/1.1");
@@ -350,6 +425,7 @@ public void elEmptyOperatorTest() throws Exception {
    * String using the EL string coercion rules. Also validate any error
    * conditions that can occur during the coercion.
    */
+  @Test
   public void elStringCoercionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElStringCoercionTest.jsp HTTP/1.1");
@@ -368,6 +444,7 @@ public void elStringCoercionTest() throws Exception {
    * number types successfully based on varying input and target values. Also
    * validate any error conditions that can occur during the coercion.
    */
+  @Test
   public void elNumberCoercionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElNumberCoercionTest.jsp HTTP/1.1");
@@ -386,6 +463,7 @@ public void elNumberCoercionTest() throws Exception {
    * Character. Also validate any error conditions that can occur during the
    * coercion.
    */
+  @Test
   public void elCharacterCoercionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElCharacterCoercionTest.jsp HTTP/1.1");
@@ -404,6 +482,7 @@ public void elCharacterCoercionTest() throws Exception {
    * Boolean. Also validate any error conditions that can occur during the
    * coercion.
    */
+  @Test
   public void elBooleanCoercionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElBooleanCoercionTest.jsp HTTP/1.1");
@@ -422,6 +501,7 @@ public void elBooleanCoercionTest() throws Exception {
    * including invoking propery editors if target type has PropertyEditory.
    * Additionally validate any specified error conditions.
    */
+  @Test
   public void elOtherTypeCoercionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElOtherTypeCoercionTest.jsp HTTP/1.1");
@@ -440,6 +520,7 @@ public void elOtherTypeCoercionTest() throws Exception {
    * to the attribute. If a runtime error doens't occur due to a type problem,
    * the test passes.
    */
+  @Test
   public void elPrimitiveBoxedTypeConversionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElPrimitiveBoxedTypeConversionTest.jsp HTTP/1.1");
@@ -454,6 +535,7 @@ public void elPrimitiveBoxedTypeConversionTest() throws Exception {
    * 
    * @test_Strategy: Validation an EL Function can be successfully invoked.
    */
+  @Test
   public void elFunctionInvocationTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElFunctionInvocationTest.jsp HTTP/1.1");
@@ -469,6 +551,7 @@ public void elFunctionInvocationTest() throws Exception {
    * @test_Strategy: Validate a translation error occurs if the specified
    * function name doesn't exist in the imported taglibrary.
    */
+  @Test
   public void elNonExistingFunctionNameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElNonExistingFunctionNameTest.jsp HTTP/1.1");
@@ -484,6 +567,7 @@ public void elNonExistingFunctionNameTest() throws Exception {
    * @test_Strategy: Validate a translation error occurs if the specified
    * function find a matching name, but the signature doesn't match.
    */
+  @Test
   public void elNonMatchingFunctionSignatureTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElNonMatchingFunctionSignatureTest.jsp HTTP/1.1");
@@ -499,6 +583,7 @@ public void elNonMatchingFunctionSignatureTest() throws Exception {
    * @test_Strategy: Validate a translation error occurs if the specified
    * function is not defined a public static.
    */
+  @Test
   public void elNonStaticPublicFunctionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ElNonStaticPublicFunctionTest.jsp HTTP/1.1");
@@ -514,6 +599,7 @@ public void elNonStaticPublicFunctionTest() throws Exception {
    * @test_Strategy: Validate the operation/evaluation of the container when
    * presented with ternary operator expressions.
    */
+  @Test
   public void elTernaryOperatorTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/ELTernaryOperatorTest.jsp HTTP/1.1");
@@ -530,6 +616,7 @@ public void elTernaryOperatorTest() throws Exception {
    * @test_Strategy: Validate the operation/evaluation of the container when
    * presented with binary operator expressions with parentheses.
    */
+  @Test
   public void elBinaryOperatorParenthesesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_coresyntx_script_el_web/elBinaryOperatorParenthesesTest.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClient.java
deleted file mode 100644
index 783e76221a..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClient.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jsp.spec.core_syntax.scripting.escaping;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setGeneralURI("/jsp/spec/core_syntax/scripting/escaping");
-    setContextRoot("/jsp_coresyntx_script_escape_web");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
-
-  /* Run tests */
-
-  // ============================================ Tests ======
-
-  /*
-   * @testName: positiveEscapingTest
-   * 
-   * @assertion_ids: JSP:SPEC:7
-   * 
-   * @testStrategy: Validate handling of escaped entities.
-   */
-  public void positiveEscapingTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveEscapingTest");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClientIT.java
new file mode 100644
index 0000000000..b11475b6ec
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/URLClientIT.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jsp.spec.core_syntax.scripting.escaping;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
+
+    setGeneralURI("/jsp/spec/core_syntax/scripting/escaping");
+    setContextRoot("/jsp_coresyntx_script_escape_web");
+
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_script_escape_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_script_escape_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveEscapingTest.jsp")), "positiveEscapingTest.jsp");
+
+    return archive;
+
+  }
+
+  
+  /* Run tests */
+
+  // ============================================ Tests ======
+
+  /*
+   * @testName: positiveEscapingTest
+   * 
+   * @assertion_ids: JSP:SPEC:7
+   * 
+   * @testStrategy: Validate handling of escaped entities.
+   */
+  @Test
+  public void positiveEscapingTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveEscapingTest.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveEscapingTest");
+    invoke();
+  }
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/URLClientIT.java
similarity index 52%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/URLClientIT.java
index 4853a5858a..852a4c30fd 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,47 @@
 
 package com.sun.ts.tests.jsp.spec.core_syntax.scripting.expressions;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
 
     setGeneralURI("/jsp/spec/core_syntax/scripting/expressions");
     setContextRoot("/jsp_coresyntx_script_expressions_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_script_expressions_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_script_expressions_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveExprWhiteSpace.jsp")), "positiveExprWhiteSpace.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveExprComment.jsp")), "positiveExprComment.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveExpr.jsp")), "positiveExpr.jsp");
+
+    return archive;
   }
 
   /*
@@ -67,7 +79,10 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * expression by validating the output returned.
    */
 
+  @Test
   public void positiveExprTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveExpr.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveExpr");
     invoke();
   }
@@ -82,7 +97,10 @@ public void positiveExprTest() throws Exception {
    * the HTML comment is treated as template text.
    */
 
+  @Test
   public void positiveExprCommentTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveExprComment.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveExprComment");
     invoke();
   }
@@ -96,7 +114,10 @@ public void positiveExprCommentTest() throws Exception {
    * whitespace values with an expression element.
    */
 
+  @Test
   public void positiveExprWhiteSpaceTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveExprWhiteSpace.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD, "positiveExprWhiteSpace");
     invoke();
   }
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClient.java
deleted file mode 100644
index 5fcd1db2ce..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClient.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jsp.spec.core_syntax.scripting.scriptlet;
-
-import java.io.PrintWriter;
-
-import com.sun.javatest.Status;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-
-public class URLClient extends AbstractUrlClient {
-
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
-
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
-
-    setGeneralURI("/jsp/spec/core_syntax/scripting/scriptlet");
-    setContextRoot("/jsp_coresyntx_script_scriptlet_web");
-
-    return super.run(args, out, err);
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   *
-   */
-
-  /* Run test */
-
-  /*
-   * @testName: positiveScriptletTest
-   * 
-   * @assertion_ids: JSP:SPEC:76
-   * 
-   * @test_Strategy: Correct syntax is used in the scriptlet
-   *
-   */
-
-  public void positiveScriptletTest() throws Exception {
-    TEST_PROPS.setProperty(STANDARD, "positiveScriptlet");
-    invoke();
-  }
-
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClientIT.java
new file mode 100644
index 0000000000..0877c3acdd
--- /dev/null
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/URLClientIT.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+/*
+ * $Id$
+ */
+
+package com.sun.ts.tests.jsp.spec.core_syntax.scripting.scriptlet;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
+
+
+    setGeneralURI("/jsp/spec/core_syntax/scripting/scriptlet");
+    setContextRoot("/jsp_coresyntx_script_scriptlet_web");
+
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_coresyntx_script_scriptlet_web.war");
+    archive.addClasses(Counter.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_coresyntx_script_scriptlet_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveScriptlet.jsp")), "positiveScriptlet.jsp");
+
+    return archive;
+
+  }
+
+  /*
+   * @class.setup_props: webServerHost; webServerPort; ts_home;
+   *
+   */
+
+  /* Run test */
+
+  /*
+   * @testName: positiveScriptletTest
+   * 
+   * @assertion_ids: JSP:SPEC:76
+   * 
+   * @test_Strategy: Correct syntax is used in the scriptlet
+   *
+   */
+
+  @Test
+  public void positiveScriptletTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/positiveScriptlet.gf");
+    setGoldenFileStream(gfStream);
+    TEST_PROPS.setProperty(STANDARD, "positiveScriptlet");
+    invoke();
+  }
+
+}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/jsp/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/jsp/URLClientIT.java
similarity index 71%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/jsp/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/jsp/URLClientIT.java
index 7f502b524b..888aa71c71 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/jsp/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/jsp/URLClientIT.java
@@ -21,35 +21,65 @@
 
 package com.sun.ts.tests.jsp.spec.el.jsp;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.spec.Book;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
+
 
     setGeneralURI("/jsp/spec/el/jsp/");
     setContextRoot("/jsp_el_jsp_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_el_jsp_web.war");
+    archive.addClasses(JspTestUtil.class,
+          SetTag.class,
+          Book.class
+    );
+    archive.addPackages(true, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_el_jsp_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/el_jsp.tld", "el_jsp.tld");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TemplateTextPoundTranslationError.jsp")), "TemplateTextPoundTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TagLibraryPoundTranslationError.jsp")), "TagLibraryPoundTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveELDeferredValueValue.jsp")), "positiveELDeferredValueValue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveELDeferredMethodValue.jsp")), "positiveELDeferredMethodValue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeELDeferredValueValue.jsp")), "negativeELDeferredValueValue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeELDeferredMethodValue.jsp")), "negativeELDeferredMethodValue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitELImport.jsp")), "ImplicitELImport.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELDeferredValueCoercion.jsp")), "ELDeferredValueCoercion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELDeferredMethodStringLiteralError2.jsp")), "ELDeferredMethodStringLiteralError2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELDeferredMethodStringLiteralError1.jsp")), "ELDeferredMethodStringLiteralError1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELDeferredMethodStringLiteral.jsp")), "ELDeferredMethodStringLiteral.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DynamicAttributeSetterMethod.jsp")), "DynamicAttributeSetterMethod.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/AllowedDynamicAttributeValueTypes.jsp")), "AllowedDynamicAttributeValueTypes.jsp");
+    return archive;
+
   }
 
   /*
@@ -70,6 +100,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * accepted and that their values are transmitted correctly to the tag
    * handler.
    */
+  @Test
   public void positiveELDeferredValueValueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/positiveELDeferredValueValue.jsp HTTP/1.1");
@@ -86,6 +117,7 @@ public void positiveELDeferredValueValueTest() throws Exception {
    * using the ${} syntax to a tag handler via a deferred-value element in the
    * tld file. Verify that a page translation error occurs.
    */
+  @Test
   public void negativeELDeferredValueValueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/negativeELDeferredValueValue.jsp HTTP/1.1");
@@ -104,6 +136,7 @@ public void negativeELDeferredValueValueTest() throws Exception {
    * are accepted, that their values are coerced to the expected type and
    * evaluate as expected.
    */
+  @Test
   public void eLDeferredValueCoercionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/ELDeferredValueCoercion.jsp HTTP/1.1");
@@ -122,6 +155,7 @@ public void eLDeferredValueCoercionTest() throws Exception {
    * are accepted and that their values are transmitted correctly to the tag
    * handler.
    */
+  @Test
   public void positiveELDeferredMethodValueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/positiveELDeferredMethodValue.jsp HTTP/1.1");
@@ -138,6 +172,7 @@ public void positiveELDeferredMethodValueTest() throws Exception {
    * using the ${} syntax to a tag handler via a deferred-method element in the
    * tld file. Verify that a page translation error occurs.
    */
+  @Test
   public void negativeELDeferredMethodValueTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/negativeELDeferredMethodValue.jsp HTTP/1.1");
@@ -156,6 +191,7 @@ public void negativeELDeferredMethodValueTest() throws Exception {
    * tld file. Verify that the expressions are accepted, that they are coerced
    * to the proper type and have the expected values.
    */
+  @Test
   public void eLDeferredMethodStringLiteralTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/ELDeferredMethodStringLiteral.jsp HTTP/1.1");
@@ -173,6 +209,7 @@ public void eLDeferredMethodStringLiteralTest() throws Exception {
    * file where the method signature -element has a return value of void. Verify
    * that a page translation error occurs.
    */
+  @Test
   public void eLDeferredMethodStringLiteralErrorTest1() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/ELDeferredMethodStringLiteralError1.jsp HTTP/1.1");
@@ -190,6 +227,7 @@ public void eLDeferredMethodStringLiteralErrorTest1() throws Exception {
    * file where the string literal cannot be coerced to the return type of the
    * method signature. Verify that a page translation error occurs.
    */
+  @Test
   public void eLDeferredMethodStringLiteralErrorTest2() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/ELDeferredMethodStringLiteralError2.jsp HTTP/1.1");
@@ -206,6 +244,7 @@ public void eLDeferredMethodStringLiteralErrorTest2() throws Exception {
    * character sequence, when embedded in template text, triggers a translation
    * error.
    */
+  @Test
   public void templateTextPoundTranslationErrorTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/TemplateTextPoundTranslationError.jsp HTTP/1.1");
@@ -223,6 +262,7 @@ public void templateTextPoundTranslationErrorTest() throws Exception {
    * of a tag library where the jsp-version is greater than or equal to 2.1, and
    * for which the attribute is not marked as a deferred expression in the TLD.
    */
+  @Test
   public void tagLibraryPoundTranslationErrorTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/TagLibraryPoundTranslationError.jsp HTTP/1.1");
@@ -241,6 +281,7 @@ public void tagLibraryPoundTranslationErrorTest() throws Exception {
    * syntax as dynamic attributes to a tag handler. Verify that the expressions
    * are accepted.
    */
+  @Test
   public void allowedDynamicAttributeValueTypesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/AllowedDynamicAttributeValueTypes.jsp HTTP/1.1");
@@ -258,6 +299,7 @@ public void allowedDynamicAttributeValueTypesTest() throws Exception {
    * Implement a tag handler with a setter method whose argument is a primitive
    * type and see that the container generates an internal server error.
    */
+  @Test
   public void dynamicAttributeSetterMethodTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/DynamicAttributeSetterMethod.jsp HTTP/1.1");
@@ -274,6 +316,7 @@ public void dynamicAttributeSetterMethodTest() throws Exception {
    * @test_Strategy: [ImplicitELImport] Verify that each of the implicit package
    * is available to the EL environment.
    */
+  @Test
   public void implicitImportTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_jsp_web/ImplicitELImport.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/language/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/language/URLClientIT.java
similarity index 68%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/language/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/language/URLClientIT.java
index b9d1bc854a..cf8fd66325 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/language/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/el/language/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,32 +20,61 @@
 
 package com.sun.ts.tests.jsp.spec.el.language;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import com.sun.ts.tests.jsp.common.tags.tck.SetTag;
+import com.sun.ts.tests.common.el.spec.Book;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+
+  public URLClientIT() throws Exception {
 
-public class URLClient extends AbstractUrlClient {
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
   }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_el_language_web.war");
+    archive.addClasses(JspTestUtil.class,
+          SetTag.class,
+          Book.class
+    );
+    archive.addPackages(true, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_el_language_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/el_language.tld", "el_language.tld");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/RValueCoercion2.jsp")), "RValueCoercion2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/RValueCoercion1.jsp")), "RValueCoercion1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/PoundDollarSameMeaning.jsp")), "PoundDollarSameMeaning.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ParseOnceEvalMany.jsp")), "ParseOnceEvalMany.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/LiteralExprEval2.jsp")), "LiteralExprEval2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/LiteralExprEval1.jsp")), "LiteralExprEval1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/LiteralExprAsMethodExpr2.jsp")), "LiteralExprAsMethodExpr2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/LiteralExprAsMethodExpr1.jsp")), "LiteralExprAsMethodExpr1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ELSyntaxEscape.jsp")), "ELSyntaxEscape.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DotAndIndexOperatorsSame.jsp")), "DotAndIndexOperatorsSame.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CompositeExprEval2.jsp")), "CompositeExprEval2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/CompositeExprEval1.jsp")), "CompositeExprEval1.jsp");
+    return archive;
 
-    return super.run(args, out, err);
   }
 
   /*
@@ -64,6 +93,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * then pass it to a tag handler as both ${expr} and #{expr}. Verify that the
    * tag handler's evaluation of both forms is identical.
    */
+  @Test
   public void poundDollarSameMeaningTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/PoundDollarSameMeaning.jsp HTTP/1.1");
@@ -79,6 +109,7 @@ public void poundDollarSameMeaningTest() throws Exception {
    * @test_Strategy: [ExprParsedEvalMany] In a jsp page, verify that once an
    * expression is parsed, it can be evaluated multiple times.
    */
+  @Test
   public void parseOnceEvalManyTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/ParseOnceEvalMany.jsp HTTP/1.1");
@@ -95,6 +126,7 @@ public void parseOnceEvalManyTest() throws Exception {
    * String type and verify that the value retrieved when the expression is
    * evaluated is also a String type.
    */
+  @Test
   public void rValueCoercion1Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/RValueCoercion1.jsp HTTP/1.1");
@@ -111,6 +143,7 @@ public void rValueCoercion1Test() throws Exception {
    * complex type and verify that the value retrieved when the expression is
    * evaluated is a String type in accordance with the coercion rules.
    */
+  @Test
   public void rValueCoercion2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/RValueCoercion2.jsp HTTP/1.1");
@@ -127,6 +160,7 @@ public void rValueCoercion2Test() throws Exception {
    * literal String type. Verify that the value retrieved when the expression is
    * evaluated is a String equal to the value set.
    */
+  @Test
   public void literalExprEval1Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/LiteralExprEval1.jsp HTTP/1.1");
@@ -143,6 +177,7 @@ public void literalExprEval1Test() throws Exception {
    * ValueExpression. Verify that the value retrieved when the expression is
    * evaluated is a Boolean of the expected value.
    */
+  @Test
   public void literalExprEval2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/LiteralExprEval2.jsp HTTP/1.1");
@@ -158,6 +193,7 @@ public void literalExprEval2Test() throws Exception {
    * @test_Strategy: [ELSyntaxEscape] Verify that the EL special characters '&'
    * and '#' are treated as literals when preceded with '\'.
    */
+  @Test
   public void eLSyntaxEscapeTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/ELSyntaxEscape.jsp HTTP/1.1");
@@ -173,6 +209,7 @@ public void eLSyntaxEscapeTest() throws Exception {
    * @test_Strategy: [LiteralExprAsMethodExpr] Verify that a literal-expression
    * can also be used as a method expression that returns a non-void value.
    */
+  @Test
   public void literalExprAsMethodExpr1Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/LiteralExprAsMethodExpr1.jsp HTTP/1.1");
@@ -190,6 +227,7 @@ public void literalExprAsMethodExpr1Test() throws Exception {
    * Verify that the standard coercion rules apply if the return type is not
    * java.lang.String.
    */
+  @Test
   public void literalExprAsMethodExpr2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/LiteralExprAsMethodExpr2.jsp HTTP/1.1");
@@ -206,6 +244,7 @@ public void literalExprAsMethodExpr2Test() throws Exception {
    * eval-expressions are coerced to Strings according to the EL type conversion
    * rules and concatenated with any intervening literal-expressions.
    */
+  @Test
   public void compositeExprEval1Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/CompositeExprEval1.jsp HTTP/1.1");
@@ -223,6 +262,7 @@ public void compositeExprEval1Test() throws Exception {
    * to the EL type conversion rules, and concatenated with any intervening
    * literal-expressions.
    */
+  @Test
   public void compositeExprEval2Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/CompositeExprEval2.jsp HTTP/1.1");
@@ -238,6 +278,7 @@ public void compositeExprEval2Test() throws Exception {
    * @test_Strategy: [DotAndIndexOperatorsSame] Verify that the dot and index
    * operators are evaluated in the same way.
    */
+  @Test
   public void dotAndIndexOperatorsSameTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_el_language_web/DotAndIndexOperatorsSame.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/i18n/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/i18n/URLClientIT.java
similarity index 76%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/i18n/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/i18n/URLClientIT.java
index c14f1af25e..d9b8ac9767 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/i18n/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/i18n/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,69 @@
 
 package com.sun.ts.tests.jsp.spec.i18n;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/i18n");
     setContextRoot("/jsp_config_encode_web");
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_i18n_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_i18n_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/BadTagPageEncoding.tag", "tags/BadTagPageEncoding.tag");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/inclusion_utf-16LE.jspx")), "inclusion_utf-16LE.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/inclusion_iso.txt")), "inclusion_iso.txt");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NXmlPrologNonMatchingPropertyGroupTest.jspx")), "I18NXmlPrologNonMatchingPropertyGroupTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NXmlPrologNonMatchingDirectiveTest.jspx")), "I18NXmlPrologNonMatchingDirectiveTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NUnsupportedEncodingTest.jspx")), "I18NUnsupportedEncodingTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NUnsupportedEncodingTest.jsp")), "I18NUnsupportedEncodingTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NPageEncTest.jsp")), "I18NPageEncTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NPageEncContTypeTest.jsp")), "I18NPageEncContTypeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NNoPageEncNoContTypeTest.jsp")), "I18NNoPageEncNoContTypeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NIncludedContentTest.jspx")), "I18NIncludedContentTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NIncludedContentTest.jsp")), "I18NIncludedContentTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NContTypeTest.jsp")), "I18NContTypeTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/I18NBadTagPageEncoding.jsp")), "I18NBadTagPageEncoding.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/prolog/I18NPageEncTest.jspx")), "prolog/I18NPageEncTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/prolog/I18NPageEncContTypeTest.jspx")), "prolog/I18NPageEncContTypeTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/prolog/I18NNoPageEncNoContTypeTest.jspx")), "prolog/I18NNoPageEncNoContTypeTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/prolog/I18NContTypeTest.jspx")), "prolog/I18NContTypeTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noprolog/I18NPageEncTest.jspx")), "noprolog/I18NPageEncTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noprolog/I18NPageEncContTypeTest.jspx")), "noprolog/I18NPageEncContTypeTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noprolog/I18NNoPageEncNoContTypeTest.jspx")), "noprolog/I18NNoPageEncNoContTypeTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/noprolog/I18NContTypeTest.jspx")), "noprolog/I18NContTypeTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bom/UTF16PageEncodingAttribute.jsp")), "bom/UTF16PageEncodingAttribute.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bom/UTF16LE.jsp")), "bom/UTF16LE.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bom/UTF16ConfigElement.jsp")), "bom/UTF16ConfigElement.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bom/UTF16BE.jsp")), "bom/UTF16BE.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bom/UTF16BadPageEncodingAttribute.jsp")), "bom/UTF16BadPageEncodingAttribute.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bom/UTF8ConfigElement.jsp")), "bom/UTF8ConfigElement.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bom/UTF8.jsp")), "bom/UTF8.jsp");
+    return archive;
+
   }
 
   /*
@@ -103,6 +139,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * ServletResponse.getWriter() is called. See the javadoc for
    * ServletResponse.setContentType() and ServletResponse.getWriter().
    */
+  @Test
   public void i18nStandardPageResponseEncodingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_i18n_web/I18NNoPageEncNoContTypeTest.jsp HTTP/1.1");
@@ -189,6 +226,7 @@ public void i18nStandardPageResponseEncodingTest() throws Exception {
    * parse the page without issue. The response content type should be based off
    * the contentType attribute: text/plain with a charset of ISO-8859-1.
    */
+  @Test
   public void i18nXmlPageResponseEncodingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_i18n_web/prolog/I18NNoPageEncNoContTypeTest.jspx HTTP/1.1");
@@ -258,6 +296,7 @@ public void i18nXmlPageResponseEncodingTest() throws Exception {
    * error with a mismatched encoding between property groups and pages in
    * standard syntax are covered in the spec/configuration test area.
    */
+  @Test
   public void i18nEncodingMismatchTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_i18n_web/I18NXmlPrologNonMatchingDirectiveTest.jspx HTTP/1.1");
@@ -279,6 +318,7 @@ public void i18nEncodingMismatchTest() throws Exception {
    * specifies an invalid encoding in the page directive, or if a JSP document
    * has an invalid encoding in the prolog.
    */
+  @Test
   public void i18nUnsupportedEncodingTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_i18n_web/I18NUnsupportedEncodingTest.jsp HTTP/1.1");
@@ -300,6 +340,7 @@ public void i18nUnsupportedEncodingTest() throws Exception {
    * Document encoded in UTF-16BE using the include directive includes another
    * JSP Document encoded in UTF-16LE.
    */
+  @Test
   public void i18nIncludedContentTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_i18n_web/I18NIncludedContentTest.jsp HTTP/1.1");
@@ -321,6 +362,7 @@ public void i18nIncludedContentTest() throws Exception {
    * byte sequences reserved to identify a BOM at the beginning of a page do not
    * appear in the page's output.
    */
+  @Test
   public void i18nBomByteSequencesUTF8Test() throws Exception {
 
     String searchStr = "this is a test";
@@ -341,6 +383,7 @@ public void i18nBomByteSequencesUTF8Test() throws Exception {
    * byte sequences reserved to identify a BOM at the beginning of a page do not
    * appear in the page's output.
    */
+  @Test
   public void i18nBomByteSequencesUTF16BETest() throws Exception {
 
     String searchStr = "this is a test";
@@ -362,6 +405,7 @@ public void i18nBomByteSequencesUTF16BETest() throws Exception {
    * byte sequences reserved to identify a BOM at the beginning of a page do not
    * appear in the page's output.
    */
+  @Test
   public void i18nBomByteSequencesUTF16LETest() throws Exception {
 
     String searchStr = "this is a test";
@@ -382,6 +426,7 @@ public void i18nBomByteSequencesUTF16LETest() throws Exception {
    * it is legal to describe the character encoding in a JSP page-encoding
    * configuration element.
    */
+  @Test
   public void i18nBomLegalCharacterEncodingTest1() throws Exception {
 
     String searchStr = "this is a test";
@@ -402,6 +447,7 @@ public void i18nBomLegalCharacterEncodingTest1() throws Exception {
    * it is legal to describe the character encoding in the pageEncoding
    * attribute of a page directive.
    */
+  @Test
   public void i18nBomLegalCharacterEncodingTest2() throws Exception {
 
     String searchStr = "this is a test";
@@ -423,6 +469,7 @@ public void i18nBomLegalCharacterEncodingTest2() throws Exception {
    * whose URL matches the page does not match the encoding indicated by the
    * BOM.
    */
+  @Test
   public void i18nBomErrorReportingTest1() throws Exception {
 
     TEST_PROPS.setProperty(REQUEST,
@@ -440,6 +487,7 @@ public void i18nBomErrorReportingTest1() throws Exception {
    * results when the encoding specified by the pageEncoding attribute of a page
    * directive does not match the encoding indicated by the BOM.
    */
+  @Test
   public void i18nBomErrorReportingTest2() throws Exception {
 
     TEST_PROPS.setProperty(REQUEST,
@@ -457,6 +505,7 @@ public void i18nBomErrorReportingTest2() throws Exception {
    * results when the encoding specified by the pageEncoding attribute of a tag
    * directive does not match the encoding indicated by the BOM.
    */
+  @Test
   public void i18nBomErrorReportingTest3() throws Exception {
 
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/elements/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/elements/URLClientIT.java
similarity index 64%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/elements/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/elements/URLClientIT.java
index 1b49870a67..68af224029 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/elements/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/elements/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,57 @@
 
 package com.sun.ts.tests.jsp.spec.jspdocument.elements;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_jspdocument_elements_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspdocument_elements_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspdocument_elements_web.xml"));
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scriptingInJspPage.jsp")), "scriptingInJspPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/scripting.jspx")), "scripting.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/notJspDocument.jspx")), "notJspDocument.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeJspRoot.jspx")), "negativeJspRoot.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/jspRootPrefix.jspx")), "jspRootPrefix.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/included.jspx")), "included.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/included.jsp")), "included.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/directivePageInJspPage.jsp")), "directivePageInJspPage.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/directiveIncludeLocation.jspx")), "directiveIncludeLocation.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/directiveIncludeInJspPage.jsp")), "directiveIncludeInJspPage.jsp");
+    return archive;
+
+  }
 
+  
   /*
    * @testName: negativeJspRootTest
    * 
@@ -64,6 +80,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp-property-group config overrides other determiniations.
    */
 
+  @Test
   public void negativeJspRootTest() throws Exception {
     String testName = "negativeJspRoot";
     TEST_PROPS.setProperty(REQUEST,
@@ -84,6 +101,7 @@ public void negativeJspRootTest() throws Exception {
    * @test_Strategy: use a different prefix abc
    */
 
+  @Test
   public void jspRootPrefixTest() throws Exception {
     String testName = "jspRootPrefix";
     TEST_PROPS.setProperty(REQUEST,
@@ -100,6 +118,7 @@ public void jspRootPrefixTest() throws Exception {
    * @test_Strategy: use jsp:directive.include anywhere within a jsp document.
    */
 
+  @Test
   public void directiveIncludeLocationTest() throws Exception {
     String testName = "directiveIncludeLocation";
     TEST_PROPS.setProperty(REQUEST,
@@ -117,6 +136,7 @@ public void directiveIncludeLocationTest() throws Exception {
    * @test_Strategy: use jsp:directive.include in a jsp page
    */
 
+  @Test
   public void directiveIncludeInJspPageTest() throws Exception {
     String testName = "directiveIncludeInJspPage";
     TEST_PROPS.setProperty(REQUEST,
@@ -134,6 +154,7 @@ public void directiveIncludeInJspPageTest() throws Exception {
    * @test_Strategy: use jsp:directive.page in a jsp page
    */
 
+  @Test
   public void directivePageInJspPageTest() throws Exception {
     String testName = "directivePageInJspPage";
     TEST_PROPS.setProperty(REQUEST,
@@ -152,6 +173,7 @@ public void directivePageInJspPageTest() throws Exception {
    * jsp document.
    */
 
+  @Test
   public void scriptingTest() throws Exception {
     String testName = "scripting";
     TEST_PROPS.setProperty(REQUEST,
@@ -170,6 +192,7 @@ public void scriptingTest() throws Exception {
    * jsp page.
    */
 
+  @Test
   public void scriptingInJspPageTest() throws Exception {
     String testName = "scriptingInJspPage";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/general/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/general/URLClientIT.java
similarity index 68%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/general/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/general/URLClientIT.java
index 2357894b49..29be198806 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/general/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/jspdocument/general/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,41 +20,55 @@
 
 package com.sun.ts.tests.jsp.spec.jspdocument.general;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_jspdocument_general_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
   }
 
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   */
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_jspdocument_general_web.war");
+    archive.addClasses(EchoTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_jspdocument_general_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tagdep.tld", "tagdep.tld");    
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/tagDependentTest.jspx")), "tagDependentTest.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeWellFormedness.jspx")), "negativeWellFormedness.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDTDValidation.jspx")), "negativeDTDValidation.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/invalidPlainURI.jsp")), "invalidPlainURI.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/identifyByJspRoot.jsp")), "identifyByJspRoot.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/identifyByExtension.jspx")), "identifyByExtension.jspx");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/identifyByConfig.jsp")), "identifyByConfig.jsp");
+    
+    return archive;
+
+  }
 
+  
   /*
    * @testName: negativeWellFormednessTest
    * 
@@ -63,6 +77,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: access a jsp document that is not well-formed.
    */
 
+  @Test
   public void negativeWellFormednessTest() throws Exception {
     String testName = "negativeWellFormedness";
     TEST_PROPS.setProperty(REQUEST,
@@ -79,6 +94,7 @@ public void negativeWellFormednessTest() throws Exception {
    * @test_Strategy: access a jsp page that has a jsp:root as top element
    */
 
+  @Test
   public void identifyByJspRootTest() throws Exception {
     String testName = "identifyByJspRoot";
     TEST_PROPS.setProperty(REQUEST,
@@ -96,6 +112,7 @@ public void identifyByJspRootTest() throws Exception {
    * does not need to have jsp:root
    */
 
+  @Test
   public void identifyByExtensionTest() throws Exception {
     String testName = "identifyByExtension";
     TEST_PROPS.setProperty(REQUEST,
@@ -113,6 +130,7 @@ public void identifyByExtensionTest() throws Exception {
    * jsp document does not need to have jsp:root
    */
 
+  @Test
   public void identifyByConfigTest() throws Exception {
     String testName = "identifyByConfig";
     TEST_PROPS.setProperty(REQUEST,
@@ -130,6 +148,7 @@ public void identifyByConfigTest() throws Exception {
    * error.
    */
 
+  @Test
   public void negativeDTDValidationTest() throws Exception {
     String testName = "negativeDTDValidation";
     TEST_PROPS.setProperty(REQUEST,
@@ -147,6 +166,7 @@ public void negativeDTDValidationTest() throws Exception {
    * plain uri is not found in the taglib map.
    */
 
+  @Test
   public void invalidPlainURITest() throws Exception {
     String testName = "invalidPlainURI";
     TEST_PROPS.setProperty(REQUEST,
@@ -164,6 +184,7 @@ public void invalidPlainURITest() throws Exception {
    * tag handles inside body must not be invoked.
    */
 
+  @Test
   public void tagDependentTest() throws Exception {
     String testName = "tagDependentTest";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/misc/precompilation/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/misc/precompilation/URLClientIT.java
similarity index 73%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/misc/precompilation/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/misc/precompilation/URLClientIT.java
index 13b24e4a2d..abfe1abcf8 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/misc/precompilation/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/misc/precompilation/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,34 +20,42 @@
 
 package com.sun.ts.tests.jsp.spec.misc.precompilation;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/misc/precompilation");
     setContextRoot("/jsp_misc_precompilation_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_misc_precompilation_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_misc_precompilation_web.xml"));
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/precompile.jsp")), "precompile.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -66,6 +74,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * jsp_precompile has no value.
    */
 
+  @Test
   public void precompileNoValueTest() throws Exception {
     String testName = "precompileNoValue";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -84,6 +93,7 @@ public void precompileNoValueTest() throws Exception {
    * jsp_precompile is set to false.
    */
 
+  @Test
   public void precompileFalseTest() throws Exception {
     String testName = "precompileFalse";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -102,6 +112,7 @@ public void precompileFalseTest() throws Exception {
    * jsp_precompile is set to true.
    */
 
+  @Test
   public void precompileTrueTest() throws Exception {
     String testName = "precompileTrue";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
@@ -120,6 +131,7 @@ public void precompileTrueTest() throws Exception {
    * value and validate that a 500 error occurs.
    */
 
+  @Test
   public void precompileNegativeTest() throws Exception {
     String testName = "precompileNegative";
     TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/URLClientIT.java
similarity index 60%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/URLClientIT.java
index 5b38e1c56a..0215e3a477 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,79 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.directives.attribute20;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_tagfile_directives_attribute20_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfile_directives_attribute20_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfile_directives_attribute20_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeType.tag", "tags/negativeType.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName3Include.tagf", "tags/negativeName3Include.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName3Include.tag", "tags/negativeName3Include.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName3.tag", "tags/negativeName3.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName2Include.tagf", "tags/negativeName2Include.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName2Include.tag", "tags/negativeName2Include.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName2.tag", "tags/negativeName2.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName1Include.tagf", "tags/negativeName1Include.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName1Include.tag", "tags/negativeName1Include.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeName1.tag", "tags/negativeName1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeFragmentType.tag", "tags/negativeFragmentType.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeFragmentRtexprvalue.tag", "tags/negativeFragmentRtexprvalue.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/deferredValueTypeMinimumJspVersion.tag", "tags/deferredValueTypeMinimumJspVersion.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/deferredValueMinimumJspVersion.tag", "tags/deferredValueMinimumJspVersion.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/deferredMethodSignatureMinimumJspVersion.tag", "tags/deferredMethodSignatureMinimumJspVersion.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/deferredMethodMinimumJspVersion.tag", "tags/deferredMethodMinimumJspVersion.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultType.tag", "tags/defaultType.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultRtexprvalue.tag", "tags/defaultRtexprvalue.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultRequired.tag", "tags/defaultRequired.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultFragment.tag", "tags/defaultFragment.tag");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeType.jsp")), "negativeType.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeName3Include.jsp")), "negativeName3Include.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeName3.jsp")), "negativeName3.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeName2Include.jsp")), "negativeName2Include.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeName2.jsp")), "negativeName2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeName1Include.jsp")), "negativeName1Include.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeName1.jsp")), "negativeName1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeFragmentType.jsp")), "negativeFragmentType.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeFragmentRtexprvalue.jsp")), "negativeFragmentRtexprvalue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredValueTypeMinimumJspVersion.jsp")), "deferredValueTypeMinimumJspVersion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredValueMinimumJspVersion.jsp")), "deferredValueMinimumJspVersion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredMethodSignatureMinimumJspVersion.jsp")), "deferredMethodSignatureMinimumJspVersion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredMethodMinimumJspVersion.jsp")), "deferredMethodMinimumJspVersion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultType.jsp")), "defaultType.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultRtexprvalue.jsp")), "defaultRtexprvalue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultRequired.jsp")), "defaultRequired.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultFragment.jsp")), "defaultFragment.jsp");
+    return archive;
+
   }
 
   /*
@@ -67,6 +111,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * directive appears in the same translation unit with the same name
    */
 
+  @Test
   public void negativeName1Test() throws Exception {
     String testName = "negativeName1";
     TEST_PROPS.setProperty(REQUEST,
@@ -84,6 +129,7 @@ public void negativeName1Test() throws Exception {
    * directive appears in the same translation unit with the same name
    */
 
+  @Test
   public void negativeName1IncludeTest() throws Exception {
     String testName = "negativeName1Include";
     TEST_PROPS.setProperty(REQUEST,
@@ -101,6 +147,7 @@ public void negativeName1IncludeTest() throws Exception {
    * equals to the name-given of a variable.
    */
 
+  @Test
   public void negativeName2Test() throws Exception {
     String testName = "negativeName2";
     TEST_PROPS.setProperty(REQUEST,
@@ -118,6 +165,7 @@ public void negativeName2Test() throws Exception {
    * equals to the name-given of a variable.
    */
 
+  @Test
   public void negativeName2IncludeTest() throws Exception {
     String testName = "negativeName2Include";
     TEST_PROPS.setProperty(REQUEST,
@@ -135,6 +183,7 @@ public void negativeName2IncludeTest() throws Exception {
    * equals to dynamic-attributes of a tag directive.
    */
 
+  @Test
   public void negativeName3Test() throws Exception {
     String testName = "negativeName3";
     TEST_PROPS.setProperty(REQUEST,
@@ -152,6 +201,7 @@ public void negativeName3Test() throws Exception {
    * equals to dynamic-attributes of a tag directive.
    */
 
+  @Test
   public void negativeName3IncludeTest() throws Exception {
     String testName = "negativeName3Include";
     TEST_PROPS.setProperty(REQUEST,
@@ -168,6 +218,7 @@ public void negativeName3IncludeTest() throws Exception {
    * @test_Strategy: required default is false
    */
 
+  @Test
   public void defaultRequiredTest() throws Exception {
     String testName = "defaultRequired";
     TEST_PROPS.setProperty(REQUEST,
@@ -185,6 +236,7 @@ public void defaultRequiredTest() throws Exception {
    * type attribute.
    */
 
+  @Test
   public void defaultTypeTest() throws Exception {
     String testName = "defaultType";
     TEST_PROPS.setProperty(REQUEST,
@@ -201,6 +253,7 @@ public void defaultTypeTest() throws Exception {
    * @test_Strategy: A translation error must result if the type is a primitive
    */
 
+  @Test
   public void negativeTypeTest() throws Exception {
     String testName = "negativeType";
     TEST_PROPS.setProperty(REQUEST,
@@ -218,6 +271,7 @@ public void negativeTypeTest() throws Exception {
    * type is specified
    */
 
+  @Test
   public void negativeFragmentTypeTest() throws Exception {
     String testName = "negativeFragmentType";
     TEST_PROPS.setProperty(REQUEST,
@@ -235,6 +289,7 @@ public void negativeFragmentTypeTest() throws Exception {
    * rtexprvalue is specified
    */
 
+  @Test
   public void negativeFragmentRtexprvalueTest() throws Exception {
     String testName = "negativeFragmentRtexprvalue";
     TEST_PROPS.setProperty(REQUEST,
@@ -252,6 +307,7 @@ public void negativeFragmentRtexprvalueTest() throws Exception {
    * type is String.
    */
 
+  @Test
   public void defaultFragmentTest() throws Exception {
     String testName = "defaultFragment";
     TEST_PROPS.setProperty(REQUEST,
@@ -268,6 +324,7 @@ public void defaultFragmentTest() throws Exception {
    * @test_Strategy: rtexprvalue defaults to true.
    */
 
+  @Test
   public void defaultRtexprvalueTest() throws Exception {
     String testName = "defaultRtexprvalue";
     TEST_PROPS.setProperty(REQUEST,
@@ -286,6 +343,7 @@ public void defaultRtexprvalueTest() throws Exception {
    * version less than 2.1.
    */
 
+  @Test
   public void deferredValueMinimumJspVersionTest() throws Exception {
     String testName = "deferredValueMinimumJspVersion";
     TEST_PROPS.setProperty(REQUEST,
@@ -304,6 +362,7 @@ public void deferredValueMinimumJspVersionTest() throws Exception {
    * version less than 2.1.
    */
 
+  @Test
   public void deferredValueTypeMinimumJspVersionTest() throws Exception {
     String testName = "deferredValueTypeMinimumJspVersion";
     TEST_PROPS.setProperty(REQUEST,
@@ -322,6 +381,7 @@ public void deferredValueTypeMinimumJspVersionTest() throws Exception {
    * version less than 2.1.
    */
 
+  @Test
   public void deferredMethodMinimumJspVersionTest() throws Exception {
     String testName = "deferredMethodMinimumJspVersion";
     TEST_PROPS.setProperty(REQUEST,
@@ -340,6 +400,7 @@ public void deferredMethodMinimumJspVersionTest() throws Exception {
    * in a tag file with a JSP version less than 2.1.
    */
 
+  @Test
   public void deferredMethodSignatureMinimumJspVersionTest() throws Exception {
     String testName = "deferredMethodSignatureMinimumJspVersion";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/URLClientIT.java
similarity index 62%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/URLClientIT.java
index d0ba0c180d..14803fb75d 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,61 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.directives.attribute21;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_tagfile_directives_attribute21_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfile_directives_attribute21_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfile_directives_attribute21_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/onlyOneOfDeferredValueOrDeferredMethod.tag", "tags/onlyOneOfDeferredValueOrDeferredMethod.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/implicit.tld", "tags/implicit.tld");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/deferredValueTypeNotSpecified.tag", "tags/deferredValueTypeNotSpecified.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultDeferredValue2.tag", "tags/defaultDeferredValue2.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultDeferredValue1.tag", "tags/defaultDeferredValue1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultDeferredMethodSignature.tag", "tags/defaultDeferredMethodSignature.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultDeferredMethod2.tag", "tags/defaultDeferredMethod2.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultDeferredMethod1.tag", "tags/defaultDeferredMethod1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/bothDeferredValueTypeAndDeferredValue.tag", "tags/bothDeferredValueTypeAndDeferredValue.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/bothDeferredMethodAndSignature.tag", "tags/bothDeferredMethodAndSignature.tag");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/onlyOneOfDeferredValueOrDeferredMethod.jsp")), "onlyOneOfDeferredValueOrDeferredMethod.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredValueTypeNotSpecified.jsp")), "deferredValueTypeNotSpecified.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultDeferredValue2.jsp")), "defaultDeferredValue2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultDeferredValue1.jsp")), "defaultDeferredValue1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultDeferredMethodSignature.jsp")), "defaultDeferredMethodSignature.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultDeferredMethod2.jsp")), "defaultDeferredMethod2.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/defaultDeferredMethod1.jsp")), "defaultDeferredMethod1.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bothDeferredValueTypeAndDeferredValue.jsp")), "bothDeferredValueTypeAndDeferredValue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/bothDeferredMethodAndSignature.jsp")), "bothDeferredMethodAndSignature.jsp");
+    return archive;
+
   }
 
   /*
@@ -67,6 +93,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * result when both deferredValue and deferredMethod appear in the same tag.
    */
 
+  @Test
   public void onlyOneOfDeferredValueOrDeferredMethodTest() throws Exception {
     String testName = "onlyOneOfDeferredValueOrDeferredMethod";
     TEST_PROPS.setProperty(REQUEST,
@@ -84,6 +111,7 @@ public void onlyOneOfDeferredValueOrDeferredMethodTest() throws Exception {
    * deferredValue attribute and a deferredValueType attribute. Verify that the
    * attribute's value represents a deferred value expression.
    */
+  @Test
   public void defaultDeferredValue1Test() throws Exception {
     String testName = "defaultDeferredValue1";
     TEST_PROPS.setProperty(REQUEST,
@@ -102,6 +130,7 @@ public void defaultDeferredValue1Test() throws Exception {
    * attribute's value does not represent a deferred value expression by
    * generating a translation error when '#{' is used.
    */
+  @Test
   public void defaultDeferredValue2Test() throws Exception {
     String testName = "defaultDeferredValue2";
     TEST_PROPS.setProperty(REQUEST,
@@ -120,6 +149,7 @@ public void defaultDeferredValue2Test() throws Exception {
    * that the type resulting from the evaluation of the attribute's value
    * expression is java.lang.Object.
    */
+  @Test
   public void deferredValueTypeNotSpecifiedTest() throws Exception {
     String testName = "deferredValueTypeNotSpecified";
     TEST_PROPS.setProperty(REQUEST,
@@ -137,6 +167,7 @@ public void deferredValueTypeNotSpecifiedTest() throws Exception {
    * must result when both deferredValueType and and deferredValue appear in the
    * same tag where deferredValue is set to false.
    */
+  @Test
   public void bothDeferredValueTypeAndDeferredValueTest() throws Exception {
     String testName = "bothDeferredValueTypeAndDeferredValue";
     TEST_PROPS.setProperty(REQUEST,
@@ -154,6 +185,7 @@ public void bothDeferredValueTypeAndDeferredValueTest() throws Exception {
    * deferredMethod attribute and a deferredMethodSignature attribute. Verify
    * that the attribute's value represents a deferred method expression.
    */
+  @Test
   public void defaultDeferredMethod1Test() throws Exception {
     String testName = "defaultDeferredMethod1";
     TEST_PROPS.setProperty(REQUEST,
@@ -172,6 +204,7 @@ public void defaultDeferredMethod1Test() throws Exception {
    * that the attribute's value does not represent a deferred method expression
    * by generating a translation error when '#{' is used.
    */
+  @Test
   public void defaultDeferredMethod2Test() throws Exception {
     String testName = "defaultDeferredMethod2";
     TEST_PROPS.setProperty(REQUEST,
@@ -189,6 +222,7 @@ public void defaultDeferredMethod2Test() throws Exception {
    * result when both deferredMethodSignature and and deferredMethod appear in
    * the same tag where deferredMethod is set to false.
    */
+  @Test
   public void bothDeferredMethodAndSignatureTest() throws Exception {
     String testName = "bothDeferredMethodAndSignature";
     TEST_PROPS.setProperty(REQUEST,
@@ -207,6 +241,7 @@ public void bothDeferredMethodAndSignatureTest() throws Exception {
    * deferredMethodMethodSignature attribute. Verify that the method signature
    * defaults to void methodname().
    */
+  @Test
   public void defaultDeferredMethodSignatureTest() throws Exception {
     String testName = "defaultDeferredMethodSignature";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/URLClientIT.java
similarity index 59%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/URLClientIT.java
index fada038b56..a178b6cb66 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/URLClientIT.java
@@ -21,36 +21,65 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.directives.general;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
-import com.sun.ts.lib.harness.EETest.Fault;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_tagfile_directives_general_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfile_directives_general_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfile_directives_general_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveTaglib.tag", "tags/positiveTaglib.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveIncludePageRelative.tag", "tags/positiveIncludePageRelative.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveIncludeContextRelative.tag", "tags/positiveIncludeContextRelative.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativePageDirective.tag", "tags/negativePageDirective.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeInclude.tag", "tags/negativeInclude.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/ErrorOnELNotFoundTrue.tag", "tags/ErrorOnELNotFoundTrue.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/ErrorOnELNotFoundFalse.tag", "tags/ErrorOnELNotFoundFalse.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/include/negativeInclude.tagf", "tags/include/negativeInclude.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/include/positiveIncludePageRelative.tagf", "tags/include/positiveIncludePageRelative.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/invoke/positiveTaglibInvokee.tag", "tags/invoke/positiveTaglibInvokee.tag");
+
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveTaglib.jsp")), "positiveTaglib.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludePageRelative.jsp")), "positiveIncludePageRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveIncludeContextRelative.jsp")), "positiveIncludeContextRelative.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeVariableDirective.jsp")), "negativeVariableDirective.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeTagDirective.jsp")), "negativeTagDirective.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativePageDirective.jsp")), "negativePageDirective.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeInclude.jsp")), "negativeInclude.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeAttributeDirective.jsp")), "negativeAttributeDirective.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ErrorOnELNotFoundTrue.jsp")), "ErrorOnELNotFoundTrue.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ErrorOnELNotFoundFalse.jsp")), "ErrorOnELNotFoundFalse.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/include/positiveIncludeContextRelative.tagf")), "include/positiveIncludeContextRelative.tagf");
+    
+    return archive;
+
   }
 
   /*
@@ -69,6 +98,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * error must result.
    */
 
+  @Test
   public void negativePageDirectiveTest() throws Exception {
     String testName = "negativePageDirective";
     TEST_PROPS.setProperty(REQUEST,
@@ -86,6 +116,7 @@ public void negativePageDirectiveTest() throws Exception {
    * error must result.
    */
 
+  @Test
   public void negativeTagDirectiveTest() throws Exception {
     String testName = "negativeTagDirective";
     TEST_PROPS.setProperty(REQUEST,
@@ -103,6 +134,7 @@ public void negativeTagDirectiveTest() throws Exception {
    * translation error must result.
    */
 
+  @Test
   public void negativeAttributeDirectiveTest() throws Exception {
     String testName = "negativeAttributeDirective";
     TEST_PROPS.setProperty(REQUEST,
@@ -120,6 +152,7 @@ public void negativeAttributeDirectiveTest() throws Exception {
    * translation error must result.
    */
 
+  @Test
   public void negativeVariableDirectiveTest() throws Exception {
     String testName = "negativeVariableDirective";
     TEST_PROPS.setProperty(REQUEST,
@@ -136,6 +169,7 @@ public void negativeVariableDirectiveTest() throws Exception {
    * @test_Strategy: use tag include directive with a context relative path.
    */
 
+  @Test
   public void positiveIncludeContextRelativeTest() throws Exception {
     String testName = "positiveIncludeContextRelative";
     TEST_PROPS.setProperty(REQUEST,
@@ -152,6 +186,7 @@ public void positiveIncludeContextRelativeTest() throws Exception {
    * @test_Strategy: use tag include directive with a page relative path.
    */
 
+  @Test
   public void positiveIncludePageRelativeTest() throws Exception {
     String testName = "positiveIncludePageRelative";
     TEST_PROPS.setProperty(REQUEST,
@@ -168,6 +203,7 @@ public void positiveIncludePageRelativeTest() throws Exception {
    * @test_Strategy: use tag include directive to include unsuitable content
    */
 
+  @Test
   public void negativeIncludeTest() throws Exception {
     String testName = "negativeInclude";
     TEST_PROPS.setProperty(REQUEST,
@@ -184,6 +220,7 @@ public void negativeIncludeTest() throws Exception {
    * @test_Strategy: invoke a tag file from within a tag file.
    */
 
+  @Test
   public void positiveTaglibTest() throws Exception {
     String testName = "positiveTaglib";
     TEST_PROPS.setProperty(REQUEST,
@@ -201,6 +238,7 @@ public void positiveTaglibTest() throws Exception {
    * ErrorOnELNotFound tag directive attribute is set to false, a reference
    * to an unresolved identifier results in the empty string being used.
    */
+  @Test
   public void errorOnELNotFoundFalseTest()
       throws Exception {
     String testName = "ErrorOnELNotFoundFalse";
@@ -218,6 +256,7 @@ public void errorOnELNotFoundFalseTest()
    * ErrorOnELNotFound tag directive attribute is set to false, a reference
    * to an unresolved identifier results in the empty string being used.
    */
+  @Test
   public void errorOnELNotFoundTrueTest()
       throws Exception {
     String testName = "ErrorOnELNotFoundTrue";
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClientIT.java
similarity index 61%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClientIT.java
index 0c338f74ed..d77b91fde3 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/URLClientIT.java
@@ -21,36 +21,92 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.directives.tag20;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static String CONTEXT_ROOT = "/jsp_tagfile_directives_tag20_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/tagfiles/directives/tag20");
     setContextRoot("/jsp_tagfile_directives_tag20_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfile_directives_tag20_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfile_directives_tag20_web.xml"));
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/deferredValueMinimumJspVersion.tag", "tags/deferredValueMinimumJspVersion.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/dynamicAttributesNoUri.tag", "tags/dynamicAttributesNoUri.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/implicitImportHttp.tag", "tags/implicitImportHttp.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/implicitImportJsp.tag", "tags/implicitImportJsp.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/implicitImportLang.tag", "tags/implicitImportLang.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/implicitImportServlet.tag", "tags/implicitImportServlet.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeBodyContent.tag", "tags/negativeBodyContent.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateBodyContent.tag", "tags/negativeDuplicateBodyContent.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateDescription.tag", "tags/negativeDuplicateDescription.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateDisplayName.tag", "tags/negativeDuplicateDisplayName.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateDynamicAttributes.tag", "tags/negativeDuplicateDynamicAttributes.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateExample.tag", "tags/negativeDuplicateExample.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateIsELIgnoredFatalTranslationError.tag", "tags/negativeDuplicateIsELIgnoredFatalTranslationError.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateLanguageFatalTranslationError.tag", "tags/negativeDuplicateLanguageFatalTranslationError.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateLargeIcon.tag", "tags/negativeDuplicateLargeIcon.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeDuplicateSmallIcon.tag", "tags/negativeDuplicateSmallIcon.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeMultiplePageEncoding.tag", "tags/negativeMultiplePageEncoding.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeUnrecognizedAttribute.tag", "tags/negativeUnrecognizedAttribute.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveDuplicateAttributes.tag", "tags/positiveDuplicateAttributes.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveDuplicateAttributes.tagf", "tags/positiveDuplicateAttributes.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveImport.tag", "tags/positiveImport.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveLang.tag", "tags/positiveLang.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveMultipleImport.tag", "tags/positiveMultipleImport.tag");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/images/16/icon.jpg")), "images/16/icon.jpg");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/images/32/icon.jpg")), "images/32/icon.jpg");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/deferredValueMinimumJspVersion.jsp")), "deferredValueMinimumJspVersion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/dynamicAttributesNoUri.jsp")), "dynamicAttributesNoUri.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportHttp.jsp")), "implicitImportHttp.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportJsp.jsp")), "implicitImportJsp.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportLang.jsp")), "implicitImportLang.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/implicitImportServlet.jsp")), "implicitImportServlet.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeBodyContent.jsp")), "negativeBodyContent.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateBodyContent.jsp")), "negativeDuplicateBodyContent.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateDescription.jsp")), "negativeDuplicateDescription.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateDisplayName.jsp")), "negativeDuplicateDisplayName.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateDynamicAttributes.jsp")), "negativeDuplicateDynamicAttributes.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateExample.jsp")), "negativeDuplicateExample.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsELIgnoredFatalTranslationError.jsp")), "negativeDuplicateIsELIgnoredFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateLanguageFatalTranslationError.jsp")), "negativeDuplicateLanguageFatalTranslationError.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateLargeIcon.jsp")), "negativeDuplicateLargeIcon.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateSmallIcon.jsp")), "negativeDuplicateSmallIcon.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeMultiplePageEncoding.jsp")), "negativeMultiplePageEncoding.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeUnrecognizedAttribute.jsp")), "negativeUnrecognizedAttribute.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateAttributes.jsp")), "positiveDuplicateAttributes.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveImport.jsp")), "positiveImport.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveLang.jsp")), "positiveLang.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveMultipleImport.jsp")), "positiveMultipleImport.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -68,6 +124,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * @test_Strategy: Declare a tag directive with two isELIgnored attributes.
    */
 
+  @Test
   public void negativeDuplicateIsELIgnoredFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateIsELIgnoredFatalTranslationError";
@@ -86,6 +143,7 @@ public void negativeDuplicateIsELIgnoredFatalTranslationErrorTest()
    * Validated that a ArrayList object can be created and used.
    */
 
+  @Test
   public void positiveImportTest() throws Exception {
     String testName = "positiveImport";
     TEST_PROPS.setProperty(REQUEST,
@@ -103,6 +161,7 @@ public void positiveImportTest() throws Exception {
    * implicitly imported by creating and using a java.lang.Integer object.
    */
 
+  @Test
   public void implicitImportLangTest() throws Exception {
     String testName = "implicitImportLang";
     TEST_PROPS.setProperty(REQUEST,
@@ -120,6 +179,7 @@ public void implicitImportLangTest() throws Exception {
    * are implicitly imported by calling JspFactory.getDefaultFactory() method.
    */
 
+  @Test
   public void implicitImportJspTest() throws Exception {
     String testName = "implicitImportJsp";
     TEST_PROPS.setProperty(REQUEST,
@@ -137,6 +197,7 @@ public void implicitImportJspTest() throws Exception {
    * implicitly imported by creating and using an instance of RequestDispatcher.
    */
 
+  @Test
   public void implicitImportServletTest() throws Exception {
     String testName = "implicitImportServlet";
     TEST_PROPS.setProperty(REQUEST,
@@ -154,6 +215,7 @@ public void implicitImportServletTest() throws Exception {
    * are implicitly imported by creating and using an instance of Cookie.
    */
 
+  @Test
   public void implicitImportHttpTest() throws Exception {
     String testName = "implicitImportHttp";
     TEST_PROPS.setProperty(REQUEST,
@@ -171,6 +233,7 @@ public void implicitImportHttpTest() throws Exception {
    *
    */
 
+  @Test
   public void positiveMultipleImportTest() throws Exception {
     String testName = "positiveMultipleImport";
     TEST_PROPS.setProperty(REQUEST,
@@ -188,6 +251,7 @@ public void positiveMultipleImportTest() throws Exception {
    *
    */
 
+  @Test
   public void negativeMultiplePageEncodingTest() throws Exception {
     String testName = "negativeMultiplePageEncoding";
     TEST_PROPS.setProperty(REQUEST,
@@ -205,6 +269,7 @@ public void negativeMultiplePageEncodingTest() throws Exception {
    * without an error.
    */
 
+  @Test
   public void positiveLangTest() throws Exception {
     String testName = "positiveLang";
     TEST_PROPS.setProperty(REQUEST,
@@ -222,6 +287,7 @@ public void positiveLangTest() throws Exception {
    * different values. Validate that a fatal translation error occurs.
    */
 
+  @Test
   public void negativeDuplicateLanguageFatalTranslationErrorTest()
       throws Exception {
     String testName = "negativeDuplicateLanguageFatalTranslationError";
@@ -240,6 +306,7 @@ public void negativeDuplicateLanguageFatalTranslationErrorTest()
    * directive body-content
    */
 
+  @Test
   public void negativeBodyContentTest() throws Exception {
     String testName = "negativeBodyContent";
     TEST_PROPS.setProperty(REQUEST,
@@ -258,6 +325,7 @@ public void negativeBodyContentTest() throws Exception {
    * attributes are identical for all occurences.
    */
 
+  @Test
   public void positiveDuplicateAttributesTest() throws Exception {
     String testName = "positiveDuplicateAttributes";
     TEST_PROPS.setProperty(REQUEST,
@@ -275,6 +343,7 @@ public void positiveDuplicateAttributesTest() throws Exception {
    * translation error.
    */
 
+  @Test
   public void negativeUnrecognizedAttributeTest() throws Exception {
     String testName = "negativeUnrecognizedAttribute";
     TEST_PROPS.setProperty(REQUEST,
@@ -292,6 +361,7 @@ public void negativeUnrecognizedAttributeTest() throws Exception {
    * in a fatal translation error if the value do not match.
    */
 
+  @Test
   public void negativeDuplicateDisplayNameTest() throws Exception {
     String testName = "negativeDuplicateDisplayName";
     TEST_PROPS.setProperty(REQUEST,
@@ -309,6 +379,7 @@ public void negativeDuplicateDisplayNameTest() throws Exception {
    * in a fatal translation error if the value do not match.
    */
 
+  @Test
   public void negativeDuplicateBodyContentTest() throws Exception {
     String testName = "negativeDuplicateBodyContent";
     TEST_PROPS.setProperty(REQUEST,
@@ -326,6 +397,7 @@ public void negativeDuplicateBodyContentTest() throws Exception {
    * in a fatal translation error if the value do not match.
    */
 
+  @Test
   public void negativeDuplicateDynamicAttributesTest() throws Exception {
     String testName = "negativeDuplicateDynamicAttributes";
     TEST_PROPS.setProperty(REQUEST,
@@ -343,6 +415,7 @@ public void negativeDuplicateDynamicAttributesTest() throws Exception {
    * in a fatal translation error if the value do not match.
    */
 
+  @Test
   public void negativeDuplicateDescriptionTest() throws Exception {
     String testName = "negativeDuplicateDescription";
     TEST_PROPS.setProperty(REQUEST,
@@ -360,6 +433,7 @@ public void negativeDuplicateDescriptionTest() throws Exception {
    * in a fatal translation error if the value do not match.
    */
 
+  @Test
   public void negativeDuplicateExampleTest() throws Exception {
     String testName = "negativeDuplicateExample";
     TEST_PROPS.setProperty(REQUEST,
@@ -377,6 +451,7 @@ public void negativeDuplicateExampleTest() throws Exception {
    * in a fatal translation error if the value do not match.
    */
 
+  @Test
   public void negativeDuplicateSmallIconTest() throws Exception {
     String testName = "negativeDuplicateSmallIcon";
     TEST_PROPS.setProperty(REQUEST,
@@ -394,6 +469,7 @@ public void negativeDuplicateSmallIconTest() throws Exception {
    * in a fatal translation error if the value do not match.
    */
 
+  @Test
   public void negativeDuplicateLargeIconTest() throws Exception {
     String testName = "negativeDuplicateLargeIcon";
     TEST_PROPS.setProperty(REQUEST,
@@ -411,6 +487,7 @@ public void negativeDuplicateLargeIconTest() throws Exception {
    * the Map; all other are ignored.
    */
 
+  @Test
   public void dynamicAttributesNoUriTest() throws Exception {
     String testName = "dynamicAttributesNoUri";
     TEST_PROPS.setProperty(REQUEST,
@@ -430,6 +507,7 @@ public void dynamicAttributesNoUriTest() throws Exception {
    * specified in a tag file with a JSP version less than 2.1.
    */
 
+  @Test
   public void deferredValueMinimumJspVersionTest() throws Exception {
     String testName = "deferredValueMinimumJspVersion";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/URLClientIT.java
similarity index 53%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/URLClientIT.java
index 69f9260e78..d1ba1ce326 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,36 +20,57 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.directives.tag21;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static String CONTEXT_ROOT = "/jsp_tagfile_directives_tag21_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public static String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setGeneralURI("/jsp/spec/tagfiles/directives/tag21");
     setContextRoot("/jsp_tagfile_directives_tag21_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfile_directives_tag21_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfile_directives_tag21_web.xml"));
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/implicit.tld", "tags/implicit.tld"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DeferredSyntaxAsLiteral.tag", "tags/DeferredSyntaxAsLiteral.tag"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueTemplateText.tag", "tags/DeferredSyntaxAllowedAsLiteralTrueTemplateText.tag"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueAction.tag", "tags/DeferredSyntaxAllowedAsLiteralTrueAction.tag"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseTemplateText.tag", "tags/DeferredSyntaxAllowedAsLiteralFalseTemplateText.tag"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseAction.tag", "tags/DeferredSyntaxAllowedAsLiteralFalseAction.tag"); 
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueTemplateText.jsp")), "DeferredSyntaxAllowedAsLiteralTrueTemplateText.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueAction.jsp")), "DeferredSyntaxAllowedAsLiteralTrueAction.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralFalseTemplateText.jsp")), "DeferredSyntaxAllowedAsLiteralFalseTemplateText.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/DeferredSyntaxAllowedAsLiteralFalseAction.jsp")), "DeferredSyntaxAllowedAsLiteralFalseAction.jsp");
+    return archive;
+
   }
 
   /*
@@ -68,6 +89,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * is set to false, a translation error occurs when the '{#' character
    * sequence is used in template text and the jsp version is 2.1 or greater.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralFalseTemplateTextTest()
       throws Exception {
     String testName = "DeferredSyntaxAllowedAsLiteralFalseTemplateText";
@@ -87,8 +109,11 @@ public void deferredSyntaxAllowedAsLiteralFalseTemplateTextTest()
    * is set to true, the '{#' character sequence is allowed in template text
    * when the jsp version is 2.1 or greater.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralTrueTemplateTextTest()
       throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueTemplateText.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD,
         "DeferredSyntaxAllowedAsLiteralTrueTemplateText");
     invoke();
@@ -104,6 +129,7 @@ public void deferredSyntaxAllowedAsLiteralTrueTemplateTextTest()
    * is set to false, a translation error occurs when the '{#' character
    * sequence is used in actions and the jsp version is 2.1 or greater.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralFalseActionTest() throws Exception {
     String testName = "DeferredSyntaxAllowedAsLiteralFalseAction";
     TEST_PROPS.setProperty(REQUEST,
@@ -122,7 +148,10 @@ public void deferredSyntaxAllowedAsLiteralFalseActionTest() throws Exception {
    * is set to true, the '{#' character sequence is allowed in actions when the
    * jsp version is 2.1 or greater.
    */
+  @Test
   public void deferredSyntaxAllowedAsLiteralTrueActionTest() throws Exception {
+    InputStream gfStream = URLClientIT.class.getClassLoader().getResourceAsStream(packagePath+"/DeferredSyntaxAllowedAsLiteralTrueAction.gf");
+    setGoldenFileStream(gfStream);
     TEST_PROPS.setProperty(STANDARD,
         "DeferredSyntaxAllowedAsLiteralTrueAction");
     invoke();
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/URLClientIT.java
similarity index 59%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/URLClientIT.java
index d2805d8e80..eeb4ff19df 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,99 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.directives.variable;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_tagfiles_directives_variable_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfiles_directives_variable_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfiles_directives_variable_web.xml"));
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/falseDeclare.tag", "tags/falseDeclare.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/falseDeclare2.tag", "tags/falseDeclare2.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeAliasAttributeSame.tag", "tags/negativeAliasAttributeSame.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeAliasAttributeSameInclude.tag", "tags/negativeAliasAttributeSameInclude.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeAliasAttributeSameInclude.tagf", "tags/negativeAliasAttributeSameInclude.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeAliasNameGiven.tag", "tags/negativeAliasNameGiven.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameFromAttributeNoAttribute.tag", "tags/negativeNameFromAttributeNoAttribute.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameFromAttributeNotRequired.tag", "tags/negativeNameFromAttributeNotRequired.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameFromAttributeNotString.tag", "tags/negativeNameFromAttributeNotString.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameFromAttributeRtexpr.tag", "tags/negativeNameFromAttributeRtexpr.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameFromAttributeSame.tag", "tags/negativeNameFromAttributeSame.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameFromAttributeSameInclude.tag", "tags/negativeNameFromAttributeSameInclude.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameFromAttributeSameInclude.tagf", "tags/negativeNameFromAttributeSameInclude.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenBoth.tag", "tags/negativeNameGivenBoth.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenDynamic.tag", "tags/negativeNameGivenDynamic.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenDynamicInclude.tag", "tags/negativeNameGivenDynamicInclude.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenDynamicInclude.tagf", "tags/negativeNameGivenDynamicInclude.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenNeither.tag", "tags/negativeNameGivenNeither.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenSame.tag", "tags/negativeNameGivenSame.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenSameInclude.tag", "tags/negativeNameGivenSameInclude.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/negativeNameGivenSameInclude.tagf", "tags/negativeNameGivenSameInclude.tagf");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveDeclare.tag", "tags/positiveDeclare.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveDeclare2.tag", "tags/positiveDeclare2.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/positiveVariableClass.tag", "tags/positiveVariableClass.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/syncAtBegin.tag", "tags/syncAtBegin.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/syncAtBeginNameFromAttribute.tag", "tags/syncAtBeginNameFromAttribute.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/syncAtEnd.tag", "tags/syncAtEnd.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/syncNested.tag", "tags/syncNested.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/syncRemoveAtBegin.tag", "tags/syncRemoveAtBegin.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/syncRemoveAtEnd.tag", "tags/syncRemoveAtEnd.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/syncRemoveNested.tag", "tags/syncRemoveNested.tag");
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/falseDeclareTest.jsp")), "falseDeclareTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeAliasAttributeSame.jsp")), "negativeAliasAttributeSame.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeAliasAttributeSameInclude.jsp")), "negativeAliasAttributeSameInclude.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeAliasNameGiven.jsp")), "negativeAliasNameGiven.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameFromAttributeNoAttribute.jsp")), "negativeNameFromAttributeNoAttribute.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameFromAttributeNotRequired.jsp")), "negativeNameFromAttributeNotRequired.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameFromAttributeNotString.jsp")), "negativeNameFromAttributeNotString.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameFromAttributeRtexpr.jsp")), "negativeNameFromAttributeRtexpr.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameFromAttributeSame.jsp")), "negativeNameFromAttributeSame.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameFromAttributeSameInclude.jsp")), "negativeNameFromAttributeSameInclude.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameGivenBoth.jsp")), "negativeNameGivenBoth.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameGivenDynamic.jsp")), "negativeNameGivenDynamic.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameGivenDynamicInclude.jsp")), "negativeNameGivenDynamicInclude.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameGivenNeither.jsp")), "negativeNameGivenNeither.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameGivenSame.jsp")), "negativeNameGivenSame.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeNameGivenSameInclude.jsp")), "negativeNameGivenSameInclude.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDeclare.jsp")), "positiveDeclare.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveVariableClass.jsp")), "positiveVariableClass.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/syncAtBegin.jsp")), "syncAtBegin.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/syncAtBeginNameFromAttribute.jsp")), "syncAtBeginNameFromAttribute.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/syncAtEnd.jsp")), "syncAtEnd.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/syncNested.jsp")), "syncNested.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/syncRemoveAtBegin.jsp")), "syncRemoveAtBegin.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/syncRemoveAtEnd.jsp")), "syncRemoveAtEnd.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/syncRemoveNested.jsp")), "syncRemoveNested.jsp");
+    return archive;
+
   }
 
   /*
@@ -68,6 +132,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * error.
    */
 
+  @Test
   public void negativeNameGivenBothTest() throws Exception {
     String testName = "negativeNameGivenBoth";
     TEST_PROPS.setProperty(REQUEST,
@@ -86,6 +151,7 @@ public void negativeNameGivenBothTest() throws Exception {
    * error.
    */
 
+  @Test
   public void negativeNameGivenNeitherTest() throws Exception {
     String testName = "negativeNameGivenNeither";
     TEST_PROPS.setProperty(REQUEST,
@@ -103,6 +169,7 @@ public void negativeNameGivenNeitherTest() throws Exception {
    * have the same name-given.
    */
 
+  @Test
   public void negativeNameGivenSameTest() throws Exception {
     String testName = "negativeNameGivenSame";
     TEST_PROPS.setProperty(REQUEST,
@@ -120,6 +187,7 @@ public void negativeNameGivenSameTest() throws Exception {
    * have the same name-given in the same translation unit.
    */
 
+  @Test
   public void negativeNameGivenSameIncludeTest() throws Exception {
     String testName = "negativeNameGivenSameInclude";
     TEST_PROPS.setProperty(REQUEST,
@@ -137,6 +205,7 @@ public void negativeNameGivenSameIncludeTest() throws Exception {
    * the same as a dynamic-attributes of a tag directive.
    */
 
+  @Test
   public void negativeNameGivenDynamicTest() throws Exception {
     String testName = "negativeNameGivenDynamic";
     TEST_PROPS.setProperty(REQUEST,
@@ -155,6 +224,7 @@ public void negativeNameGivenDynamicTest() throws Exception {
    * unit.
    */
 
+  @Test
   public void negativeNameGivenDynamicIncludeTest() throws Exception {
     String testName = "negativeNameGivenDynamicInclude";
     TEST_PROPS.setProperty(REQUEST,
@@ -172,6 +242,7 @@ public void negativeNameGivenDynamicIncludeTest() throws Exception {
    * have the same name-from-attribute.
    */
 
+  @Test
   public void negativeNameFromAttributeSameTest() throws Exception {
     String testName = "negativeNameFromAttributeSame";
     TEST_PROPS.setProperty(REQUEST,
@@ -189,6 +260,7 @@ public void negativeNameFromAttributeSameTest() throws Exception {
    * have the same name-from-attribute.
    */
 
+  @Test
   public void negativeNameFromAttributeSameIncludeTest() throws Exception {
     String testName = "negativeNameFromAttributeSameInclude";
     TEST_PROPS.setProperty(REQUEST,
@@ -206,6 +278,7 @@ public void negativeNameFromAttributeSameIncludeTest() throws Exception {
    * by name-from-attribute does not exist.
    */
 
+  @Test
   public void negativeNameFromAttributeNoAttributeTest() throws Exception {
     String testName = "negativeNameFromAttributeNoAttribute";
     TEST_PROPS.setProperty(REQUEST,
@@ -223,6 +296,7 @@ public void negativeNameFromAttributeNoAttributeTest() throws Exception {
    * to by name-from-attribute is not of type java.lang.String
    */
 
+  @Test
   public void negativeNameFromAttributeNotStringTest() throws Exception {
     String testName = "negativeNameFromAttributeNotString";
     TEST_PROPS.setProperty(REQUEST,
@@ -240,6 +314,7 @@ public void negativeNameFromAttributeNotStringTest() throws Exception {
    * to by name-from-attribute is not required.
    */
 
+  @Test
   public void negativeNameFromAttributeNotRequiredTest() throws Exception {
     String testName = "negativeNameFromAttributeNotRequired";
     TEST_PROPS.setProperty(REQUEST,
@@ -257,6 +332,7 @@ public void negativeNameFromAttributeNotRequiredTest() throws Exception {
    * to by name-from-attribute is rtexprvalue
    */
 
+  @Test
   public void negativeNameFromAttributeRtexprTest() throws Exception {
     String testName = "negativeNameFromAttributeRtexpr";
     TEST_PROPS.setProperty(REQUEST,
@@ -274,6 +350,7 @@ public void negativeNameFromAttributeRtexprTest() throws Exception {
    * name-from-attribute
    */
 
+  @Test
   public void negativeAliasNameGivenTest() throws Exception {
     String testName = "negativeAliasNameGiven";
     TEST_PROPS.setProperty(REQUEST,
@@ -291,6 +368,7 @@ public void negativeAliasNameGivenTest() throws Exception {
    * name of an attribute directive in the same translation unit.
    */
 
+  @Test
   public void negativeAliasAttributeSameTest() throws Exception {
     String testName = "negativeAliasAttributeSame";
     TEST_PROPS.setProperty(REQUEST,
@@ -308,6 +386,7 @@ public void negativeAliasAttributeSameTest() throws Exception {
    * name of an attribute directive in the same translation unit.
    */
 
+  @Test
   public void negativeAliasAttributeSameIncludeTest() throws Exception {
     String testName = "negativeAliasAttributeSameInclude";
     TEST_PROPS.setProperty(REQUEST,
@@ -325,6 +404,7 @@ public void negativeAliasAttributeSameIncludeTest() throws Exception {
    * variable
    */
 
+  @Test
   public void positiveVariableClassTest() throws Exception {
     String testName = "positiveVariableClass";
     TEST_PROPS.setProperty(REQUEST,
@@ -341,6 +421,7 @@ public void positiveVariableClassTest() throws Exception {
    * @test_Strategy: variable synchronization
    */
 
+  @Test
   public void syncAtBeginTest() throws Exception {
     String testName = "syncAtBegin";
     TEST_PROPS.setProperty(REQUEST,
@@ -358,6 +439,7 @@ public void syncAtBeginTest() throws Exception {
    * @test_Strategy: variable synchronization
    */
 
+  @Test
   public void syncAtBeginNameFromAttributeTest() throws Exception {
     String testName = "syncAtBeginNameFromAttribute";
     TEST_PROPS.setProperty(REQUEST,
@@ -376,6 +458,7 @@ public void syncAtBeginNameFromAttributeTest() throws Exception {
    * @test_Strategy: variable synchronization
    */
 
+  @Test
   public void syncNestedTest() throws Exception {
     String testName = "syncNested";
     TEST_PROPS.setProperty(REQUEST,
@@ -393,6 +476,7 @@ public void syncNestedTest() throws Exception {
    * @test_Strategy: variable synchronization
    */
 
+  @Test
   public void syncAtEndTest() throws Exception {
     String testName = "syncAtEnd";
     TEST_PROPS.setProperty(REQUEST,
@@ -410,6 +494,7 @@ public void syncAtEndTest() throws Exception {
    * @test_Strategy: variable synchronization
    */
 
+  @Test
   public void syncRemoveNestedTest() throws Exception {
     String testName = "syncRemoveNested";
     TEST_PROPS.setProperty(REQUEST,
@@ -427,6 +512,7 @@ public void syncRemoveNestedTest() throws Exception {
    * @test_Strategy: variable synchronization
    */
 
+  @Test
   public void syncRemoveAtEndTest() throws Exception {
     String testName = "syncRemoveAtEnd";
     TEST_PROPS.setProperty(REQUEST,
@@ -444,6 +530,7 @@ public void syncRemoveAtEndTest() throws Exception {
    * @test_Strategy: variable synchronization
    */
 
+  @Test
   public void syncRemoveAtBeginTest() throws Exception {
     String testName = "syncRemoveAtBegin";
     TEST_PROPS.setProperty(REQUEST,
@@ -462,6 +549,7 @@ public void syncRemoveAtBeginTest() throws Exception {
    * declared in the calling page or tag file.
    */
 
+  @Test
   public void positiveDeclareTest() throws Exception {
     String testName = "positiveDeclare";
     TEST_PROPS.setProperty(REQUEST,
@@ -479,6 +567,7 @@ public void positiveDeclareTest() throws Exception {
    * declared in the calling page or tag file.
    */
 
+  @Test
   public void falseDeclareTest() throws Exception {
     String testName = "falseDeclareTest";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClientIT.java
similarity index 63%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClientIT.java
index 9aba06561e..fc773ace4b 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,35 +20,58 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.implicitobjects;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
   private static final String CONTEXT_ROOT = "/jsp_tagfiles_implicitobjects_web";
 
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot(CONTEXT_ROOT);
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfiles_implicitobjects_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfiles_implicitobjects_web.xml"));
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/checkSession.tag", "tags/checkSession.tag");    
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/checkRequest.tag", "tags/checkRequest.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/checkResponse.tag", "tags/checkResponse.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/checkOut.tag", "tags/checkOut.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/checkJspContext.tag", "tags/checkJspContext.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/checkConfig.tag", "tags/checkConfig.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/checkApplication.tag", "tags/checkApplication.tag");
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkSession.jsp")), "checkSession.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkResponse.jsp")), "checkResponse.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkRequest.jsp")), "checkRequest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkOut.jsp")), "checkOut.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkJspContext.jsp")), "checkJspContext.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkConfig.jsp")), "checkConfig.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/checkApplication.jsp")), "checkApplication.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -68,6 +91,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * method can be called against it.
    */
 
+  @Test
   public void checkSessionTest() throws Exception {
     String testName = "checkSession";
     TEST_PROPS.setProperty(REQUEST,
@@ -86,6 +110,7 @@ public void checkSessionTest() throws Exception {
    * can be called against it.
    */
 
+  @Test
   public void checkConfigTest() throws Exception {
     String testName = "checkConfig";
     TEST_PROPS.setProperty(REQUEST,
@@ -104,6 +129,7 @@ public void checkConfigTest() throws Exception {
    * variable is of type jakarta.servlet.jsp.JspWriter.
    */
 
+  @Test
   public void checkOutTest() throws Exception {
     String testName = "checkOut";
     TEST_PROPS.setProperty(REQUEST,
@@ -122,6 +148,7 @@ public void checkOutTest() throws Exception {
    * method can be called against it.
    */
 
+  @Test
   public void checkJspContextTest() throws Exception {
     String testName = "checkJspContext";
     TEST_PROPS.setProperty(REQUEST,
@@ -140,6 +167,7 @@ public void checkJspContextTest() throws Exception {
    * HttpServletRequest) and that a method can be called against it.
    */
 
+  @Test
   public void checkRequestTest() throws Exception {
     String testName = "checkRequest";
     TEST_PROPS.setProperty(REQUEST, "GET /jsp_tagfiles_implicitobjects_web/"
@@ -158,6 +186,7 @@ public void checkRequestTest() throws Exception {
    * HttpServletResponse) and that a method can be called against it.
    */
 
+  @Test
   public void checkResponseTest() throws Exception {
     String testName = "checkResponse";
     TEST_PROPS.setProperty(REQUEST,
@@ -176,6 +205,7 @@ public void checkResponseTest() throws Exception {
    * scripting variable is of type jakarta.servlet.ServletContext that a method
    * can be called against it.
    */
+  @Test
   public void checkApplicationTest() throws Exception {
     String testName = "checkApplication";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/packaging/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/packaging/URLClientIT.java
similarity index 53%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/packaging/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/packaging/URLClientIT.java
index e2ccd65614..dc859f4b23 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/packaging/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/packaging/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,79 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.packaging;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_tagfile_pkg_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfile_pkg_web.war");
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfile_pkg_web.xml"));
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tag.tld", "tag.tld");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/WebTag1.tag", "tags/WebTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/badtldversion/WebTag1.tag", "tags/badtldversion/WebTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/badtldversion/implicit.tld", "tags/badtldversion/implicit.tld");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/defaultjspversion/WebTag1.tag", "tags/defaultjspversion/WebTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/dir/WebTag1.tag", "tags/dir/WebTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/reservedname20/DeferredSyntaxAsLiteral.tag", "tags/reservedname20/DeferredSyntaxAsLiteral.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/reservedname20/ImplicitTld20.tag", "tags/reservedname20/ImplicitTld20.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/reservedname20/implicit.tld", "tags/reservedname20/implicit.tld");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/reservedname21/DeferredSyntaxAsLiteral.tag", "tags/reservedname21/DeferredSyntaxAsLiteral.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/reservedname21/ImplicitTld21.tag", "tags/reservedname21/ImplicitTld21.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/reservedname21/implicit.tld", "tags/reservedname21/implicit.tld");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/toomanytldelements/WebTag1.tag", "tags/toomanytldelements/WebTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/toomanytldelements/implicit.tld", "tags/toomanytldelements/implicit.tld");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/versionnotmatch/WebTag1.tag", "tags/versionnotmatch/WebTag1.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/versionnotmatch/implicit.tld", "tags/versionnotmatch/implicit.tld");
+  
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IgnoreTag.tag")), "IgnoreTag.tag");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/Tag1.tag")), "Tag1.tag");
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitTldAdditionalElements.jsp")), "ImplicitTldAdditionalElements.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitTldDefaultJspVersion.jsp")), "ImplicitTldDefaultJspVersion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitTldMinimumJspVersion.jsp")), "ImplicitTldMinimumJspVersion.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitTldReservedName20.jsp")), "ImplicitTldReservedName20.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/ImplicitTldReservedName21.jsp")), "ImplicitTldReservedName21.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagFilePackagedJarIgnoredTagTest.jsp")), "JspTagFilePackagedJarIgnoredTagTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagFilePackagedJarTest.jsp")), "JspTagFilePackagedJarTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagFilePackagedWarTest.jsp")), "JspTagFilePackagedWarTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagFilePackagedWarTldTest.jsp")), "JspTagFilePackagedWarTldTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldImplicitTldJspVersionNotMatch.jsp")), "TldImplicitTldJspVersionNotMatch.jsp");
+  
+    JavaArchive tagfileJar = ShrinkWrap.create(JavaArchive.class, "tagfile.jar");
+    tagfileJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/jartagfile.tld")), "META-INF/jartagfile.tld");
+    tagfileJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/IgnoreTag.tag")), "META-INF/tags/IgnoreTag.tag");
+    tagfileJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/Tag1.tag")), "META-INF/tags/Tag1.tag");
+
+    archive.addAsLibrary(tagfileJar);
+
+    return archive;
+
   }
 
   /*
@@ -69,6 +115,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * referenced in a TLD, can be recognized by the container and invoked within
    * a Page.
    */
+  @Test
   public void jspTagFilePackagedJarTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/JspTagFilePackagedJarTest.jsp HTTP/1.1");
@@ -85,6 +132,7 @@ public void jspTagFilePackagedJarTest() throws Exception {
    * referenced by a TLD, the container ignores the tag file. Since the Page
    * will refer to the ignored tag, a translation error should occur by its use.
    */
+  @Test
   public void jspTagFilePackagedJarIgnoredTagTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/JspTagFilePackagedJarIgnoredTagTest.jsp HTTP/1.1");
@@ -100,6 +148,7 @@ public void jspTagFilePackagedJarIgnoredTagTest() throws Exception {
    * @test_Strategy: Validate that tag files can be properly detected by the
    * container and that they can be used in a Page.
    */
+  @Test
   public void jspTagFilePackagedWarTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/JspTagFilePackagedWarTest.jsp HTTP/1.1");
@@ -115,6 +164,7 @@ public void jspTagFilePackagedWarTest() throws Exception {
    * @test_Strategy: Validate tag files packaged in a web application can be
    * explicity referenced in a TLD to be used by a a Page.
    */
+  @Test
   public void jspTagFilePackagedWarTldTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/JspTagFilePackagedWarTldTest.jsp HTTP/1.1");
@@ -131,6 +181,7 @@ public void jspTagFilePackagedWarTldTest() throws Exception {
    * specified in an implicit.tld file is less than 2.0 a translation error will
    * result.
    */
+  @Test
   public void implicitTldMinimumJspVersionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/ImplicitTldMinimumJspVersion.jsp HTTP/1.1");
@@ -147,6 +198,7 @@ public void implicitTldMinimumJspVersionTest() throws Exception {
    * version specified in an implicit.tld file is less than 2.0 a translation
    * error will result.
    */
+  @Test
   public void implicitTldAdditionalElementsTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/ImplicitTldAdditionalElements.jsp HTTP/1.1");
@@ -163,6 +215,7 @@ public void implicitTldAdditionalElementsTest() throws Exception {
    * is referenced by both a TLD and an implicit TLD, the JSP versions of the
    * TLD and implicit TLD do not need to match.
    */
+  @Test
   public void tldImplicitTldJspVersionNotMatchTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/TldImplicitTldJspVersionNotMatch.jsp HTTP/1.1");
@@ -181,6 +234,7 @@ public void tldImplicitTldJspVersionNotMatchTest() throws Exception {
    * constituent tag files. Verify this for version 2.0 by embedding '{#' in an
    * action without generating a translation error.
    */
+  @Test
   public void implicitTldReservedName20Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/ImplicitTldReservedName20.jsp HTTP/1.1");
@@ -199,6 +253,7 @@ public void implicitTldReservedName20Test() throws Exception {
    * constituent tag files. Verify this for version 2.1 by embedding '{#' in an
    * action to cause a translation error.
    */
+  @Test
   public void implicitTldReservedName21Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/ImplicitTldReservedName21.jsp HTTP/1.1");
@@ -215,6 +270,7 @@ public void implicitTldReservedName21Test() throws Exception {
    * an implicit tag library defaults to 2.0 by embedding an unescaped '#{"
    * character sequence in template text.
    */
+  @Test
   public void implicitTldDefaultJspVersionTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_pkg_web/ImplicitTldDefaultJspVersion.jsp HTTP/1.1");
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/semantics/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/semantics/URLClientIT.java
similarity index 61%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/semantics/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/semantics/URLClientIT.java
index b5cf2aea53..b074fb82da 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/semantics/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagfiles/semantics/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,33 +20,63 @@
 
 package com.sun.ts.tests.jsp.spec.tagfiles.semantics;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
+import com.sun.ts.tests.jsp.common.util.JspTestUtil;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
+
 
     setContextRoot("/jsp_tagfile_semantics_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tagfile_semantics_web.war");
+    archive.addClasses(JspTestUtil.class);
+    archive.addPackages(true, Filters.exclude(URLClientIT.class),
+            URLClientIT.class.getPackageName());
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tagfile_semantics_web.xml"));
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/AttributeNotSpecifiedTag.tag", "tags/AttributeNotSpecifiedTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DeclaredAttributesTag.tag", "tags/DeclaredAttributesTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/DynamicAttributesTag.tag", "tags/DynamicAttributesTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspContextWrapperScopesTag.tag", "tags/JspContextWrapperScopesTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/JspContextWrapperTag.tag", "tags/JspContextWrapperTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/semanticsInvokeClassicTag.tag", "tags/semanticsInvokeClassicTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/semanticsInvokeSimpleTag.tag", "tags/semanticsInvokeSimpleTag.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tags/semanticsJspForward.tag", "tags/semanticsJspForward.tag");
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/mytags.tld", "mytags.tld");
+    
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagSemanticsAttributeNotSpecifiedTest.jsp")), "JspTagSemanticsAttributeNotSpecifiedTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagSemanticsDeclaredAttributesTest.jsp")), "JspTagSemanticsDeclaredAttributesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagSemanticsDynamicAttributesTest.jsp")), "JspTagSemanticsDynamicAttributesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagSemanticsJspContextWrapperTest.jsp")), "JspTagSemanticsJspContextWrapperTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspTagSemanticsScopesTest.jsp")), "JspTagSemanticsScopesTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/semanticsInvokeClassicTag.jsp")), "semanticsInvokeClassicTag.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/semanticsInvokeSimpleTag.jsp")), "semanticsInvokeSimpleTag.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/semanticsJspForward.jsp")), "semanticsJspForward.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/semanticsJspForwardTarget.jsp")), "semanticsJspForwardTarget.jsp");
+
+    return archive;
+
   }
 
   /*
@@ -66,6 +96,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * wrapper is not the same JspContext as that of the invoking page (this
    * includes validate of the jspContext scripting variable).
    */
+  @Test
   public void jspTagSemanticsJspContextWrapperTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_semantics_web/JspTagSemanticsJspContextWrapperTest.jsp HTTP/1.1");
@@ -87,6 +118,7 @@ public void jspTagSemanticsJspContextWrapperTest() throws Exception {
    * request, session, or application scopes of the wrapping context are
    * synchronized with the invoking context.
    */
+  @Test
   public void jspTagSemanticsJspContextWrapperScopesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_semantics_web/JspTagSemanticsScopesTest.jsp HTTP/1.1");
@@ -106,6 +138,7 @@ public void jspTagSemanticsJspContextWrapperScopesTest() throws Exception {
    * be the same as the attribute name and the variable value must be the same
    * as provided at invocation time.
    */
+  @Test
   public void jspTagSemanticsDeclaredAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_semantics_web/JspTagSemanticsDeclaredAttributesTest.jsp HTTP/1.1");
@@ -123,6 +156,7 @@ public void jspTagSemanticsDeclaredAttributesTest() throws Exception {
    * that attribute is not specified at invocation time, no page scoped variable
    * is created.
    */
+  @Test
   public void jspTagSemanticsAttributeNotSpecifiedTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_semantics_web/JspTagSemanticsAttributeNotSpecifiedTest.jsp HTTP/1.1");
@@ -138,6 +172,7 @@ public void jspTagSemanticsAttributeNotSpecifiedTest() throws Exception {
    * 
    * @test_Strategy: Validate dynamic attributes.
    */
+  @Test
   public void jspTagSemanticsDynamicAttributesTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tagfile_semantics_web/JspTagSemanticsDynamicAttributesTest.jsp HTTP/1.1");
@@ -156,6 +191,7 @@ public void jspTagSemanticsDynamicAttributesTest() throws Exception {
    * java.servlet.jsp.SkipPageException.
    */
 
+  @Test
   public void semanticsJspForwardTest() throws Exception {
     String testName = "semanticsJspForward";
     TEST_PROPS.setProperty(REQUEST,
@@ -175,6 +211,7 @@ public void semanticsJspForwardTest() throws Exception {
    * SkipPageException must be thrown.
    */
 
+  @Test
   public void semanticsInvokeSimpleTagTest() throws Exception {
     String testName = "semanticsInvokeSimpleTag";
     TEST_PROPS.setProperty(REQUEST,
@@ -192,6 +229,7 @@ public void semanticsInvokeSimpleTagTest() throws Exception {
    * @test_Strategy: must allow such an invocation to occur.
    */
 
+  @Test
   public void semanticsInvokeClassicTagTest() throws Exception {
     String testName = "semanticsInvokeClassicTag";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tldres/URLClient.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tldres/URLClientIT.java
similarity index 60%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/spec/tldres/URLClient.java
rename to jsp/src/main/java/com/sun/ts/tests/jsp/spec/tldres/URLClientIT.java
index 8b80725d5e..022fbd427d 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tldres/URLClient.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tldres/URLClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,33 +24,79 @@
 
 package com.sun.ts.tests.jsp.spec.tldres;
 
-import java.io.PrintWriter;
 
-import com.sun.javatest.Status;
+import java.io.IOException;
 import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
 
-public class URLClient extends AbstractUrlClient {
-  /**
-   * Entry point for different-VM execution. It should delegate to method
-   * run(String[], PrintWriter, PrintWriter), and this method should not contain
-   * any test configuration.
-   */
-  public static void main(String[] args) {
-    URLClient theTests = new URLClient();
-    Status s = theTests.run(args, new PrintWriter(System.out),
-        new PrintWriter(System.err));
-    s.exit();
-  }
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
+
+
+@ExtendWith(ArquillianExtension.class)
+public class URLClientIT extends AbstractUrlClient {
+
+
+  public URLClientIT() throws Exception {
 
-  /**
-   * Entry point for same-VM execution. In different-VM execution, the main
-   * method delegates to this method.
-   */
-  public Status run(String args[], PrintWriter out, PrintWriter err) {
 
     setContextRoot("/jsp_tldres_web");
 
-    return super.run(args, out, err);
+  }
+
+  @Deployment(testable = false)
+  public static WebArchive createDeployment() throws IOException {
+    
+    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
+    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_tldres_web.war");
+    archive.addClasses(HSListenerWebInf.class, HSListenerWebInfSub.class,
+              UriTag.class, WebXmlTag.class);
+    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_tldres_web.xml"));
+
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/sub/webinfsub.tld", "sub/webinfsub.tld"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/tlds/uri.tld", "tlds/uri.tld"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/webinfpres.tld", "webinfpres.tld"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/webxml.tld", "webxml.tld"); 
+    archive.addAsWebInfResource(URLClientIT.class.getPackage(), "WEB-INF/a12.tld", "a12.tld"); 
+
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/listenerTldTest.jsp")), "listenerTldTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeJSPPrefix.jsp")), "negativeJSPPrefix.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeTaglibAfterActionTest.jsp")), "negativeTaglibAfterActionTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/path/TldResPathRelativeUriTest.jsp")), "path/TldResPathRelativeUriTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/tld12DefaultBodyContent.jsp")), "tld12DefaultBodyContent.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldExplicitWebXmlPrecedenceTest.jsp")), "TldExplicitWebXmlPrecedenceTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldResPath11Test.jsp")), "TldResPath11Test.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldResPathAbsUriNotFoundTest.jsp")), "TldResPathAbsUriNotFoundTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldResPathDirectTldReferenceTest.jsp")), "TldResPathDirectTldReferenceTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldResPathExplicitWebXmlTest.jsp")), "TldResPathExplicitWebXmlTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldResPathMultiTldTest.jsp")), "TldResPathMultiTldTest.jsp");
+    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/TldResPathWebInfUriTest.jsp")), "TldResPathWebInfUriTest.jsp");
+    
+    JavaArchive jsp11taglibJar = ShrinkWrap.create(JavaArchive.class, "jsp11taglib.jar");
+    jsp11taglibJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/taglib.tld")), "META-INF/taglib.tld");
+    jsp11taglibJar.addClass(Tld11Tag.class);
+
+    archive.addAsLibrary(jsp11taglibJar);
+
+    JavaArchive multitaglibJar = ShrinkWrap.create(JavaArchive.class, "multitaglib.jar");
+    multitaglibJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/multi1.tld")), "META-INF/multi1.tld");
+    multitaglibJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/jartagpres.tld")), "META-INF/jartagpres.tld");
+    multitaglibJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/multi1.tld")), "META-INF/multi1.tld");
+    multitaglibJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/metainfsub.tld")), "META-INF/sub/metainfsub.tld");
+    multitaglibJar.addAsResource(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/multi2.tld")), "META-INF/tlds/multi2.tld");
+
+    multitaglibJar.addClasses(HSListenerMetaInf.class, HSListenerMetaInfSub.class, Multi1Tag.class, Multi2Tag.class);
+  
+    archive.addAsLibrary(multitaglibJar);
+
+    return archive;
+
   }
 
   /*
@@ -69,6 +115,7 @@ public Status run(String args[], PrintWriter out, PrintWriter err) {
    * 1.1 specification will be properly added to the containers taglib map and
    * that the defined tag within can be used.
    */
+  @Test
   public void tldResourcePathJsp11Test() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/TldResPath11Test.jsp HTTP/1.1");
@@ -85,6 +132,7 @@ public void tldResourcePathJsp11Test() throws Exception {
    * containing multiple TLDs and adds the TLDs that are found containing a
    *  element to the taglib map.
    */
+  @Test
   public void tldResourcePathMultiTldJarTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/TldResPathMultiTldTest.jsp HTTP/1.1");
@@ -102,6 +150,7 @@ public void tldResourcePathMultiTldJarTest() throws Exception {
    * some subdirectory thereof, and that TLD contains a  element, the
    * container will add that taglibrary to the taglibrary map.
    */
+  @Test
   public void tldResourcePathWebInfUriTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/TldResPathWebInfUriTest.jsp HTTP/1.1");
@@ -118,6 +167,7 @@ public void tldResourcePathWebInfUriTest() throws Exception {
    * entries found in the deployment descriptor to the taglib map and that the
    * tag or tags within can be properly used.
    */
+  @Test
   public void tldResourcePathWebXmlTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/TldResPathExplicitWebXmlTest.jsp HTTP/1.1");
@@ -133,6 +183,7 @@ public void tldResourcePathWebXmlTest() throws Exception {
    * @test_Strategy: Validate the TLD can be directly referenced in the taglib
    * directive and that the tag(s) declared in this TLD can be properly used.
    */
+  @Test
   public void tldResourcePathDirectTldReference() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/TldResPathDirectTldReferenceTest.jsp HTTP/1.1");
@@ -149,6 +200,7 @@ public void tldResourcePathDirectTldReference() throws Exception {
    * web deployment descriptor (web.xml) have precedence over other tag
    * libraries defined with the same URI.
    */
+  @Test
   public void tldExplicitWebXmlPrecedenceTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/TldExplicitWebXmlPrecedenceTest.jsp HTTP/1.1");
@@ -165,6 +217,7 @@ public void tldExplicitWebXmlPrecedenceTest() throws Exception {
    * though a relative path (no leading '/'). No translation error should occur
    * and the tag should be usable within the translation unit.
    */
+  @Test
   public void tldResPathRelativeUriTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/path/TldResPathRelativeUriTest.jsp HTTP/1.1");
@@ -181,6 +234,7 @@ public void tldResPathRelativeUriTest() throws Exception {
    * is an absolute URI that is not present in the container's tag library map,
    * that a translation time error is raised.
    */
+  @Test
   public void tldResPathAbsUriNotFoundTest() throws Exception {
     TEST_PROPS.setProperty(REQUEST,
         "GET /jsp_tldres_web/TldResPathAbsUriNotFoundTest.jsp HTTP/1.1");
@@ -197,6 +251,7 @@ public void tldResPathAbsUriNotFoundTest() throws Exception {
    * required to apply default JSP.
    */
 
+  @Test
   public void tld12DefaultBodyContentTest() throws Exception {
     String testName = "tld12DefaultBodyContent";
     TEST_PROPS.setProperty(REQUEST,
@@ -214,6 +269,7 @@ public void tld12DefaultBodyContentTest() throws Exception {
    * and expect a translation error.
    */
 
+  @Test
   public void negativeJSPPrefixTest() throws Exception {
     String testName = "negativeJSPPrefix";
     TEST_PROPS.setProperty(TEST_NAME, testName);
@@ -232,6 +288,7 @@ public void negativeJSPPrefixTest() throws Exception {
    * files and treat them as extension to web.xml.
    */
 
+  @Test
   public void listenerTldTest() throws Exception {
     String testName = "listenerTldTest";
     TEST_PROPS.setProperty(REQUEST,
@@ -249,6 +306,7 @@ public void listenerTldTest() throws Exception {
    * @test_Strategy: It is a fatal translation error for the taglib directive to
    * appear after actions or functions using the prefix.
    */
+  @Test
   public void negativeTaglibAfterActionTest() throws Exception {
     String testName = "negativeTaglibAfterActionTest";
     TEST_PROPS.setProperty(REQUEST,
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTest.jsp
new file mode 100644
index 0000000000..496d20aa5f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/ArrayELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/arrayelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/build.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/WEB-INF/arrayelresolver.tld
similarity index 50%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/build.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/WEB-INF/arrayelresolver.tld
index 55167e9587..2a29d5c01a 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/build.xml
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/WEB-INF/arrayelresolver.tld
@@ -1,3 +1,4 @@
+
 
 
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
+
+
+  1.0
+  ArrayELResolver
+  
+    ArrayELResolver API tests
+    ArrayELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_el.arrayelresolver.ArrayELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/jsp_arrayelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/jsp_arrayelresolver_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/jsp_arrayelresolver_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/arrayelresolver/jsp_arrayelresolver_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTest.jsp
new file mode 100644
index 0000000000..85ba0b6452
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/BeanELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/beanelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/build.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/WEB-INF/beanelresolver.tld
similarity index 50%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/build.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/WEB-INF/beanelresolver.tld
index 0e437e2fa1..41d8250472 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/build.xml
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/WEB-INF/beanelresolver.tld
@@ -1,3 +1,4 @@
+
 
 
-
-
-    
-    
-    
-    
-
-    
-         
-            
-        
-    
-
-
+
+
+  1.0
+  BeanELResolver
+  
+    BeanELResolver API tests
+    BeanELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_el.beanelresolver.BeanELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/jsp_beanelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/jsp_beanelresolver_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/jsp_beanelresolver_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/beanelresolver/jsp_beanelresolver_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTest.jsp
new file mode 100644
index 0000000000..427660b58d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/CompositeELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/compelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/WEB-INF/compelresolver.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/WEB-INF/compelresolver.tld
new file mode 100644
index 0000000000..d6a1758b74
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/WEB-INF/compelresolver.tld
@@ -0,0 +1,33 @@
+
+
+
+
+
+  1.0
+  CompositeELResolver
+  
+    CompositeELResolver API tests
+    CompositeELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_el.compelresolver.CompositeELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/jsp_compelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/jsp_compelresolver_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/jsp_compelresolver_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/compelresolver/jsp_compelresolver_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/CreateMethodExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/CreateMethodExpressionTest.jsp
new file mode 100644
index 0000000000..146d334156
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/CreateMethodExpressionTest.jsp
@@ -0,0 +1,65 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             jakarta.el.MethodExpression,
+             jakarta.el.MethodInfo,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String METHOD_EXPR = "string-literal";
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+                    MethodExpression mexp = 
+                            jaContext.getExpressionFactory().createMethodExpression(
+                            elContext, METHOD_EXPR, java.lang.String.class,
+                            new Class[] { });
+
+                    if (mexp != null) {
+                
+                        MethodInfo minfo = mexp.getMethodInfo(elContext);
+                        String name = (String) minfo.getName();
+                        out.println("Test PASSED");
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateMethodExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/jsp_createmethexpr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/jsp_createmethexpr_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/jsp_createmethexpr_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createmethexpr/jsp_createmethexpr_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/CreateValueExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/CreateValueExpressionTest.jsp
new file mode 100644
index 0000000000..dc6658e368
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/CreateValueExpressionTest.jsp
@@ -0,0 +1,70 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             jakarta.el.ValueExpression,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String VARIABLE_EXPR = "${foo}";
+private static final String EXPECTED_VALUE = "bar";
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+                    ValueExpression vexp = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, VARIABLE_EXPR, VARIABLE_EXPR.getClass());
+
+                    if (vexp != null) {
+                
+                        vexp.setValue(elContext, EXPECTED_VALUE);
+                        String name = (String) vexp.getValue(elContext);
+
+                        if (name.equals(EXPECTED_VALUE)) 
+                            out.println("Test PASSED");
+                        else {
+                            out.println("Test FAILED. Expected value = " + EXPECTED_VALUE);
+                            out.println("Computed value = " + name); 
+                        }
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateValueExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/jsp_createvalexpr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/jsp_createvalexpr_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/jsp_createvalexpr_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/createvalexpr/jsp_createvalexpr_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/ELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/ELResolverTest.jsp
new file mode 100644
index 0000000000..45d51e5ab8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/ELResolverTest.jsp
@@ -0,0 +1,47 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             com.sun.ts.tests.common.el.api.resolver.ResolverTest,
+             jakarta.el.ELResolver,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+        StringBuffer buf = new StringBuffer();
+
+        if (elContext != null) {
+            try {
+                ELResolver resolver = elContext.getELResolver();
+                boolean pass = ResolverTest.testELResolver(
+                        elContext, resolver, null, "Color", "blue", buf, false);
+                out.println(buf.toString());
+                if (pass) out.println("Test PASSED.");
+            } catch (Throwable t) {
+                out.println(buf.toString());
+                JspTestUtil.handleThrowable(t, out, "ElResolverTest");
+            }
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/jsp_elresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/jsp_elresolver_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/jsp_elresolver_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/elresolver/jsp_elresolver_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTest.jsp
new file mode 100644
index 0000000000..8f10cb1abd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/ListELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/listelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/WEB-INF/listelresolver.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/WEB-INF/listelresolver.tld
new file mode 100644
index 0000000000..91f21ca60c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/WEB-INF/listelresolver.tld
@@ -0,0 +1,33 @@
+
+
+
+
+
+  1.0
+  ListELResolver
+  
+    ListELResolver API tests
+    ListELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_el.listelresolver.ListELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/jsp_listelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/jsp_listelresolver_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/jsp_listelresolver_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/listelresolver/jsp_listelresolver_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTest.jsp
new file mode 100644
index 0000000000..9732619a0b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/MapELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/mapelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/WEB-INF/mapelresolver.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/WEB-INF/mapelresolver.tld
new file mode 100644
index 0000000000..60672a6da2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/WEB-INF/mapelresolver.tld
@@ -0,0 +1,33 @@
+
+
+
+
+
+  1.0
+  MapELResolver
+  
+    MapELResolver API tests
+    MapELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_el.mapelresolver.MapELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/jsp_mapelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/jsp_mapelresolver_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/jsp_mapelresolver_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/mapelresolver/jsp_mapelresolver_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTest.jsp
new file mode 100644
index 0000000000..b97fb74e5c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/MethodInfoTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/methodinfo.tld" %>
+
+
+begin
+  
+  vect is ${vect}
+  
+  result is ${result}
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/WEB-INF/methodinfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/WEB-INF/methodinfo.tld
new file mode 100644
index 0000000000..2a6fec0319
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/WEB-INF/methodinfo.tld
@@ -0,0 +1,55 @@
+
+
+
+
+
+  1.0
+  MethodInfo
+  
+    MethodInfo API tests
+    MethodInfoTag
+    com.sun.ts.tests.jsp.api.jakarta_el.methodinfo.MethodInfoTag
+    empty
+    
+      methExpr
+      true
+      
+        boolean add(Object)
+      
+    
+  
+  
+    Substitute tag for jstl c:set
+    set
+    com.sun.ts.tests.jsp.common.tags.tck.SetTag
+    empty
+    
+      var
+      true
+    
+    
+      value
+      true
+      true
+    
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/jsp_methodinfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/jsp_methodinfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/jsp_methodinfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/methodinfo/jsp_methodinfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTest.jsp
new file mode 100644
index 0000000000..e2b3b6fdb6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/ResourceBundleELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/resourcebundleelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/WEB-INF/resourcebundleelresolver.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/WEB-INF/resourcebundleelresolver.tld
new file mode 100644
index 0000000000..87a7dc61c3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/WEB-INF/resourcebundleelresolver.tld
@@ -0,0 +1,33 @@
+
+
+
+
+
+  1.0
+  ResourceBundleELResolver
+  
+    ResourceBundleELResolver API tests
+    ResourceBundleELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_el.resourcebundleelresolver.ResourceBundleELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/jsp_resourcebundleelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/jsp_resourcebundleelresolver_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/jsp_resourcebundleelresolver_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/resourcebundleelresolver/jsp_resourcebundleelresolver_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTest.jsp
new file mode 100644
index 0000000000..43654b99dc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/ValueExpressionTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/valexpression.tld" %>
+
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/WEB-INF/valexpression.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/WEB-INF/valexpression.tld
new file mode 100644
index 0000000000..577ee2017a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/WEB-INF/valexpression.tld
@@ -0,0 +1,54 @@
+
+
+
+
+
+  1.0
+  ValueExpression
+  
+    ValueExpression API tests
+    ValueExpressionTag
+    com.sun.ts.tests.jsp.api.jakarta_el.valexpression.ValueExpressionTag
+    empty
+    
+      valExpr
+      true
+      
+        java.lang.String
+      
+    
+  
+  
+    Substitute tag for jstl c:set
+    set
+    com.sun.ts.tests.jsp.common.tags.tck.SetTag
+    empty
+    
+      var
+      true
+    
+    
+      value
+      true
+    
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/jsp_valexpr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/jsp_valexpr_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/jsp_valexpr_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_el/valexpression/jsp_valexpr_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp
new file mode 100644
index 0000000000..145689b7b1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/ELExceptionTest.jsp
@@ -0,0 +1,159 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.el.ELException,
+                 java.io.PrintWriter" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void elExceptionDefaultCtorTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        ELException ee = new ELException();
+        if (ee != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void elExceptionMessageCtorTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        ELException ee = new ELException("Exception Message");
+        if (ee != null) {
+            String message = ee.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void elExceptionCauseCtorTest(HttpServletRequest req,
+                                          HttpServletResponse res,
+                                          JspWriter out)
+    throws ServletException, IOException {
+        ELException ee = new ELException(new NullPointerException());
+        if (ee != null) {
+            Throwable t = ee.getRootCause();
+            if (t != null && t instanceof NullPointerException) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a Throwable of type NullPointerException");
+                out.println("Received: " + t);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void elExceptionCauseMessageCtorTest(HttpServletRequest req,
+                                                 HttpServletResponse res,
+                                                 JspWriter out)
+    throws ServletException, IOException {
+        ELException ee = new ELException("Exception Message",
+                                                      new ServletException());
+        if (ee != null) {
+            String message = ee.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                Throwable t = ee.getRootCause();
+                if (t != null && t instanceof ServletException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected a Throwable of type ServletException");
+                    out.println("Received: " + t);
+                }
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void elExceptionGetRootCauseTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        ELException ee = new ELException(new ServletException());
+        ELException ee1 = new ELException("exception", new NullPointerException());
+
+        Throwable t = ee.getRootCause();
+        Throwable t1 = ee1.getRootCause();
+        if (t != null) {
+            if (t instanceof ServletException) {
+                if (t1 != null) {
+                    if (t1 instanceof NullPointerException) {
+                        out.println("Test PASSED");
+                    } else {
+                        out.println("Test FAILED.  ELException.getRootCause returned unexpected" +
+                            " exception: " + t.getClass().getName());
+                        out.println("Expected: NullPointerException");
+                    }
+                } else {
+                    out.println("Test FAILED.  ELException.getRootCause returned null.");
+                }
+            } else {
+                out.println("Test FAILED.  ELException.getRootCause returned unexpected" +
+                    " exception: " + t.getClass().getName());
+                out.println("Expected: ServletException");
+            }
+        } else {
+            out.println("Test FAILED.  ELException.getRootCause returned null.");
+        }
+    }
+%>
+
+<%!
+    public void elExceptionToStringTest(HttpServletRequest req,
+                                        HttpServletResponse res,
+                                        JspWriter out)
+    throws ServletException, IOException {
+        ELException ee = new ELException();
+        String str = ee.toString();
+        if (str != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Result of ELException.toString() was null.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elexception/jsp_elexc_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp
new file mode 100644
index 0000000000..61268b599c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/ELParseExceptionTest.jsp
@@ -0,0 +1,64 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.el.ELParseException" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void elParseExceptionDefaultCtorTest(HttpServletRequest req,
+                                                HttpServletResponse res,
+                                                JspWriter out)
+    throws ServletException, IOException {
+        ELParseException epe = new ELParseException();
+        if (epe != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Unable to create an ELParseException" +
+                " with the default constructor.");
+        }
+
+    }
+%>
+
+<%!
+    public void elParseExceptionMessageCtorTest(HttpServletRequest req,
+                                                HttpServletResponse res,
+                                                JspWriter out)
+    throws ServletException, IOException {
+        ELParseException epe = new ELParseException("message");
+        if (epe != null) {
+            String epeMess = epe.getMessage();
+            if (epeMess.equals("message")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Unexpected message returned by " +
+                    "ELParseException.getMessage().  \nExpected 'message'");
+                out.println("Received: " + epeMess);
+            }
+        } else {
+            out.println("Test FAILED.  Unable to create an ELParseException" +
+                " with the default constructor.");
+        }
+    }
+%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml
new file mode 100644
index 0000000000..a6197dec86
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/elparseexception/jsp_elparseexc_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  ELParseException
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp
new file mode 100644
index 0000000000..284af93bbf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/ExpressionTest.jsp
@@ -0,0 +1,134 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.el.ExpressionEvaluator,
+                 com.sun.ts.tests.jsp.common.util.TSFunctionMapper,
+                 jakarta.servlet.jsp.el.Expression,
+                 jakarta.servlet.jsp.el.ELException,
+                 jakarta.servlet.jsp.el.VariableResolver,
+                 java.io.PrintWriter"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+    private static final String PAGECONTEXT_ATTR =
+        "com.sun.ts.tests.jsp.api.pageContext";
+    private static final String QUAL_METHOD_EXPR =
+        "${ns:lowerCase('STRING')}";
+    private static final String UNQUAL_METHOD_EXPR =
+        "${lowerCase('STRING')}";
+    private static final String VARIABLE_EXPR =
+        "${requestScope['com.sun.ts.tests.jsp.api.pageContext']}";
+%>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void expressionEvaluateTest(HttpServletRequest req,
+                                                       HttpServletResponse res,
+                                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            TSFunctionMapper mapper = new TSFunctionMapper();
+            ExpressionEvaluator eval = pc.getExpressionEvaluator();
+            VariableResolver resolver = pc.getVariableResolver();
+            if (eval != null) {
+                try {
+                    Expression expr = eval.parseExpression(QUAL_METHOD_EXPR,
+                        java.lang.String.class, mapper);
+
+                    if (expr != null) {
+                        String result = (String) expr.evaluate(resolver);
+
+                        if (result != null) {
+                            if (result.equals("string")) {
+                                try {
+                                    Expression expr2 = eval.parseExpression(VARIABLE_EXPR,
+                                        jakarta.servlet.jsp.PageContext.class, null);
+                                    if (expr2 != null) {
+
+                                        PageContext pageContext = (PageContext) expr2.evaluate(resolver);
+                                        if (pageContext != pc) {
+                                            out.println("Test FAILED.  Resolution didn't return expected value.");
+                                            out.println("PageContext returned is not the same instance as expected.");
+                                        }
+                                        try {
+                                            mapper.reset();
+                                            Expression expr3 = eval.parseExpression(UNQUAL_METHOD_EXPR,
+                                                java.lang.String.class, mapper);
+                                            if (expr3 != null) {
+                                                result = (String) expr3.evaluate(resolver);
+                                                if (result != null) {
+                                                    if (result.equals("string")) {
+                                                        out.println("Test PASSED");
+                                                    } else {
+                                                        out.println("Test FAILED. (l3) Expression evaluation returned unexpected value.");
+                                                        out.println("Expected 'string', received '" + result + "'");
+                                                        return;
+                                                    }
+                                                } else {
+                                                    out.println("Test FAILED.  (l3) Expression evaluation returned null.");
+                                                }
+                                            } else {
+                                                out.println("Test FAILED. (l3) ExpressionEvaluator.parseExpression" +
+                                                    " returned null.");
+                                            }
+                                        } catch (ELException ele) {
+                                            JspTestUtil.handleThrowable(ele, out, "(l3)");
+                                            return;
+                                        }
+                                    } else {
+                                        out.println("Test FAILED. (l2) ExpressionEvaluator returned null.");
+                                    }
+                                } catch (Throwable t) {
+                                    JspTestUtil.handleThrowable(t, out, "(l2)");
+                                    return;
+                                }
+                            } else {
+                                out.println("Test FAILED.  (l1) Expression evaluation returned unexpected result.");
+                                out.println("Expected 'string', Received '" + result + "'");
+                            }
+                        } else {
+                           out.println("Test FAILED. (l1) Expression evaluation returned null.");
+                        }
+                    } else {
+                        out.println("Test FAILED. (l1) ExpressionEvaluator.parseExpression" +
+                            "returned null.");
+                    }
+                } catch (ELException ele) {
+                    JspTestUtil.handleThrowable(ele, out, "(l1)");
+                    return;
+                }
+            } else {
+                out.println("Unable to obtain ExpressionEvaluator");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to obtain PageContext.");
+        }
+    }
+%>
+
+
+<%-- test invocation --%>
+
+<%
+    request.setAttribute(PAGECONTEXT_ATTR, pageContext);
+    JspTestUtil.invokeTest(this, request, response, out);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml
new file mode 100644
index 0000000000..7ba5c0055a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expression/jsp_expr_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  Expression
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp
new file mode 100644
index 0000000000..3a9cc801ba
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/ExpressionEvaluatorTest.jsp
@@ -0,0 +1,227 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.el.ExpressionEvaluator,
+                 com.sun.ts.tests.jsp.common.util.TSFunctionMapper,
+                 jakarta.servlet.jsp.el.Expression,
+                 jakarta.servlet.jsp.el.ELException,
+                 jakarta.servlet.jsp.el.VariableResolver,
+                 java.io.PrintWriter"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+    private static final String PAGECONTEXT_ATTR =
+        "com.sun.ts.tests.jsp.api.pageContext";
+    private static final String QUAL_METHOD_EXPR =
+        "${ns:lowerCase('STRING')}";
+    private static final String UNQUAL_METHOD_EXPR =
+        "${lowerCase('STRING')}";
+    private static final String DEFAULT_PREFIX ="";
+    private static final String METHOD_PREFIX = "ns";
+    private static final String METHOD_NAME = "lowerCase";
+    private static final String VARIABLE_EXPR =
+        "${requestScope['com.sun.ts.tests.jsp.api.pageContext']}";
+%>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void expressionEvaluatorParseExpressionTest(HttpServletRequest req,
+                                                       HttpServletResponse res,
+                                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            TSFunctionMapper mapper = new TSFunctionMapper();
+            ExpressionEvaluator eval = pc.getExpressionEvaluator();
+            if (eval != null) {
+                try {
+                    Expression expr = eval.parseExpression(QUAL_METHOD_EXPR,
+                        java.lang.String.class, mapper);
+                    if (expr != null) {
+                        try {
+                            Expression expr2 = eval.parseExpression(VARIABLE_EXPR,
+                                jakarta.servlet.jsp.PageContext.class, null);
+                            if (expr2 != null) {
+                                try {
+                                    Expression expr3 = eval.parseExpression(UNQUAL_METHOD_EXPR,
+                                        java.lang.String.class, mapper);
+                                    if (expr3 != null) {
+                                        out.println("Test PASSED");
+                                    } else {
+                                        out.println("Test FAILED. (l3) ExpressionEvaluator.parseExpression" +
+                                            " returned null.");
+                                    }
+                                } catch (ELException ele) {
+                                    JspTestUtil.handleThrowable(ele, out, "(l3)");
+                                    return;
+                                }
+                        } else {
+                            out.println("Test FAILED. (l2) ExpressionEvaluator.parseExpression" +
+                                " returned null.");
+                        }
+                        } catch (Throwable t) {
+                            JspTestUtil.handleThrowable(t, out, "(l2)");
+                            return;
+                        }
+
+                    } else {
+                        out.println("Test FAILED. (l1) ExpressionEvaluator.parseExpression" +
+                            " returned null.");
+                    }
+                } catch (ELException ele) {
+                    JspTestUtil.handleThrowable(ele, out, "(l1)");
+                    return;
+                }
+            }
+        } else {
+            out.println("Test FAILED.  Unable to obtain PageContext.");
+        }
+    }
+%>
+
+<%!
+    public void expressionEvaluatorEvaluateTest(HttpServletRequest req,
+                                                 HttpServletResponse res,
+                                                 JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            ExpressionEvaluator eval = pc.getExpressionEvaluator();
+            VariableResolver resolver = pc.getVariableResolver();
+            if (eval != null) {
+                TSFunctionMapper mapper = new TSFunctionMapper();
+
+                // first part of this test will validate that
+                // the FunctionMapper is used property during
+                // the evaluation of the expression.
+                try {
+                    Object o1 = eval.evaluate(QUAL_METHOD_EXPR,
+                        java.lang.String.class, resolver, mapper);
+                    if (!mapper.hasResolved()) {
+                        out.println("Test FAILED.  FunctionMapper.resolveFunction" +
+                            " was not called on the provided FunctionMapper (l1).");
+                        return;
+                    }
+                    String prefix = mapper.getPrefixUsed();
+                    String method = mapper.getMethodCalled();
+
+                    if (prefix == null || !prefix.equals(METHOD_PREFIX)) {
+                        out.println("Test FAILED.  FunctionMapper called with " +
+                            "unexpected prefix: " + prefix + ".  Expected 'ns'.");
+                        return;
+                    }
+
+                    if (method == null || !method.equals(METHOD_NAME)) {
+                        out.println("Test FAILED.  FunctionMapper called with " +
+                            "unexpected method: " + method + ".  Expected: lowerCase");
+                        return;
+                    }
+
+                    if (o1 != null) {
+
+                        if (!o1.equals("string")) {
+                            out.println("Test FAILED.  (o1) Method return value was incorrect.");
+                            out.println("Expected 'string', received: '" + o1.toString() +"'");
+                            return;
+                        }
+                        // next verify that a null FunctionMapper can be
+                        // passed without an Exception occuring.  This also
+                        // validates that the VariableResolver is used properly.
+                        try {
+                            Object o2 = eval.evaluate(VARIABLE_EXPR,
+                                jakarta.servlet.jsp.PageContext.class, resolver, null);
+                            if (o2 != null) {
+                                if (o2 != pc) {
+                                    out.println("Test FAILED.  Variable resolution and thus expression evaluation failed.");
+                                    out.println("The request scoped PageContext returned by expression was not correct.");
+                                    return;
+                                }
+                                // next verify that the default namespace is used
+                                // if no namespace is provided.
+                                try {
+                                    mapper.reset();
+                                    Object o3 = eval.evaluate(UNQUAL_METHOD_EXPR,
+                                        java.lang.String.class, resolver, mapper);
+                                    if (!mapper.hasResolved()) {
+                                        out.println("Test FAILED.  FunctionMapper.resolveFunction" +
+                                            " was not called on the provided FunctionMapper (l2).");
+                                        return;
+                                    }
+
+                                    prefix = mapper.getPrefixUsed();
+                                    method = mapper.getMethodCalled();
+
+                                    if (prefix == null || !prefix.equals(DEFAULT_PREFIX)) {
+                                        out.println("Test FAILED.  FunctionMapper called with " +
+                                            "unexpected prefix: '" + prefix + "'.  Expected ''.");
+                                        return;
+                                    }
+
+                                    if (method == null || !method.equals(METHOD_NAME)) {
+                                        out.println("Test FAILED.  FunctionMapper called with " +
+                                            "unexpected method: '" + method + "'.  Expected 'lowerCase'.");
+                                        return;
+                                    }
+
+                                    if (o3 != null) {
+                                        if (o3.equals("string")) {
+                                            out.println("Test PASSED");
+                                        } else {
+                                            out.println("Test FAILED.  (o3) Method return value was incorrect.");
+                                            out.println("Expected 'meth', received: '" + o3.toString() + "'");
+                                            return;
+                                        }
+                                    } else {
+                                        out.println("Test FAILED.  Null expression (expr2) returned.");
+                                    }
+                                } catch (ELException ele) {
+                                    JspTestUtil.handleThrowable(ele, out, "(l3)");
+                                    return;
+                                }
+                            } else {
+                                out.println("Test FAILED.  Null expression (expr1) returned.");
+                            }
+                        } catch (Throwable t) {
+                            JspTestUtil.handleThrowable(t, out, "(l2)");
+                            return;
+                        }
+                    } else {
+                        out.println("Test FAILED.  Null expression (expr) returned.");
+                    }
+                } catch (ELException ele) {
+                    JspTestUtil.handleThrowable(ele, out, "(l1)");
+                    return;
+                }
+            } else {
+                out.println("Test FAILED.  Unable to obtain ExpressionEvaluator.");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to obtain PageContext.");
+        }
+    }
+%>
+
+<%-- test invocation --%>
+
+<%
+    request.setAttribute(PAGECONTEXT_ATTR, pageContext);
+    JspTestUtil.invokeTest(this, request, response, out);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml
new file mode 100644
index 0000000000..011f0c5eeb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/expressionevaluator/jsp_expreval_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  ExpressionEvaluator
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp
new file mode 100644
index 0000000000..b677e5f7ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/ImplicitObjELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/implicitobjelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld
new file mode 100644
index 0000000000..f8b0f60a0a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/WEB-INF/implicitobjelresolver.tld
@@ -0,0 +1,33 @@
+
+
+
+
+
+  1.0
+  ImplicitObjELResolver 
+  
+    ImplicitObjELResolver API tests
+    ImplicitObjELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.implicitobjelresolver.ImplicitObjELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml
new file mode 100644
index 0000000000..fe04af0616
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/implicitobjelresolver/jsp_implicitobjelresolver_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  ImplicitObjectELResolver
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp
new file mode 100644
index 0000000000..47b2d38367
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/ScopedAttrELResolverTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/scopedattrelresolver.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld
new file mode 100644
index 0000000000..b2ac8d3e1d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/WEB-INF/scopedattrelresolver.tld
@@ -0,0 +1,33 @@
+
+
+
+
+
+  1.0
+  ScopedAttrELResolver 
+  
+    ScopedAttrELResolver API tests
+    ScopedAttrELResolverTag
+    com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.el.scopedattrelresolver.ScopedAttrELResolverTag
+    empty
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml
new file mode 100644
index 0000000000..1d58e45f49
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/scopedattrelresolver/jsp_scopedattrelresolver_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  ScopedAttrELResolver
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp
new file mode 100644
index 0000000000..c0c678b417
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/VariableResolverTest.jsp
@@ -0,0 +1,97 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.el.VariableResolver,
+                 jakarta.servlet.jsp.el.ELException" %>
+<%@ page contentType="text/plain" %>
+
+<%!
+    private static final String PAGECONTEXT_ATTR =
+        "com.sun.ts.tests.jsp.api.pageContext";
+%>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void variableResolverResolveVariableTest(HttpServletRequest req,
+                                                    HttpServletResponse res,
+                                                    JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            pc.setAttribute("myObj", "value");
+            pc.setAttribute("myObj1", "value", PageContext.REQUEST_SCOPE);
+            VariableResolver resolver = pc.getVariableResolver();
+            if (resolver != null) {
+                try {
+                    String res1 = (String)
+                        resolver.resolveVariable("myObj");
+                    if (res1.equals("value")) {
+                        try {
+                            String res2 = (String)
+                                resolver.resolveVariable("myObj1");
+                            if (res2.equals("value")) {
+                                try {
+                                    Object res3 = resolver.resolveVariable(
+                                        "com.sun.ts.tests.jsp.api.nonAttr");
+                                    if (res3 == null) {
+                                        out.println("Test PASSED");
+                                    } else {
+                                        out.println("Test FAILED.  Expected null, but " +
+                                            "VariableResolver returned a non-null value.");
+                                    }
+                                } catch (ELException elenn) {
+                                    out.println("Test FAILED.  Unexpected Exception.");
+                                }
+
+                            } else {
+                                out.println("Test FAILED.  Resolution failed.");
+                                out.println("Expected a value of 'value'");
+                                out.println("Received: " + res2);
+                            }
+                        } catch (ELException elen) {
+                            out.println("Test FAILED.  Unable to resolve 'myObj1'");
+                            return;
+                        }
+                    } else {
+                        out.println("Test FAILED.  Resolution failed.");
+                        out.println("Expected a value of 'value'");
+                        out.println("Received: " + res1);
+                    }
+                } catch (ELException ele) {
+                    out.println("Test FAILED.  Unable to resolve 'myObj'");
+                    return;
+                }
+            } else {
+                out.println("Test FAILED.  VariableResolver was null");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to obtain PageContext.");
+        }
+    }
+%>
+
+
+<%-- Test invocation --%>
+
+<%
+    request.setAttribute(PAGECONTEXT_ATTR, pageContext);
+    JspTestUtil.invokeTest(this, request, response, out);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml
new file mode 100644
index 0000000000..59006b8121
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/variableresolver/jsp_varresolver_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  VariableResolver
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/ErrorDataTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/ErrorDataTest.jsp
new file mode 100644
index 0000000000..c8bb0431df
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/ErrorDataTest.jsp
@@ -0,0 +1,154 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    private static final ErrorData getErrorDataInstance() {
+        return new ErrorData(new RuntimeException("runtime"), 501, "/uri", "TestServlet");
+    }
+%>
+
+<%!
+    public void errorDataConstructorTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        ErrorData data = getErrorDataInstance();
+        if (data != null) {
+            out.print("Test PASSED");
+        } else {
+            out.print("Test FAILED.  Constructor of new ErrorData object failed.");
+        }
+    }
+%>
+
+<%!
+    public void errorDataGetThrowableTest(HttpServletRequest req,
+                                          HttpServletResponse res,
+                                          JspWriter out)
+    throws ServletException, IOException {
+        ErrorData data = getErrorDataInstance();
+        Throwable t = null;
+
+        if (data != null) {
+            t = data.getThrowable();
+        } else {
+            out.println("Test FAILED.  ErrorData instance was null.");
+            return;
+        }
+
+        if (t != null) {
+            String message = t.getMessage();
+            if (message != null && message.equals("runtime")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected throwable message of 'runtime'");
+                out.println("Message returned: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  ErrorData.getThrowable() returned null.");
+        }
+    }
+%>
+
+<%!
+    public void errorDataGetStatusCodeTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        ErrorData data = getErrorDataInstance();
+        int code = 0;
+
+        if (data != null) {
+            code = data.getStatusCode();
+        } else {
+            out.println("Test FAILED.  ErrorData instance was null.");
+            return;
+        }
+
+        if (code == 501) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected a status code of 501.");
+            out.println("Status code recieved: " + code);
+        }
+    }
+%>
+
+<%!
+    public void errorDataGetRequestURITest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        ErrorData data = getErrorDataInstance();
+        String uri = null;
+
+        if (data != null) {
+            uri = data.getRequestURI();
+        } else {
+            out.println("Test FAILED.  ErrorData instance was null.");
+            return;
+        }
+
+        if (uri != null) {
+            if (uri.equals("/uri")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a value of '/uri'.");
+                out.println("Received: " + uri);
+            }
+        } else {
+            out.println("Test FAILED.  ErrorData.getRequestURI() returned null.");
+        }
+    }
+%>
+
+<%!
+    public void errorDataGetServletNameTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        ErrorData data = getErrorDataInstance();
+        String name = null;
+
+        if (data != null) {
+            name = data.getServletName();
+        } else {
+            out.println("Test FAILED.  ErrorData instance was null.");
+            return;
+        }
+
+        if (name != null) {
+            if (name.equals("TestServlet")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a value of 'TestServlet'");
+                out.println("Received: " + name);
+            }
+        } else {
+            out.println("Test FAILED. ErrorData.getServletName() returned null.");
+        }
+    }
+%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/jsp_errordata_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/jsp_errordata_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/jsp_errordata_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/errordata/jsp_errordata_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp
new file mode 100644
index 0000000000..640aa7843b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/AddELResolverTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+begin
+${Foo}
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp
new file mode 100644
index 0000000000..2e4d3e9aed
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/IllegalStateExceptionTest.jsp
@@ -0,0 +1,52 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.jspapplicationcontext.FooELResolver,
+             jakarta.el.ELContext,
+             jakarta.el.ELResolver"%>
+<%@ page contentType="text/plain" %>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+                    jaContext.addELResolver(new FooELResolver()); 
+                    out.println("addELResolver call succeeded. Test FAILED.");
+                } catch (IllegalStateException ise) {
+                    out.println("Test PASSED.");
+                } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "IllegalStateExceptionTest");
+                }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspapplicationcontext/jsp_jspapplicationcontext_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp
new file mode 100644
index 0000000000..a7eeacadc6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/JspEngineInfoTest.jsp
@@ -0,0 +1,58 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void jspEngineInfoGetSpecificationVersionTest(HttpServletRequest req,
+                                                         HttpServletResponse res,
+                                                         JspWriter out)
+    throws ServletException, IOException {
+        JspFactory factory = JspFactory.getDefaultFactory();
+        if (factory != null) {
+            JspEngineInfo info = factory.getEngineInfo();
+            if (info != null) {
+                String engineInfo = info.getSpecificationVersion();
+                if (engineInfo == null) {
+                    out.println("Test PASSED");
+                } else {
+                    byte[] ei = engineInfo.getBytes();
+                    if (Character.isDigit((char) ei[0])) {
+                        out.println("Test PASSED");
+                    } else {
+                        out.println("Test FAILED.  String returned by" +
+                            "JspEngineInfo.getSpecificationVersion does not" +
+                            "with a number.");
+                    }
+                }
+            } else {
+                out.println("Test FAILED.  JspFactory.getEngineInfo() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  JspFactory.getDefaultFactory() returned null.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspengineinfo/jsp_jspengineinfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/JspExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/JspExceptionTest.jsp
new file mode 100644
index 0000000000..7e6f4221f2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/JspExceptionTest.jsp
@@ -0,0 +1,142 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void jspExceptionDefaultCtorTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        JspException je = new JspException();
+        if (je != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void jspExceptionMessageCtorTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        JspException je = new JspException("Exception Message");
+        if (je != null) {
+            String message = je.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void jspExceptionCauseCtorTest(HttpServletRequest req,
+                                          HttpServletResponse res,
+                                          JspWriter out)
+    throws ServletException, IOException {
+        JspException je = new JspException(new NullPointerException());
+        if (je != null) {
+            Throwable t = je.getRootCause();
+            if (t != null && t instanceof NullPointerException) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a Throwable of type NullPointerException");
+                out.println("Received: " + t);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void jspExceptionCauseMessageCtorTest(HttpServletRequest req,
+                                                 HttpServletResponse res,
+                                                 JspWriter out)
+    throws ServletException, IOException {
+        JspException je = new JspException("Exception Message",
+                                                      new ServletException());
+        if (je != null) {
+            String message = je.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                Throwable t = je.getRootCause();
+                if (t != null && t instanceof ServletException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected a Throwable of type ServletException");
+                    out.println("Received: " + t);
+                }
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void jspExceptionGetRootCauseTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        JspException je = new JspException(new ServletException());
+        JspException je1 = new JspException("exception", new NullPointerException());
+
+        Throwable t = je.getRootCause();
+        Throwable t1 = je1.getRootCause();
+        if (t != null) {
+            if (t instanceof ServletException) {
+                if (t1 != null) {
+                    if (t1 instanceof NullPointerException) {
+                        out.println("Test PASSED");
+                    } else {
+                        out.println("Test FAILED.  JspException.getRootCause returned unexpected" +
+                            " exception: " + t.getClass().getName());
+                        out.println("Expected: NullPointerException");
+                    }
+                } else {
+                    out.println("Test FAILED.  JspException.getRootCause returned null.");
+                }
+            } else {
+                out.println("Test FAILED.  JspException.getRootCause returned unexpected" +
+                    " exception: " + t.getClass().getName());
+                out.println("Expected: ServletException");
+            }
+        } else {
+            out.println("Test FAILED.  JspException.getRootCause returned null.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/jsp_jspexc_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/jsp_jspexc_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/jsp_jspexc_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspexception/jsp_jspexc_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/JspFactoryTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/JspFactoryTest.jsp
new file mode 100644
index 0000000000..9ee32308de
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/JspFactoryTest.jsp
@@ -0,0 +1,86 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 com.sun.ts.tests.jsp.common.util.SimpleContext" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void jspFactoryGetDefaultFactoryTest(HttpServletRequest req,
+                                                HttpServletResponse res,
+                                                JspWriter out)
+    throws ServletException, IOException {
+        JspFactory factory = JspFactory.getDefaultFactory();
+        if (factory != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  JspFactory.getDefaultFactory() " +
+                "returned null.");
+        }
+    }
+%>
+
+<%!
+    public void jspFactoryGetPageContextTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        JspFactory factory = JspFactory.getDefaultFactory();
+        if (factory != null) {
+            PageContext pc = factory.getPageContext(this, req, res, "",
+                true, 2048, true);
+            if (pc != null) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  JspFactory.getPageContext() returned" +
+                    " null.");
+            }
+        } else {
+            out.println("Test FAILED.  JspFactory.getDefaultFactory() " +
+                "returned null.");
+        }
+    }
+%>
+
+<%!
+    public void jspFactoryGetEngineInfoTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        JspFactory factory = JspFactory.getDefaultFactory();
+        if (factory != null) {
+            JspEngineInfo info = factory.getEngineInfo();
+            if (info != null) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  JspFactory.getEngineInfo() " +
+                    "returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  JspFactory.getDefaultFactory() " +
+                "returned null.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/jsp_jspfactory_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/jsp_jspfactory_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/jsp_jspfactory_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspfactory/jsp_jspfactory_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp
new file mode 100644
index 0000000000..ede603acad
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/JspTagExceptionTest.jsp
@@ -0,0 +1,108 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void jspTagExceptionDefaultCtorTest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        JspTagException jte = new JspTagException();
+        if (jte != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void jspTagExceptionMessageCtorTest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        JspTagException jte = new JspTagException("Exception Message");
+        if (jte != null) {
+            String message = jte.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void jspTagExceptionCauseCtorTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        JspTagException jte = new JspTagException(new NullPointerException());
+        if (jte != null) {
+            Throwable t = jte.getRootCause();
+            if (t != null && t instanceof NullPointerException) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a Throwable of type NullPointerException");
+                out.println("Received: " + t);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void jspTagExceptionCauseMessageCtorTest(HttpServletRequest req,
+                                                    HttpServletResponse res,
+                                                    JspWriter out)
+    throws ServletException, IOException {
+        JspTagException jte = new JspTagException("Exception Message",
+                                                      new ServletException());
+        if (jte != null) {
+            String message = jte.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                Throwable t = jte.getRootCause();
+                if (t != null && t instanceof ServletException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected a Throwable of type ServletException");
+                    out.println("Received: " + t);
+                }
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jsptagexception/jsp_jsptagexc_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/CloseValidator.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/CloseValidator.jsp
new file mode 100644
index 0000000000..8a7d572cfc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/CloseValidator.jsp
@@ -0,0 +1,46 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException" %>
+
+<%@ page contentType="text/plain" %>
+
+<%
+    if (application.getAttribute("flush.exception") != null ||
+        out.getBufferSize() == 0) {
+        if (application.getAttribute("write.exception") != null) {
+            if (application.getAttribute("close.exception") == null) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Subsequent call to JspWriter.close() " +
+                    "illegally threw another IOException.");
+            }
+        } else {
+            out.println("Test FAILED.  Stream was closed and a call to JspWriter." +
+                "print() didn't cause an IOException.");
+        }
+    } else {
+        out.println("Test FAILED.  Stream was closed and a call to JspWriter." +
+            "flush() didn't cause an IOException.");
+    }
+
+    application.removeAttribute("flush.exception");
+    application.removeAttribute("write.exception");
+    application.removeAttribute("close.exception");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterTest.jsp
new file mode 100644
index 0000000000..1ba060e093
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/JspWriterTest.jsp
@@ -0,0 +1,477 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException" %>
+
+
+<%@ page contentType="text/plain" %>
+
+<%!
+    private static final String APPLICATIONCTX_ATTR =
+        "com.sun.ts.tests.jsp.api.applicationContext";
+%>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void jspWriterNewLineTest(HttpServletRequest req,
+                                     HttpServletResponse res,
+                                     JspWriter out)
+    throws ServletException, IOException {
+        out.print("new line");
+        out.newLine();
+    }
+%>
+
+<%!
+    public void jspWriterPrintBooleanTest(HttpServletRequest req,
+                                          HttpServletResponse res,
+                                          JspWriter out)
+    throws ServletException, IOException {
+        out.print(true);
+        out.print(false);
+    }
+%>
+
+<%!
+    public void jspWriterPrintCharTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        out.print('c');
+        out.print('b');
+    }
+%>
+
+<%!
+    public void jspWriterPrintIntTest(HttpServletRequest req,
+                                      HttpServletResponse res,
+                                      JspWriter out)
+    throws ServletException, IOException {
+        out.print(Integer.MIN_VALUE);
+        out.print(Integer.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintLongTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        out.print(Long.MIN_VALUE);
+        out.print(Long.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintFloatTest(HttpServletRequest req,
+                                        HttpServletResponse res,
+                                        JspWriter out)
+    throws ServletException, IOException {
+        out.print(Float.MIN_VALUE);
+        out.print(Float.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintDoubleTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        out.print(Double.MIN_VALUE);
+        out.print(Double.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintCharArrayTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        char[] c = new char[89];
+        for (short i = 33, idx = 0; i < 90; i++, idx++) {
+            c[idx] = (char) i;
+        }
+        out.print(c);
+        out.print(c);
+    }
+%>
+
+<%!
+    public void jspWriterPrintStringTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        out.print("Test ");
+        out.print("Passed");
+    }
+%>
+
+<%!
+    public void jspWriterPrintNullStringTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        String nullString = null;
+        out.print(nullString);
+    }
+%>
+
+<%!
+    public void jspWriterPrintObjectTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        Object o1 = new String("Test ");
+        Object o2 = new String("Passed");
+        out.print(o1);
+        out.print(o2);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnTest(HttpServletRequest req,
+                                     HttpServletResponse res,
+                                     JspWriter out)
+    throws ServletException, IOException {
+        out.print("Test Passed");
+        out.println();
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnBooleanTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        out.println(true);
+        out.println(false);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnCharTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        out.println('a');
+        out.println('B');
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnIntTest(HttpServletRequest req,
+                                        HttpServletResponse res,
+                                        JspWriter out)
+    throws ServletException, IOException {
+        out.println(Integer.MIN_VALUE);
+        out.println(Integer.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnLongTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        out.println(Long.MIN_VALUE);
+        out.println(Long.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnFloatTest(HttpServletRequest req,
+                                          HttpServletResponse res,
+                                          JspWriter out)
+    throws ServletException, IOException {
+        out.println(Float.MIN_VALUE);
+        out.println(Float.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnDoubleTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        out.println(Double.MIN_VALUE);
+        out.println(Double.MAX_VALUE);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnCharArrayTest(HttpServletRequest req,
+                                              HttpServletResponse res,
+                                              JspWriter out)
+    throws ServletException, IOException {
+        char[] c = new char[89];
+        for (short i = 33, idx = 0; i < 90; i++, idx++) {
+            c[idx] = (char) i;
+        }
+        out.println(c);
+        out.println(c);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnStringTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        out.println("Test ");
+        out.println("Passed");
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnNullStringTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        String nullString = null;
+        out.println(nullString);
+    }
+%>
+
+<%!
+    public void jspWriterPrintlnObjectTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        Object o1 = new String("Test ");
+        Object o2 = new String("Passed");
+        out.println(o1);
+        out.println(o2);
+    }
+%>
+
+<%!
+    public void jspWriterClearTest(HttpServletRequest req,
+                                   HttpServletResponse res,
+                                   JspWriter out)
+    throws ServletException, IOException {
+        if (out.getBufferSize() > 0) {
+            out.println("Test FAILED.  JspWriter not cleared.");
+            out.clear();
+            out.println("Test PASSED");
+        } else {
+            out.println("Test PASSED");
+        }
+    }
+%>
+
+<%!
+    public void jspWriterClearIOExceptionTest(HttpServletRequest req,
+                                              HttpServletResponse res,
+                                              JspWriter out)
+    throws ServletException, IOException {
+        if (out.getBufferSize() > 0) {
+            out.println("Arbitrary text");
+            out.flush();
+            try {
+                out.clear();
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  JspWriter.clear() did throw" +
+                        "an Exception, but was not an IOException as expected.");
+                    out.println("Received:" + t.toString());
+                }
+            }
+        } else {
+            out.println("Test PASSED");
+        }
+    }
+%>
+
+<%!
+    public void jspWriterClearBufferTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        if (out.getBufferSize() > 0) {
+            out.println("Arbitrary text");
+            out.flush();
+            out.println("Test FAILED.  JspWriter not cleared.");
+            try {
+                out.clearBuffer();
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    out.println("Test FAILED.  IOException shouldn't have been" +
+                        "thrown by clearBuffer when called after committing the response.");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Unexpeced Exception.");
+                    out.println(t.toString());
+                }
+            }
+            out.println("Test PASSED");
+        } else {
+            out.println("Test PASSED");
+        }
+    }
+%>
+
+<%!
+    // XXX consider alternate implementation
+    public void jspWriterFlushTest(HttpServletRequest req,
+                                   HttpServletResponse res,
+                                   JspWriter out)
+    throws ServletException, IOException {
+        if (out.getBufferSize() > 0) {
+            out.println("Arbitrary test");
+            out.flush();
+            try {
+                out.clear();
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Flush of the stream failed.");
+                }
+            }
+        } else {
+            out.println("Test PASSED");
+        }
+    }
+%>
+
+<%!
+    public void jspWriterCloseTest(HttpServletRequest req,
+                                   HttpServletResponse res,
+                                   JspWriter out)
+    throws ServletException, IOException {
+        ServletContext ctx = (ServletContext) req.getAttribute(APPLICATIONCTX_ATTR);
+        if (ctx != null) {
+            out.close();
+            try {
+                out.flush();
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    ctx.setAttribute("flush.exception", t);
+                }
+            }
+
+            try {
+                out.println();
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    ctx.setAttribute("write.exception", t);
+                }
+            }
+
+            try {
+                out.close();
+            } catch (Throwable t) {
+                ctx.setAttribute("close.exception", t);
+            }
+        } else {
+            out.println("Test FAILED.  Unable to access ServletContext.");
+        }
+    }
+%>
+
+<%!
+    public void jspWriterGetBufferSizeTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        int size = out.getBufferSize();
+        if (size > 0) {
+            if (size >= 8192) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Buffer allocated is not of the expected size.");
+                out.println("Expected a buffer size greater than or equal to 8192KB");
+                out.println("Actual size:" + size);
+            }
+        } else {
+            out.println("Test PASSED");
+        }
+    }
+%>
+
+<%!
+    public void jspWriterGetRemainingTest(HttpServletRequest req,
+                                          HttpServletResponse res,
+                                          JspWriter out)
+    throws ServletException, IOException {
+        String message = "Arbitrary text";
+        int messLength = message.length();
+        int size = out.getBufferSize();
+
+        if (size > 0) {
+            out.clear();
+            int gr1 = out.getRemaining();
+            if (size == gr1) {
+                out.print("Arbitrary text");
+                int gr2 = out.getRemaining();
+                if (gr2 == (size - messLength)) {
+                    out.clear();
+                    int gr3 = out.getRemaining();
+                    if (size == gr3) {
+                        out.println("Test PASSED");
+                    } else {
+                        out.println("Test FAILED.  (l3) Unexpected result from JspWriter.getRemaining().");
+                        out.println("Expected: " + size);
+                        out.println("Received: " + gr3);
+                    }
+                } else {
+                    out.println("Test FAILED.  (l2) Unexpected result from JspWriter.getRemaining().");
+                    out.println("Expected: " + (size - messLength));
+                    out.println("Received: " + gr2);
+                }
+            } else {
+                out.println("Test FAILED.  (l1) Unexpteced result from JspWriter.getRemaining().");
+                out.println("Expected: " + size);
+                out.println("Received: " + gr1);
+            }
+        } else {
+            out.println("Test PASSED");
+        }
+    }
+%>
+
+<%!
+    public void jspWriterIsAutoFlushTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        if (out.isAutoFlush() == true) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected JspWriter.isAutoFlush() to return true not false.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<%
+    request.setAttribute(APPLICATIONCTX_ATTR, application);
+
+    if (System.getProperty("line.separator").equals("\n")) {
+        response.setHeader("Server-EOL", "UNIX");
+    } else if (System.getProperty("line.separator").equals("\r\n")) {
+        response.setHeader("Server-EOL", "WIN32");
+    }
+
+    JspTestUtil.invokeTest(this, request, response, out);
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/jsp_jspwriter_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/jsp_jspwriter_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/jsp_jspwriter_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/jspwriter/jsp_jspwriter_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/ErrorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/ErrorPage.jsp
new file mode 100644
index 0000000000..d45bb65825
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/ErrorPage.jsp
@@ -0,0 +1,47 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" isErrorPage="true"%>
+
+<%
+    if (request.getAttribute("com.sun.ts.tests.jsp.api.checkException") != null) {
+        Exception e = pageContext.getException();
+        if (e != null) {
+            if (e == exception) {
+                out.println("Test PASSED (getException)");
+            } else {
+                out.println("Test FAILED.  The Exception as returned by " +
+                    "PageContext.getException is not the same as the " +
+                    "exception scripting variable.");
+            }
+        } else {
+            out.println("Test FAILED.  PageContext.getException() returned null.");
+        }
+    } else {
+        out.println("Test PASSED.  Error page invoked.");
+        out.println(exception.getClass().getName());
+        out.println(exception.getMessage());
+        if (request.getAttribute("com.sun.ts.tests.jsp.api.checkErrorData") != null) {
+            ErrorData data = pageContext.getErrorData();
+            if (data != null) {
+                out.println("ErrorData object obtained.");
+            }
+        }
+    }
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/PageContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/PageContextTest.jsp
new file mode 100644
index 0000000000..8ef00dae43
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/PageContextTest.jsp
@@ -0,0 +1,1375 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.tagext.BodyContent,
+                 java.util.Enumeration,
+                 jakarta.servlet.jsp.el.ExpressionEvaluator,
+                 jakarta.servlet.jsp.el.VariableResolver" %>
+<%@ page contentType="text/plain" errorPage="ErrorPage.jsp"%>
+
+<%!
+    private static final String PAGECONTEXT_ATTR =
+        "com.sun.ts.tests.jsp.api.pagecontext";
+    private static final String SESSION_ATTR =
+        "com.sun.ts.tests.jsp.api.session";
+    private static final String PAGE_ATTR =
+        "com.sun.ts.tests.jsp.api.page";
+    private static final String CONFIG_ATTR =
+        "com.sun.ts.tests.jsp.api.config";
+    private static final String CONTEXT_ATTR =
+        "com.sun.ts.tests.jsp.api.context";
+%>
+
+<%-- Utility methods --%>
+<%!
+    public static void cleanup(PageContext pc) {
+        pc.removeAttribute("pageScope", PageContext.PAGE_SCOPE);
+        pc.removeAttribute("requestScope", PageContext.REQUEST_SCOPE);
+        pc.removeAttribute("sessionScope", PageContext.SESSION_SCOPE);
+        pc.removeAttribute("applicationScope", PageContext.APPLICATION_SCOPE);
+    }
+%>
+
+<%!
+    public static void fillAllScopes(PageContext pc) {
+        pc.setAttribute("pageScope", "pageScope");
+        pc.setAttribute("requestScope", "requestScope",
+            PageContext.REQUEST_SCOPE);
+        pc.setAttribute("sessionScope", "sessionScope",
+            PageContext.SESSION_SCOPE);
+        pc.setAttribute("applicationScope", "applicationScope",
+            PageContext.APPLICATION_SCOPE);
+    }
+%>
+
+<%!
+    public static boolean checkValue(Enumeration e, String name, JspWriter out)
+    throws IOException {
+        out.println("Checking for attribute '" + name + "'");
+        while (e.hasMoreElements()) {
+            String ele = (String) e.nextElement();
+            out.println("Element returned: " + ele);
+            if (ele.equals(name)) {
+                out.println("Match found!\n");
+                return true;
+            }
+        }
+        out.println("No match found.\n");
+        return false;
+    }
+%>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void pageContextGetSessionTest(HttpServletRequest req,
+                                          HttpServletResponse res,
+                                          JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            HttpSession sess = pc.getSession();
+            if (sess != null) {
+                if (sess == req.getAttribute(SESSION_ATTR)) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Session returned from " +
+                        "PageContext.getSession() is not the same as that " +
+                        "associated with the session scripting variable.");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getSession() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetPageTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            Object o = pc.getPage();
+            if (o != null) {
+                if (o == req.getAttribute(PAGE_ATTR)) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Page object returned from " +
+                        "PageContext.getPage() is not the same as that " +
+                        "associated with the page scripting variable.");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getPage() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetRequestTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            ServletRequest request = pc.getRequest();
+            if (request != null) {
+                if (request == req) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Request object returned from " +
+                        "PageContext.getRequest() is not the same as that " +
+                        "associated with the request scripting variable.");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getRequest() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetResponseTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            ServletResponse response = pc.getResponse();
+            if (response != null) {
+                if (response == res) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Response object returned from " +
+                        "PageContext.getResponse() is not the same as that " +
+                        "associated with the response scripting variable.");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getRequest() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetServletConfigTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            ServletConfig config = pc.getServletConfig();
+            if (config != null) {
+                if (config == req.getAttribute(CONFIG_ATTR)) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  ServletConfig object returned from " +
+                        "PageContext.getServletConfig() is not the same as that " +
+                        "associated with the config scripting variable.");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getServletConfig() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetServletContextTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            ServletContext context = pc.getServletContext();
+            if (context != null) {
+                if (context == req.getAttribute(CONTEXT_ATTR)) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  ServletContext object returned from " +
+                        "PageContext.getServletContext() is not the same as that " +
+                        "associated with the application scripting variable.");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getServletContext() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetExceptionTest(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            JspWriter out)
+    throws ServletException, IOException {
+        req.setAttribute("com.sun.ts.tests.jsp.api.checkException",
+            new Boolean(true));
+        throw new RuntimeException("PageContext.getException() test");
+    }
+%>
+
+<%!
+    public void pageContextForwardContextPathTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            pc.forward("/Resource.jsp");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextForwardPagePathTest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            pc.forward("Resource.jsp");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextForwardServletExceptionTest(HttpServletRequest req,
+                                                       HttpServletResponse res,
+                                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.forward("/Resource.jsp?exception=servletexception");
+            } catch (Throwable t) {
+                if (t instanceof ServletException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown by forwarded" +
+                        "resource, but was not an instance of ServletException");
+                    out.println("Type thrown: " + t.getClass().getName());
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown!");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextForwardIOExceptionTest(HttpServletRequest req,
+                                                  HttpServletResponse res,
+                                                  JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.forward("/Resource.jsp?exception=ioexception");
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown by forwarded" +
+                        "resource, but was not an instance of IOException");
+                    out.println("Type thrown: " + t.getClass().getName());
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown!");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextForwardIllegalStateExceptionTest(HttpServletRequest req,
+                                                            HttpServletResponse res,
+                                                            JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                out.println("Arbitrary text...");
+                out.flush();
+                pc.forward("/Resource.jsp");
+            } catch (IllegalStateException ise) {
+                out.println("Test PASSED");
+                return;
+            }
+            out.println("Test FAILED.  IllegalStateException not thrown.");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextIncludeContextPathTest(HttpServletRequest req,
+                                                  HttpServletResponse res,
+                                                  JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+           pc.include("/Resource.jsp");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextIncludePagePathTest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+           pc.include("Resource.jsp");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextIncludeFlushTrueTest(HttpServletRequest req,
+                                                HttpServletResponse res,
+                                                JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.include("Resource.jsp", true);
+                res.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+                    "Test FAILED. Response not flushed by inclusion.");
+            } catch (Throwable t) {
+                if (t instanceof IllegalStateException) {
+                    out.println("Stream was properly flushed.");
+                } else {
+                    out.println("Stream was not flushed.");
+                }
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextIncludeFlushFalseTest(HttpServletRequest req,
+                                                HttpServletResponse res,
+                                                JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            if (out.getBufferSize() > 0) {
+                try {
+                    pc.include("/Resource.jsp", false);
+                    out.clear();
+                    out.println("Test PASSED");
+                } catch (IllegalStateException ise) {
+                    out.println("Test FAILED.  Steam was flushed after" +
+                        " inclusion when flush argument was false.");
+                }
+            } else {
+                out.println("Test PASSED.  Buffering is not available.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextHandlePageExceptionExcTest(HttpServletRequest req,
+                                                      HttpServletResponse res,
+                                                      JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            pc.handlePageException(new RuntimeException());
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextHandlePageExceptionThrTest(HttpServletRequest req,
+                                                      HttpServletResponse res,
+                                                      JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            pc.handlePageException(new Throwable());
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextHandlePageExceptionExcNPETest(HttpServletRequest req,
+                                                         HttpServletResponse res,
+                                                         JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                Exception e = null;
+                pc.handlePageException(e);
+            } catch (Throwable t) {
+                if (t instanceof NullPointerException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Exception thrown when passing" +
+                        " null to handlePageException, but was not an instance\n" +
+                        "of NullPointerException.");
+                    out.println("Received: " + t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextHandlePageExceptionThrNPETest(HttpServletRequest req,
+                                                         HttpServletResponse res,
+                                                         JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                Throwable th = null;
+                pc.handlePageException(th);
+            } catch (Throwable t) {
+                if (t instanceof NullPointerException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Exception thrown when passing" +
+                        " null to handlePageException, but was not an instance\n" +
+                        "of NullPointerException.");
+                    out.println("Received: " + t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextPushPopBodyTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            Object origOutRef = out;
+            BodyContent content = pc.pushBody();
+            Object newOutRef = pc.getOut();
+            Object newOutRef2 = pc.getAttribute(PageContext.OUT);
+            if (content != null) {
+                if (origOutRef != newOutRef) {
+                    if (origOutRef != newOutRef2) {
+                        pc.popBody();
+                        newOutRef = pc.getOut();
+                        newOutRef2 = pc.getAttribute(PageContext.OUT);
+                        if (origOutRef == newOutRef) {
+                            if (origOutRef == newOutRef2) {
+                                out.println("Test PASSED");
+                            } else {
+                                out.println("Test FAILED.  PageContext.OUT not restored with " +
+                                    "the original 'out' object after PageContext.popBody() " +
+                                    "was called.");
+                            }
+                        } else {
+                            out.println("Test FAILED.  Original 'out' object" +
+                                " was not restored after PageContext.popBody() " +
+                                "was called.");
+                        }
+                    } else {
+                        out.println("Test FAILED.  PageContext.OUT not updated with a new" +
+                            " reference after calling PageContext.pushBody().");
+                    }
+                } else {
+                    out.println("Test FAILED.  'out' object after PageContext" +
+                        ".pushBody() was called did not change.");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.pushBody() returned " +
+                    "a null BodyContent object.");
+            }
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetErrorDataTest(HttpServletRequest req,
+                                              HttpServletResponse res,
+                                              JspWriter out)
+    throws ServletException, IOException {
+        req.setAttribute("com.sun.ts.tests.jsp.api.checkErrorData",
+            new Boolean(true));
+        throw new RuntimeException();
+    }
+%>
+
+<%!
+    public void pageContextIncludeIOExceptionTest(HttpServletRequest req,
+                                                  HttpServletResponse res,
+                                                  JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.include("/Resource.jsp?exception=ioexception");
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown by included" +
+                        "resource, but was not an instance of IOException");
+                    out.println("Type thrown: " + t.getClass().getName());
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown!");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextIncludeFlushIOExceptionTest(HttpServletRequest req,
+                                                  HttpServletResponse res,
+                                                  JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.include("/Resource.jsp?exception=ioexception", true);
+            } catch (Throwable t) {
+                if (t instanceof IOException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown by included" +
+                        "resource, but was not an instance of IOException");
+                    out.println("Type thrown: " + t.getClass().getName());
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown!");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextIncludeServletExceptionTest(HttpServletRequest req,
+                                                       HttpServletResponse res,
+                                                       JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.include("/Resource.jsp?exception=servletexception");
+            } catch (Throwable t) {
+                if (t instanceof ServletException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown by included" +
+                        "resource, but was not an instance of ServletException");
+                    out.println("Type thrown: " + t.getClass().getName());
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown!");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextIncludeFlushServletExceptionTest(HttpServletRequest req,
+                                                            HttpServletResponse res,
+                                                            JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.include("/Resource.jsp?exception=servletexception", true);
+            } catch (Throwable t) {
+                if (t instanceof ServletException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown by included" +
+                        "resource, but was not an instance of ServletException");
+                    out.println("Type thrown: " + t.getClass().getName());
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown!");
+        } else {
+            out.println("Test FAILED.  No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetSetAttributeTest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            final String attrName = "testObject";
+            final String value = "string";
+            pc.setAttribute(attrName, value);
+            String s = (String) pc.getAttribute(attrName);
+            if (s != null) {
+                if (s.equals(value)) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED. Incorrect object returned by " +
+                        "PageContext.getAttribute()");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getAttribute() " +
+                    "incorrectly returned null.");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextSetAttributeNPETest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.setAttribute(null, new String(""));
+            } catch (NullPointerException npe) {
+                try {
+                    pc.setAttribute("testObject", null);
+                    out.println("Test PASSED");
+                    return;
+                } catch (NullPointerException nnpe) {
+                    out.println("Test FAILED.  NPE thrown when a null value " +
+                        "is provided to PageContext.setAttribute()");
+                    return;
+                }
+            }
+            out.println("Test FAILED.  NPE not thrown when a null name is " +
+                "provided to PageContext.setAttribute()");
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetSetAttributeInScopeTest(HttpServletRequest req,
+                                                      HttpServletResponse res,
+                                                      JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            pc.setAttribute("pageScope", "pageScope", PageContext.PAGE_SCOPE);
+            pc.setAttribute("requestScope", "requestScope",
+                PageContext.REQUEST_SCOPE);
+            pc.setAttribute("sessionScope", "sessionScope",
+                PageContext.SESSION_SCOPE);
+            pc.setAttribute("applicationScope", "applicationScope",
+                PageContext.APPLICATION_SCOPE);
+
+            String s1 = (String) pc.getAttribute("pageScope",
+                PageContext.PAGE_SCOPE);
+            String s2 = (String) pc.getAttribute("requestScope",
+                PageContext.REQUEST_SCOPE);
+            String s3 = (String) pc.getAttribute("sessionScope",
+                PageContext.SESSION_SCOPE);
+            String s4 = (String) pc.getAttribute("applicationScope",
+                PageContext.APPLICATION_SCOPE);
+            if (s1 != null) {
+                if (s1.equals("pageScope")) {
+                    if (s2 != null) {
+                        if (s2.equals("requestScope")) {
+                            if (s3 != null) {
+                                if (s3.equals("sessionScope")) {
+                                    if (s4 != null) {
+                                        if (s4.equals("applicationScope")) {
+                                            out.println("Test PASSED");
+                                        } else {
+                                            out.println("Test FAILED.  Wrong" +
+                                                "application scoped object returned.");
+                                        }
+                                    } else {
+                                        out.println("Test FAILED. " +
+                                            "PageContext.getAttribute() returned null.");
+                                    }
+                                } else {
+                                    out.println("Test FAILED.  Wrong" +
+                                        "session scoped object returned.");
+                                }
+                            } else {
+                                out.println("Test FAILED. " +
+                                    "PageContext.getAttribute() returned null.");
+                            }
+                        } else {
+                            out.println("Test FAILED.  Wrong" +
+                                "request scoped object returned.");
+                        }
+                    } else {
+                        out.println("Test FAILED. " +
+                            "PageContext.getAttribute() returned null.");
+                    }
+                } else {
+                    out.println("Test FAILED.  Wrong" +
+                        "page scoped object returned.");
+                }
+            } else {
+                out.println("Test FAILED. " +
+                    "PageContext.getAttribute() returned null.");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+        cleanup(pc);
+    }
+%>
+
+<%!
+    public void pageContextSetAttributeInScopeNPETest(HttpServletRequest req,
+                                                      HttpServletResponse res,
+                                                      JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.setAttribute(null, new String(""), PageContext.PAGE_SCOPE);
+            } catch (NullPointerException npe) {
+                try {
+                    pc.setAttribute("testObject", null,
+                        PageContext.APPLICATION_SCOPE);
+                    out.println("Test PASSED");
+                    return;
+                } catch (NullPointerException nnpe) {
+                    out.println("Test FAILED.  NPE thrown when a null value " +
+                        "is provided to PageContext.setAttribute()");
+                    return;
+                }
+            }
+            out.println("Test FAILED.  NPE not thrown when a null name is " +
+                "provided to PageContext.setAttribute()");
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextSetAttributeInScopeIllegalArgumentExcTest(HttpServletRequest req,
+                                                                     HttpServletResponse res,
+                                                                     JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.setAttribute("pageScope", "pageScope", Integer.MIN_VALUE);
+            } catch (Throwable t) {
+                if (t instanceof IllegalArgumentException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown, but not an" +
+                        "instance of IllegalArgumentException");
+                    return;
+                }
+            }
+            out.println("Test FAILED.  IllegalArgumentException not thrown " +
+                "when PageContext.setAttribute() was provided an invalid scope");
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetAttributeNPETest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.getAttribute(null);
+            } catch (Throwable t) {
+                if (t instanceof NullPointerException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown, but not an" +
+                        "instance of NullPointerException");
+                    return;
+                }
+            }
+            out.println("Test FAILED.  NPE not thrown when " +
+                "PageContext.getAttribute() is provided a null value.");
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetAttributeInScopeIllegalArgumentExceptionTest(HttpServletRequest req,
+                                                                           HttpServletResponse res,
+                                                                           JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.getAttribute("pageContext", Integer.MIN_VALUE);
+            } catch (Throwable t) {
+                if (t instanceof IllegalArgumentException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown, but not an" +
+                        "instance of IllegalArgumentException");
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown when an illegal" +
+                " scope was provided to PageContext.getAttribute()");
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextFindAttributeTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            fillAllScopes(pc);
+            String s1 = (String) pc.findAttribute("pageScope");
+            String s2 = (String) pc.findAttribute("sessionScope");
+            Object nullObj = pc.findAttribute("nonAttribute");
+            if (s1 != null) {
+                if (s1.equals("pageScope")) {
+                    if (s2 != null) {
+                        if (s2.equals("sessionScope")) {
+                            if (nullObj == null) {
+                                out.println("Test PASSED");
+                            } else {
+                                out.println("Test FAILED.  Null reference" +
+                                    " not returned from PageContext.findAttribute()" +
+                                    " when provided a non existent value");
+                            }
+                        } else {
+                            out.println("Test FAILED.  Wrong" +
+                                "session scoped object returned.");
+                        }
+                    } else {
+                        out.println("Test FAILED. " +
+                            "PageContext.getAttribute() returned null.");
+                    }
+                } else {
+                    out.println("Test FAILED.  Wrong" +
+                        "page scoped object returned.");
+                }
+            } else {
+                out.println("Test FAILED. " +
+                    "PageContext.getAttribute() returned null.");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+        cleanup(pc);
+    }
+%>
+
+<%!
+    public void pageContextRemoveAttributeTest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            fillAllScopes(pc);
+            pc.removeAttribute("pageScope");
+            pc.removeAttribute("requestScope");
+            pc.removeAttribute("sessionScope");
+            pc.removeAttribute("applicationScope");
+            Object o1 = pc.findAttribute("pageScope");
+            Object o2 = pc.findAttribute("requestScope");
+            Object o3 = pc.findAttribute("sessionScope");
+            Object o4 = pc.findAttribute("applicationScope");
+            if (o1 == null) {
+                if (o2 == null) {
+                    if (o3 == null) {
+                        if (o4 == null) {
+                            out.println("Test PASSED");
+                        } else {
+                            out.println("Test FAILED.  Application scoped object" +
+                                " not removed by PageContext.removeAttribute().");
+                        }
+                    } else {
+                        out.println("Test FAILED.  Session scoped object" +
+                            " not removed by PageContext.removeAttribute().");
+                    }
+                } else {
+                    out.println("Test FAILED.  Request scoped object" +
+                        " not removed by PageContext.removeAttribute().");
+                }
+            } else {
+                out.println("Test FAILED.  Page scoped object" +
+                    " not removed by PageContext.removeAttribute().");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextRemoveAttributeFromScopeTest(HttpServletRequest req,
+                                                        HttpServletResponse res,
+                                                        JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            fillAllScopes(pc);
+            pc.removeAttribute("pageScope", PageContext.PAGE_SCOPE);
+            pc.removeAttribute("requestScope", PageContext.REQUEST_SCOPE);
+            pc.removeAttribute("sessionScope", PageContext.SESSION_SCOPE);
+            pc.removeAttribute("applicationScope", PageContext.APPLICATION_SCOPE);
+            Object o1 = pc.findAttribute("pageScope");
+            Object o2 = pc.findAttribute("requestScope");
+            Object o3 = pc.findAttribute("sessionScope");
+            Object o4 = pc.findAttribute("applicationScope");
+            if (o1 == null) {
+                if (o2 == null) {
+                    if (o3 == null) {
+                        if (o4 == null) {
+                            out.println("Test PASSED");
+                        } else {
+                            out.println("Test FAILED.  Application scoped object" +
+                                " not removed by PageContext.removeAttribute().");
+                        }
+                    } else {
+                        out.println("Test FAILED.  Session scoped object" +
+                            " not removed by PageContext.removeAttribute().");
+                    }
+                } else {
+                    out.println("Test FAILED.  Request scoped object" +
+                        " not removed by PageContext.removeAttribute().");
+                }
+            } else {
+                out.println("Test FAILED.  Page scoped object" +
+                    " not removed by PageContext.removeAttribute().");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextRemoveAttributeFromScopeIllegalScopeTest(HttpServletRequest req,
+                                                                    HttpServletResponse res,
+                                                                    JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.removeAttribute("nonAttribute", Integer.MIN_VALUE);
+            } catch (Throwable t) {
+                if (t instanceof IllegalArgumentException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown when providing an illegal scope" +
+                        " but was not an instance of IllegalArgumentException.");
+                    out.println("Received: " + t);
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown when an illegal scope was provided.");
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetAttributeScopeTest(HttpServletRequest req,
+                                                 HttpServletResponse res,
+                                                 JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            fillAllScopes(pc);
+            if (pc.getAttributesScope("pageScope") == PageContext.PAGE_SCOPE) {
+                if (pc.getAttributesScope("requestScope") == PageContext.REQUEST_SCOPE) {
+                    if (pc.getAttributesScope("sessionScope") == PageContext.SESSION_SCOPE) {
+                        if (pc.getAttributesScope("applicationScope") == PageContext.APPLICATION_SCOPE) {
+                            out.println("Test PASSED");
+                        } else {
+                            out.println("Test FAILED.  PageContext.getAttributes" +
+                                "Scope returned unexpected value for object in APPLICATION_SCOPE");
+                        }
+                    } else {
+                        out.println("Test FAILED.  PageContext.getAttributes" +
+                            "Scope returned unexpected value for object in SESSION_SCOPE");
+                    }
+                } else {
+                    out.println("Test FAILED.  PageContext.getAttributes" +
+                        "Scope returned unexpected value for object in REQUEST_SCOPE");
+                }
+            } else {
+                out.println("Test FAILED.  PageContext.getAttributes" +
+                    "Scope returned unexpected value for object in PAGE_SCOPE");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+        cleanup(pc);
+    }
+%>
+
+<%!
+    public void pageContextGetAttributeNamesInScopeTest(HttpServletRequest req,
+                                                        HttpServletResponse res,
+                                                        JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            fillAllScopes(pc);
+            Enumeration page = pc.getAttributeNamesInScope(PageContext.PAGE_SCOPE);
+            Enumeration request = pc.getAttributeNamesInScope(PageContext.REQUEST_SCOPE);
+            Enumeration session = pc.getAttributeNamesInScope(PageContext.SESSION_SCOPE);
+            Enumeration app = pc.getAttributeNamesInScope(PageContext.APPLICATION_SCOPE);
+
+            if (page != null) {
+                if (checkValue(page, "pageScope", out)) {
+                    if (request != null) {
+                        if (checkValue(request, "requestScope", out)) {
+                            if (session != null) {
+                                if (checkValue(session, "sessionScope", out)) {
+                                    if (app != null) {
+                                        if (checkValue(app, "applicationScope", out)) {
+                                            out.println("Test PASSED");
+                                        } else {
+                                            out.println("Test FAILED.  Enumeration" +
+                                                " did not contain expected value.");
+                                        }
+                                    } else {
+                                        out.println("Test FAILED.  Null Enumeration returned");
+                                    }
+                                } else {
+                                    out.println("Test FAILED.  Enumeration" +
+                                        " did not contain expected value.");
+                                }
+                            } else {
+                                out.println("Test FAILED.  Null Enumeration returned");
+                            }
+                        } else {
+                            out.println("Test FAILED.  Enumeration" +
+                                " did not contain expected value.");
+                        }
+                    } else {
+                        out.println("Test FAILED.  Null Enumeration returned");
+                    }
+                } else {
+                    out.println("Test FAILED.  Enumeration" +
+                        " did not contain expected value.");
+                }
+            } else {
+                out.println("Test FAILED.  Null Enumeration returned");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+        cleanup(pc);
+    }
+%>
+
+<%!
+    public void pageContextGetAttributeNamesInScopeIllegalScopeTest(HttpServletRequest req,
+                                                                    HttpServletResponse res,
+                                                                    JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.getAttributeNamesInScope(Integer.MAX_VALUE);
+            } catch (Throwable t) {
+                if (t instanceof IllegalArgumentException) {
+                    out.println("Test PASSED");
+                    return;
+                } else {
+                    out.println("Test FAILED.  Exception thrown when providing an illegal scope" +
+                        " but was not an instance of IllegalArgumentException.");
+                    out.println("Received: " + t);
+                    return;
+                }
+            }
+            out.println("Test FAILED.  No Exception thrown when an illegal scope was provided.");
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetOutTest(HttpServletRequest req,
+                                      HttpServletResponse res,
+                                      JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            if (pc.getOut() == out) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Object reference returned by " +
+                    "PageContext.getOut() not the same as the reference " +
+                    "associated with the 'out' scripting variable.");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetExpressionEvaluatorTest(HttpServletRequest req,
+                                                      HttpServletResponse res,
+                                                      JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            ExpressionEvaluator eval = pc.getExpressionEvaluator();
+            if (eval != null) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  PageContext.getExpressionEvaluator" +
+                    " returned null.");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetVariableResolverTest(HttpServletRequest req,
+                                                   HttpServletResponse res,
+                                                   JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            VariableResolver resolver = pc.getVariableResolver();
+            if (resolver != null) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  PageContext.getVariableResolver()" +
+                    " returned null.");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextFindAttributeNullNameTest(HttpServletRequest req,
+                                                     HttpServletResponse res,
+                                                     JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.findAttribute(null);
+                out.println("Test FAILED.  No Exception thrown when null" +
+                    " argument passed to findAttribute(String).");
+            } catch (Throwable t) {
+                if (t instanceof NullPointerException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected a NullPointerException to" +
+                        " be thrown if findAttribute(String) is passed a null value.\n" +
+                        "Actual exception thrown: " + t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextGetAttributesScopeNullNameTest(HttpServletRequest req,
+                                                          HttpServletResponse res,
+                                                          JspWriter out)
+        throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.getAttributesScope(null);
+                out.println("Test FAILED.  No Exception thrown when null" +
+                    " argument passed to getAttributesScope(String).");
+            } catch (Throwable t) {
+                if (t instanceof NullPointerException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected a NullPointerException to" +
+                        " be thrown if getAttributesScope(String) is passed a null value.\n" +
+                        "Actual exception thrown: " + t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextRemoveAttributeNullNameTest(HttpServletRequest req,
+                                                       HttpServletResponse res,
+                                                       JspWriter out)
+        throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        if (pc != null) {
+            try {
+                pc.removeAttribute(null);
+                out.println("Test FAILED.  No Exception thrown when null" +
+                    " argument passed to removeAttribute(String).");
+            } catch (Throwable t) {
+                if (t instanceof NullPointerException) {
+                    try {
+                        pc.removeAttribute(null, PageContext.PAGE_SCOPE);
+                        out.println("Test FAILED.  No Exception thrown when null" +
+                            " argument passed to removeAttribute(String, int)");
+                    } catch (Throwable t1) {
+                        if (t instanceof NullPointerException) {
+                            out.println("Test PASSED");
+                        } else {
+                            out.println("Test FAILED.  Expected a NullPointerException to" +
+                                " be thrown if removeAttribute(String, int) is passed a null value.\n" +
+                                "Actual exception thrown: " + t.getClass().getName());
+                        }
+                    }
+                } else {
+                    out.println("Test FAILED.  Expected a NullPointerException to" +
+                        " be thrown if removeAttribute(String) is passed a null value.\n" +
+                        "Actual exception thrown: " + t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%!
+    public void pageContextSetAttributeNullValueTest(HttpServletRequest req,
+                                                     HttpServletResponse res,
+                                                     JspWriter out)
+    throws ServletException, IOException {
+        PageContext pc = (PageContext) req.getAttribute(PAGECONTEXT_ATTR);
+        pc.setAttribute("simple", "value");
+        if (pc != null) {
+            pc.setAttribute("simple", null);
+            if (pc.getAttribute("simple") == null) {
+                pc.setAttribute("simple2", "value");
+                pc.setAttribute("simple2", null, PageContext.PAGE_SCOPE);
+                if (pc.getAttribute("simple2") == null) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Attribute not removed from PageContext " +
+                        "when null value was passed to setAttribute(String, Object, int)" +
+                        " and the attribute name specified exists in the PageContext");
+                }
+            } else {
+                out.println("Test FAILED.  Attribute not removed from PageContext " +
+                    "when null value was passed to setAttribute(String, Object)" +
+                    " and the attribute name specified exists in the PageContext");
+            }
+        } else {
+            out.println("Test FAILED. No PageContext object available.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<%
+    request.setAttribute(PAGECONTEXT_ATTR, pageContext);
+    request.setAttribute(SESSION_ATTR, session);
+    request.setAttribute(PAGE_ATTR, page);
+    request.setAttribute(CONFIG_ATTR, config);
+    request.setAttribute(CONTEXT_ATTR, application);
+
+    JspTestUtil.invokeTest(this, request, response, out);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/Resource.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/Resource.jsp
new file mode 100644
index 0000000000..58fc251472
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/Resource.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.io.IOException" contentType="text/plain"%>
+
+<%
+    String param = request.getParameter("exception");
+    if (param != null) {
+        if (param.equals("ioexception")) {
+            throw new IOException();
+        }
+
+        if (param.equals("servletexception")) {
+            throw new ServletException();
+        }
+    } else {
+        out.println("Test PASSED.");
+    }
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/jsp_pagecontext_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/jsp_pagecontext_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/jsp_pagecontext_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/pagecontext/jsp_pagecontext_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp
new file mode 100644
index 0000000000..e2214a0e18
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/SkipPageExceptionTest.jsp
@@ -0,0 +1,108 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void skipPageExceptionDefaultCtorTest(HttpServletRequest req,
+                                                 HttpServletResponse res,
+                                                 JspWriter out)
+    throws ServletException, IOException {
+        SkipPageException spe = new SkipPageException();
+        if (spe != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void skipPageExceptionMessageCtorTest(HttpServletRequest req,
+                                                 HttpServletResponse res,
+                                                 JspWriter out)
+    throws ServletException, IOException {
+        SkipPageException spe = new SkipPageException("Exception Message");
+        if (spe != null) {
+            String message = spe.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void skipPageExceptionCauseCtorTest(HttpServletRequest req,
+                                               HttpServletResponse res,
+                                               JspWriter out)
+    throws ServletException, IOException {
+        SkipPageException spe = new SkipPageException(new NullPointerException());
+        if (spe != null) {
+            Throwable t = spe.getRootCause();
+            if (t != null && t instanceof NullPointerException) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected a Throwable of type NullPointerException");
+                out.println("Received: " + t);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%!
+    public void skipPageExceptionCauseMessageCtorTest(HttpServletRequest req,
+                                                      HttpServletResponse res,
+                                                      JspWriter out)
+    throws ServletException, IOException {
+        SkipPageException spe = new SkipPageException("Exception Message",
+                                                      new ServletException());
+        if (spe != null) {
+            String message = spe.getMessage();
+            if (message != null && message.equals("Exception Message")) {
+                Throwable t = spe.getRootCause();
+                if (t != null && t instanceof ServletException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected a Throwable of type ServletException");
+                    out.println("Received: " + t);
+                }
+            } else {
+                out.println("Test FAILED.  Expected a message of 'Exception Message'");
+                out.println("Received: " + message);
+            }
+        } else {
+            out.println("Test FAILED.  No Exception created.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/jsp_skippageexc_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/jsp_skippageexc_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/jsp_skippageexc_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/skippageexception/jsp_skippageexc_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp
new file mode 100644
index 0000000000..932dab345a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentClearBodyTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodycontent" prefix="content"  %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp
new file mode 100644
index 0000000000..f60a99cf8e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentFlushTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodycontent" prefix="content"  %>
+
+
+    Body Content
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp
new file mode 100644
index 0000000000..0e15153a69
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentGetStringTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodycontent" prefix="content"  %>
+
+
+    <%= "body content" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp
new file mode 100644
index 0000000000..c541dc9497
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentReadWriteTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodycontent" prefix="content"  %>
+
+
+    Test PASSED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp
new file mode 100644
index 0000000000..dfff5cba95
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/BodyContentWriteOutTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodycontent" prefix="content"  %>
+<% pageContext.setAttribute("passed", "PASSED"); %>
+
+    Test ${pageScope.passed}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld
new file mode 100644
index 0000000000..1501859e86
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/WEB-INF/bodycontent.tld
@@ -0,0 +1,53 @@
+
+
+
+
+    Tags for BodyContent tests
+    BodyContent
+    1.0
+    bodycontent
+    
+        flush
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent.BodyContentFlushTag
+        JSP 
+    
+    
+        clear
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent.BodyContentClearBodyTag
+        JSP 
+    
+    
+        readwrite
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent.BodyContentReadWriteTag
+        JSP 
+    
+    
+        writeout
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent.BodyContentWriteOutTag
+        JSP 
+    
+    
+        string
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodycontent.BodyContentGetStringTag
+        JSP 
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodycontent/jsp_bodycontent_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp
new file mode 100644
index 0000000000..b37546c923
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEmptyTagTest.jsp
@@ -0,0 +1,55 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodytagsupport" prefix="tag"  %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Empty Tag1: ${validate.result}
+
+
+
+
+
+Empty Tag2: ${validate.result}
+
+
+
+
+
+Non-Empty Tag3: ${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp
new file mode 100644
index 0000000000..90e66bd0b1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyBufferedTest.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodytagsupport" prefix="tag"  %>
+
+
+    BodyContent
+
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp
new file mode 100644
index 0000000000..9bcab82d35
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagEvalBodyIncludeTest.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodytagsupport" prefix="tag"  %>
+
+
+    Body Content
+
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp
new file mode 100644
index 0000000000..387ed64664
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSkipBodyTest.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodytagsupport" prefix="tag"  %>
+
+
+    Body Content
+
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp
new file mode 100644
index 0000000000..69d8829566
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportApiTest.jsp
@@ -0,0 +1,109 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.tagext.BodyTagSupport,
+                 jakarta.servlet.jsp.tagext.Tag,
+                 jakarta.servlet.jsp.tagext.BodyTag" %>
+<%@ page contentType="text/plain" %>
+
+
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void bodyTagSupportCtorTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        BodyTagSupport support = new BodyTagSupport();
+        if (support != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Unable to create new BodyTagSupport instance.");
+        }
+    }
+%>
+
+<%!
+    public void bodyTagSupportDoStartTagTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        BodyTagSupport support = new BodyTagSupport();
+        try {
+            int ret = support.doStartTag();
+            if (ret == BodyTag.EVAL_BODY_BUFFERED) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  The default return value for BodyTagSupport" +
+                    ".doStartTag() was not EVAL_BODY_BUFFERED.  Received: " +
+                    JspTestUtil.getTagStatusAsString("doStartTag", "BodyTag", ret));
+            }
+        } catch (JspException je) {
+            JspTestUtil.handleThrowable(je, out, "bodyTagSupportDoStartTagTest");
+        }
+    }
+%>
+
+<%!
+    public void bodyTagSupportDoEndTagTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        BodyTagSupport support = new BodyTagSupport();
+        try {
+            int ret = support.doEndTag();
+            if (ret == Tag.EVAL_PAGE) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  The default return value for BodyTagSupport" +
+                    ".doEndTag() was not EVAL_PAGE.  Received: " +
+                    JspTestUtil.getTagStatusAsString("doEndTag", "BodyTag", ret));
+            }
+        } catch (JspException je) {
+            JspTestUtil.handleThrowable(je, out, "bodyTagSupportDoEndTagTest");
+        }
+    }
+%>
+
+<%!
+    public void bodyTagSupportDoAfterBodyTest(HttpServletRequest req,
+                                              HttpServletResponse res,
+                                              JspWriter out)
+    throws ServletException, IOException {
+        BodyTagSupport support = new BodyTagSupport();
+        try {
+            int ret = support.doAfterBody();
+            if (ret == Tag.SKIP_BODY) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  The default return value for BodyTagSupport" +
+                    ".doAfterBody() was not SKIP_BODY.  Received: " +
+                    JspTestUtil.getTagStatusAsString("doAfterBody", "BodyTag", ret));
+            }
+        } catch (JspException je) {
+            JspTestUtil.handleThrowable(je, out, "bodyTagSupportDoAfterBodyTest");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp
new file mode 100644
index 0000000000..24b65d488c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/BodyTagSupportSynchronizationTest.jsp
@@ -0,0 +1,224 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodytagsupport" prefix="tag"  %>
+
+<%--
+    Validate synchronization when doStartTag returns EVAL_BODY_BUFFERED.
+    Sychronization should occur after doInitBody(), doAfterBody() for NESTED,
+    doInitBody(), doAfterBody(), doEndTag() for AT_BEGIN, and doEndTag() for
+    AT_END
+--%>
+
+BodyTag Synchronization (EVAL_BODY_BUFFERED)
+------------------------------------------------------
+<%! int counter = 2; %>
+
+    <%
+        int beg = (begin != null) ? begin.intValue() : 0;
+        int nes = (nested != null) ? nested.intValue() : 0;
+        if (counter == 2) {
+           // doInitBody() has been called.  First pass into body should
+           // be 1 for AT_BEGIN and NESTED variables.
+           if (beg < 2) {
+               out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+                  " doInitBody().  Expected a value of '2'.  Received: " + beg);
+           }
+           if (beg > 2) {
+               out.println("Test FAILED. Variable 'begin' seems to have been" +
+                   " synchronized too many times after doInitBody().  Expected " +
+                   "a value of '2'.  Received: " + beg);
+           }
+           if (nes < 2) {
+               out.println("Test FAILED.  Variable 'nested' not synchronized after" +
+                   " doInitBody().  Expected a value of '2'.  Received: " + nes);
+           }
+           if (nes > 2) {
+               out.println("Test FAILED. Variable 'nested' seems to have been" +
+                   " synchronized too many times after doInitBody().  Expected " +
+                   "a value of '2'.  Received: " + nes);
+           }
+       } else {
+            // first invocation of doAfterBody() returns EVAL_BODY_AGAIN,
+            // so second pass through here should be incremented by the
+            // doAfterBody() call
+            if (beg < 3) {
+                out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+                    " doAfterBody().  Expected a value of '3'.  Received: " + beg);
+            }
+            if (beg > 3) {
+                out.println("Test FAILED. Variable 'begin' seems to have been" +
+                    " synchronized too many times after doAfterBody().  Expected " +
+                    "a value of '3'.  Received: " + beg);
+            }
+            if (nes < 3) {
+                out.println("Test FAILED.  Variable 'nested' not synchronized after" +
+                    " doAfterBody().  Expected a value of '3'.  Received: " + nes);
+            }
+            if (nes > 3) {
+                out.println("Test FAILED. Variable 'nested' seems to have been" +
+                    " synchronized too many times after doAfterBody().  Expected " +
+                    "a value of '3'.  Received: " + nes);
+            }
+       }
+       counter--;
+    %>
+
+<%
+    // final doAfterBody() call and doEndTag().  Value should be incremented
+    // by two.
+    int beg = (begin != null) ? begin.intValue() : 0;
+    int eend = (end != null) ? end.intValue() : 0;
+    if (beg < 5) {
+        out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+            " doEndTag().  Expected a value of '5'.  Received: " + beg);
+    }
+    if (beg > 5) {
+        out.println("Test FAILED. Variable 'begin' seems to have been" +
+            " synchronized too many times after doEndTag().  Expected " +
+            "a value of '5'.  Received: " + beg);
+    }
+    if (eend < 5) {
+        out.println("Test FAILED. Variable 'end' not synchronized after " +
+            " doEndTag().  Expected a value of '5'.  Received: " + eend);
+    }
+    if (eend > 5) {
+        out.println("Test FAILED. Variable 'end' seems to have been" +
+            " synchronized too many times after doEndTag().  Expected " +
+            "a value of '5'.  Received: " + eend);
+    }
+%>
+
+<%-- Validate synchronization when doStartTag returns EVAL_BODY_INCLUDE --%>
+BodyTag Synchronization (EVAL_BODY_INCLUDE)
+------------------------------------------------------
+<%
+    counter = 2;
+%>
+
+    <%
+        beg = (begin != null) ? begin.intValue() : 0;
+        int nes = (nested != null) ? nested.intValue() : 0;
+        if (counter == 2) {
+            // synchronization should occur since doStartTag() returns
+            // EVAL_BODY_INCLUDE.  So beg, should be incremented from
+            // the synchronization provided by the previous action.
+            if (beg < 6) {
+                out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+                    " doStartTag().  Expected a value of '6'.  Received: " + beg);
+            }
+            if (beg > 6) {
+                out.println("Test FAILED. Variable 'begin' seems to have been" +
+                    " synchronized too many times after doStartTag().  Expected " +
+                    "a value of '6'.  Received: " + beg);
+            }
+            // sync done for doStartTag() so first body eval,
+            // this should be 1.
+            if (nes < 1) {
+                out.println("Test FAILED.  Variable 'nested' not synchronized after" +
+                    " doStartTag().  Expected a value of '1'.  Received: " + nes);
+            }
+            if (nes > 1) {
+                out.println("Test FAILED. Variable 'nested' seems to have been" +
+                    " synchronized too many times after doStartTag().  Expected " +
+                    "a value of '1'.  Received: " + nes);
+            }
+        } else {
+            // increment value by 1 for first doStartTag(), plus another for the
+            // call to doAfterBody().
+            if (beg < 7) {
+                out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+                    " doAfterBody().  Expected a value of '7'.  Received: " + beg);
+            }
+            if (beg > 7) {
+                out.println("Test FAILED. Variable 'begin' seems to have been" +
+                    " synchronized too many times after doAfterBody().  Expected " +
+                    "a value of '7'.  Received: " + beg);
+            }
+            if (nes != 2) {
+                out.println("Test FAILED.  Variable 'nested' not synchronized after" +
+                    " doAfterBody().  Expected a value of '2'.  Received: " + nes);
+            }
+            if (nes > 2) {
+                out.println("Test FAILED. Variable 'nested' seems to have been" +
+                    " synchronized too many times after doAfterBody().  Expected " +
+                    "a value of '2'.  Received: " + nes);
+            }
+        }
+        counter--;
+    %>
+
+<%
+    // doAfterBody() has been called with SKIP_BODY, then doEndTag(), value
+    // incremented by 2.
+    beg = (begin != null) ? begin.intValue() : 0;
+    eend = (end != null) ? end.intValue() : 0;
+    if (beg < 9) {
+        out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+            " doEndTag().  Expected a value of '9'.  Received: " + beg);
+    }
+    if (beg > 9) {
+        out.println("Test FAILED. Variable 'begin' seems to have been" +
+            " synchronized too many times after doEndTag().  Expected " +
+            "a value of '9'.  Received: " + beg);
+    }
+    // doAfterBody() has been called with SKIP_BODY, then doEndTag(), value
+    // incremented by 2.
+    if (eend < 4) {
+        out.println("Test FAILED. Variable 'end' not synchronized after " +
+            " doEndTag().  Expected a value of '4'.  Received: " + eend);
+    }
+    if (eend > 4) {
+        out.println("Test FAILED. Variable 'end' seems to have been" +
+            " synchronized too many times after doEndTag().  Expected " +
+            "a value of '4'.  Received: " + eend);
+    }
+    pageContext.removeAttribute("begin");
+    pageContext.removeAttribute("end");
+%>
+
+<%-- Validate synchronization when doStartTag() returns SKIP_BODY --%>
+BodyTag Synchronization (SKIP_BODY)
+--------------------------------------------
+
+<%
+    // doStartTag() and doEndTag() have each been called once.
+    beg = (begin != null) ? begin.intValue() : 0;
+    eend = (end != null) ? end.intValue() : 0;
+    if (beg < 2) {
+        out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+            " doStartTag() and/or doEndTag().  Expected a value of '2'.  Received: " + beg);
+    }
+    if (beg > 2) {
+        out.println("Test FAILED. Variable 'begin' seems to have been" +
+            " synchronized too many times after doStartTag() and/ordoEndTag().  Expected " +
+            "a value of '2'.  Received: " + beg);
+    }
+    if (eend < 2) {
+        out.println("Test FAILED. Variable 'end' not synchronized after " +
+            " doStartTag() and/or doEndTag().  Expected a value of '2'.  Received: " + eend);
+    }
+    if (eend > 2) {
+        out.println("Test FAILED. Variable 'end' seems to have been" +
+            " synchronized too many times after doStartTag() and/or doEndTag().  Expected " +
+            "a value of '2'.  Received: " + eend);
+    }
+    pageContext.removeAttribute("begin");
+    pageContext.removeAttribute("end");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp
new file mode 100644
index 0000000000..cf576a8e41
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetBodyContentTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodytagsupport" prefix="support" %>
+
+    body content
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp
new file mode 100644
index 0000000000..ce380e2b8b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/GetPreviousOutTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/bodytagsupport" prefix="support" %>
+Test FAILED.
+
+    body content
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld
new file mode 100644
index 0000000000..18559262f9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/WEB-INF/bodytagsupport.tld
@@ -0,0 +1,81 @@
+
+
+
+
+    BodyTagSupport Test Support Tags
+    BodyTagSupport
+    1.0
+    bodytagsupport
+    
+        prevout
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport.GetPreviousOutTestTag
+        JSP 
+    
+    
+        bodycontent
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport.GetBodyContentTestTag
+        JSP 
+    
+    
+        interaction
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport.BodyContainerInteractionTag
+        JSP 
+        
+            doStartTag
+            true
+        
+        
+            doEndTag
+            true
+        
+        
+            doAfterBody
+            true
+        
+        
+            result
+            true
+        
+    
+    
+        sync
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport.BodySynchronizationTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.bodytagsupport.SyncTEI
+        JSP 
+        
+            doStartTag
+            true
+        
+        
+            doEndTag
+            true
+        
+        
+            doAfterBody
+            false
+        
+        
+            bodyCount
+            false
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/bodytagsupport/jsp_bodytagsupp_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp
new file mode 100644
index 0000000000..94de322b3c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/DynamicAttributesExceptionTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/dynamicattributes" prefix="tag"  %>
+
+<% try { %>
+    
+<% } catch (Throwable t) {
+    out.println("Classic - Test PASSED");
+} %>
+
+<% try { %>
+    
+<% } catch (Throwable t) {
+    out.println("Simple - Test PASSED");
+}
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp
new file mode 100644
index 0000000000..90b4d470c7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/SetDynamicAttributesTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/dynamicattributes" prefix="tag"  %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld
new file mode 100644
index 0000000000..c706108763
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/WEB-INF/dynamicattributes.tld
@@ -0,0 +1,43 @@
+
+
+
+
+    1.0
+    dynamicattributes
+    
+        dynamic
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.dynamicattributes.DynamicAttributesTag
+        JSP 
+        
+            throwException
+            false
+            false
+        
+        true
+    
+    
+        sdynamic
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.dynamicattributes.SimpleExcTag
+        scriptless
+        true
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/dynamicattributes/jsp_dynattrib_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp
new file mode 100644
index 0000000000..80be099eb5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionClassTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/functioninfo" prefix="funcinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp
new file mode 100644
index 0000000000..a9fa66dd3a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetFunctionSignatureTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/functioninfo" prefix="funcinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetNameTest.jsp
new file mode 100644
index 0000000000..6fbf13fa85
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/GetNameTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/functioninfo" prefix="funcinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld
new file mode 100644
index 0000000000..7de5a25ce2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/WEB-INF/functioninfo.tld
@@ -0,0 +1,43 @@
+
+
+
+
+    FunctionInfo Validation
+    1.0
+    functioninfo
+    
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.functioninfo.FunctionInfoTEI
+        JSP 
+        
+            test
+            true
+        
+    
+    
+        upperCase
+        upperCase
+        com.sun.ts.tests.jsp.common.util.JspFunctions
+        java.lang.String upperCase(java.lang.String)
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/jsp_functioninfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/jsp_functioninfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/jsp_functioninfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/functioninfo/jsp_functioninfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp
new file mode 100644
index 0000000000..6e57a8e35e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/MultipleJspIdTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/jspidconsumer.tld" %>
+
+begin
+
+
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp
new file mode 100644
index 0000000000..1b16eb8ff3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SameJspIdTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/jspidconsumer.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp
new file mode 100644
index 0000000000..58b211e7c7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/SetJspIdTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/jspidconsumer.tld" %>
+
+begin
+
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld
new file mode 100644
index 0000000000..8e80e119e0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/WEB-INF/jspidconsumer.tld
@@ -0,0 +1,57 @@
+
+
+
+
+
+  1.0
+  JspIdConsumer
+  
+    JspIdConsumer.setJspId() API test
+    SetJspIdTag
+    com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.jspidconsumer.SetJspIdTag
+    empty
+  
+  
+    JspIdConsumer.setJspId() multiple tag test
+    MultiOneTag
+    com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.jspidconsumer.MultiOneTag
+    empty
+  
+  
+    JspIdConsumer.setJspId() multiple tag test
+    MultiTwoTag
+    com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.jspidconsumer.MultiTwoTag
+    empty
+  
+  
+    JspIdConsumer.setJspId() multiple tag test
+    MultiThreeTag
+    com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.jspidconsumer.MultiThreeTag
+    empty
+  
+  
+    JspIdConsumer.setJspId() re-entrant tag test
+    SameJspIdTag
+    com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.jspidconsumer.SameJspIdTag
+    empty
+  
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/jspidconsumer/jsp_jspidconsumer_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp
new file mode 100644
index 0000000000..94119806a4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTagFileTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTest.jsp
new file mode 100644
index 0000000000..b46e9c4a97
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/PageDataTest.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain"
+         import="com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata.PageDataValidator" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/pagedata" prefix="pagedata"  %>
+<%!
+    public boolean validatorWasCalled() {
+        boolean result = PageDataValidator.wasCalled();
+        PageDataValidator.reset();
+        return result;
+    }
+%>
+
+<%
+    if (validatorWasCalled()) {
+        out.println("Validator Called.");
+    } else {
+        out.println("Test FAILED.  Validator wasn't called.");
+    }
+%>
+<%= "Expression Text" %>
+<%@ include file="template.txt"  %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld
new file mode 100644
index 0000000000..a2fb73236f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedata.tld
@@ -0,0 +1,47 @@
+
+
+
+
+    Tag Library for TagLibraryValidator Tests
+    TagLibraryValidator Test Tag Library
+    1.0
+    pagedata
+    
+        Validator to verify API/container interoperation.
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata.PageDataValidator
+    
+    
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        JSP 
+        
+            test
+            true
+        
+        
+            dynAttribute
+            false
+            true
+            java.lang.String
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld
new file mode 100644
index 0000000000..346bb27f03
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/pagedatatagfile.tld
@@ -0,0 +1,47 @@
+
+
+
+
+    Tag Library for TagLibraryValidator Tests for Tag File
+    TagLibraryValidator Test Tag Library for Tag File
+    1.0
+    pagedatatagfile
+    
+        Validator to verify API/container interoperation.
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata.TagFilePageDataValidator
+    
+    
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        JSP 
+        
+            test
+            true
+        
+        
+            dynAttribute
+            false
+            true
+            java.lang.String
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag
new file mode 100644
index 0000000000..04eda6f2db
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/pageDataTagFileTest.tag
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.pagedata.TagFilePageDataValidator" %>
+<%@ attribute name="att1" %>
+<%@ variable name-given="var1" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/pagedatatagfile" prefix="pagedatatagfile"  %>
+<%!
+    public boolean validatorWasCalled() {
+        boolean result = TagFilePageDataValidator.wasCalled();
+        TagFilePageDataValidator.reset();
+        return result;
+    }
+%>
+
+<%
+    if (validatorWasCalled()) {
+        out.println("Validator Called.");
+    } else {
+        out.println("Test FAILED.  Validator wasn't called.");
+    }
+%>
+<%= "Expression Text in tag file" %>
+<%@ include file="template.txt"  %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt
new file mode 100644
index 0000000000..77484820fe
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/WEB-INF/tags/template.txt
@@ -0,0 +1 @@
+Included template text in tag file.
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/jsp_pagedata_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/template.txt b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/template.txt
new file mode 100644
index 0000000000..eafc06dd3a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/pagedata/template.txt
@@ -0,0 +1 @@
+Included template text.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp
new file mode 100644
index 0000000000..ff832e69a7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportDoTagDefault.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp
new file mode 100644
index 0000000000..4e5515d839
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportFindAncestorTest.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
+    
+        
+            
+                
+            
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp
new file mode 100644
index 0000000000..cc066c9fef
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspBodyTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+body
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp
new file mode 100644
index 0000000000..4d227e55a7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportJspContextTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp
new file mode 100644
index 0000000000..597843848e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportParentTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp
new file mode 100644
index 0000000000..2e5294457a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageClassicTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags/simpletagsupport" prefix="simtag" %>
+
+
+Test FAILED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp
new file mode 100644
index 0000000000..68cf75dba3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportSkipPageSimpleTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags/simpletagsupport" prefix="simtag" %>
+
+
+Test FAILED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp
new file mode 100644
index 0000000000..b86876b47d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/SimpleTagSupportVariableSynchronizationTest.jsp
@@ -0,0 +1,87 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.io.PrintWriter,
+                 com.sun.ts.tests.jsp.common.util.JspTestUtil"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+<%@ taglib tagdir="/WEB-INF/tags/simpletagsupport" prefix="tagfile" %>
+
+<%--
+    Sync variables declared by TEI.
+    SimpleTag instance will set page context attributes
+    begin to 1 and end to 2.  This should be synchronized
+    to scripting variables begin and end respectively.
+--%>
+
+<%
+    if (begin.intValue() != 1) {
+        out.println("Test FAILED.  Expected begin to be '1' after tag " +
+            "completion.  Actual value: " + begin);
+    }
+    if (end.intValue() != 2) {
+        out.println("Test FAILED.  Expected end to be '2' after tag " +
+            "completion.  Actual value: " + end);
+    }
+%>
+
+<%--
+    Sync variables declared by variable elements in TLD
+    SimpleTag instance will set page context attributes
+    begin to 2 and end to 3.  This should be synchronized
+    to scripting variables begin and end respectively.
+--%>
+
+<%
+    if (begin.intValue() != 2) {
+        out.println("Test FAILED.  Expected begin to be '2' after tag " +
+            "completion.  Actual value: " + begin);
+    }
+    if (end.intValue() != 3) {
+        out.println("Test FAILED.  Expected end to be '3' after tag " +
+            "completion.  Actual value: " + end);
+    }
+%>
+
+<%-- Sync variables declared in Tag file --%>
+<%
+    // If a page scoped attribute has the same name
+    // as a declared NESTED variable in the tag, then
+    // the calling page scoped attribute needs to be restored
+    // after the invocation of the tag.  No synchronization
+    // should occur.
+    Integer nested = new Integer(5);
+    pageContext.setAttribute("nested", nested);
+%>
+
+<%
+    if (begin.intValue() != 3) {
+        out.println("Test FAILED.  Expected begin to be '3' after tag " +
+            "completion.  Actual value: " + begin);
+    }
+    if (end.intValue() != 1) {
+        out.println("Test FAILED.  Expected end to be '1' after tag " +
+            "completion.  Actual value: " + end);
+    }
+    if (nested.intValue() != 5) {
+        out.println("Test FAILED.  Variable synchronization incorrectly occured" +
+            "for a nested variable declared by the Tag file.  The original value" +
+            "of '5' should have been restored after doTag() returned.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld
new file mode 100644
index 0000000000..1917b236bb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/simpletagsupport.tld
@@ -0,0 +1,135 @@
+
+
+
+
+    SimpleTagSupport Validation
+    1.0
+    simpletagsupport
+    
+        checkinstance
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.CheckInstanceSimpleTag
+        scriptless 
+    
+    
+        cskippage
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.ClassicSkipPage
+        JSP 
+    
+    
+        sskippage
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleSkipPage
+        scriptless
+    
+    
+        simpledefault
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.DefaultSimpleTag
+        scriptless
+    
+    
+        fail
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.FailingTag
+        JSP 
+    
+    
+        jspcontext
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleGetSetJspContext
+        scriptless
+    
+    
+        jspbody
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleGetSetJspBody
+        scriptless
+    
+    
+        parent
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleGetSetParent
+        scriptless
+    
+    
+        simpleemptybody
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleEmptyBody
+        empty
+    
+    
+        noparent
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleNoParent
+        scriptless
+    
+    
+        jspFragmentGetJspContextSimple
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleJspFragmentGetJspContext
+        scriptless
+    
+    
+        jspFragmentGetJspContextClassic
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.ClassicJspFragmentGetJspContext
+        JSP
+        
+            fragment
+            true
+        
+    
+    
+        cparent
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.ClassicParent
+        JSP 
+        
+            level
+            false
+        
+    
+    
+        ancestor
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleAncestor
+        scriptless
+    
+    
+        sparent
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleParentTag
+        scriptless
+        
+            level
+            false
+        
+    
+    
+        sync
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleSyncTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SyncTEI
+        scriptless
+    
+    
+        sync1
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.simpletagsupport.SimpleSyncTag
+        scriptless
+        
+            begin
+            java.lang.Integer
+            AT_BEGIN
+        
+        
+            end
+            java.lang.Integer
+            AT_END
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag
new file mode 100644
index 0000000000..d3e7cdf116
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/ClassicSkipPageTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag
new file mode 100644
index 0000000000..479ff411f3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/SimpleSkipPageTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag
new file mode 100644
index 0000000000..fa86726a82
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/WEB-INF/tags/simpletagsupport/Sync.tag
@@ -0,0 +1,56 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="com.sun.ts.tests.jsp.common.util.JspTestUtil" %>
+<%@ variable name-given="begin" variable-class="java.lang.Integer" scope="AT_BEGIN" %>
+<%@ variable name-given="end" variable-class="java.lang.Integer" scope="AT_END" %>
+<%@ variable name-given="nested" variable-class="java.lang.Integer" scope="NESTED" %>
+
+<%
+    Integer b = (Integer) jspContext.getAttribute("begin");
+    Integer n = (Integer) jspContext.getAttribute("nested");
+    Integer e = (Integer) jspContext.getAttribute("end");
+
+    if (b == null) {
+        jspContext.setAttribute("begin", new Integer(3));
+    } else {
+        // error
+        jspContext.getOut().println("Test FAILED.  Attribute 'begin' was " +
+            " presentin the Tag's PageContext.\n  Available attributes: " +
+            JspTestUtil.getAsString(jspContext.getAttributeNamesInScope(
+                PageContext.PAGE_SCOPE)));
+        return;
+    }
+
+    if (n == null) {
+        jspContext.setAttribute("nested", new Integer(9));
+    } else {
+        jspContext.getOut().println("Test FAILED.  Attribute 'nested' was " +
+            "present in the Tag's PageContext.");
+        return;
+    }
+
+    if (e == null) {
+        jspContext.setAttribute("end", new Integer(1));
+    } else {
+        jspContext.getOut().println("Test FAILED.  Attribute 'end' was " +
+            "present in the Tag's PageContext.");
+        return;
+    }
+
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp
new file mode 100644
index 0000000000..c348c4f4d1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/emptySetJspBodyTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp
new file mode 100644
index 0000000000..6d5739fc3f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jspFragmentGetJspContextTest.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
+  ${1}
+
+
+  
+    jspfragment body
+   
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/jsp_simtagsupport_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp
new file mode 100644
index 0000000000..b2c19fc6df
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/noParentTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp
new file mode 100644
index 0000000000..f99feff040
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/simpletagsupport/tagHandlerCacheTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/simpletagsupport" prefix="simtag" %>
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp
new file mode 100644
index 0000000000..1cfe1e583a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterTest.jsp
@@ -0,0 +1,213 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.tagext.TagAdapter,
+                 jakarta.servlet.jsp.tagext.Tag,
+                 jakarta.servlet.jsp.tagext.SimpleTag,
+                 jakarta.servlet.jsp.tagext.JspTag,
+                 jakarta.servlet.jsp.tagext.SimpleTagSupport" %>
+<%@ page contentType="text/plain" %>
+
+<%!
+    private static TagAdapter getTagAdapter() {
+        return new TagAdapter(new SimpleTagSupport());
+    }
+%>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void tagAdapterCtorTest(HttpServletRequest req,
+                                   HttpServletResponse res,
+                                   JspWriter out)
+    throws ServletException, IOException {
+        TagAdapter adapter = getTagAdapter();
+        if (adapter != null) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Unable to create new TagAdapter instanced via " +
+                "the public constuctor.");
+        }
+    }
+%>
+
+<%!
+    public void tagAdapterSetPageContextTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        TagAdapter adapter = getTagAdapter();
+        if (adapter != null) {
+            try {
+                adapter.setPageContext(null);
+            } catch (Throwable t) {
+                if (t instanceof UnsupportedOperationException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Exception thrown when TagAdapter" +
+                        ".setPageContext() was called, but was not an instance" +
+                        " of UnsupportedOperationException.  Received: " +
+                        t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED.  TagAdapter was null.");
+        }
+    }
+%>
+
+<%!
+    public void tagAdapterSetParentTest(HttpServletRequest req,
+                                        HttpServletResponse res,
+                                        JspWriter out)
+    throws ServletException, IOException {
+        TagAdapter adapter = getTagAdapter();
+        if (adapter != null) {
+            try {
+                adapter.setParent(null);
+            } catch (Throwable t) {
+                if (t instanceof UnsupportedOperationException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Exception thrown when TagAdapter" +
+                        ".setParent() was called, but was not an instance" +
+                        " of UnsupportedOperationException.  Received: " +
+                        t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED.  TagAdapter was null.");
+        }
+    }
+%>
+
+<%!
+    public void tagAdapterGetParentTest(HttpServletRequest req,
+                                        HttpServletResponse res,
+                                        JspWriter out)
+    throws ServletException, IOException {
+        TagAdapter adapter = getTagAdapter();
+        if (adapter != null) {
+            boolean pass = false;
+            JspTag adaptee = adapter.getAdaptee();
+            if(adaptee == null) {
+                out.println("Test FAILED.  adpatee is null.");
+            } else if(adaptee instanceof SimpleTag) {
+                Tag p1 = adapter.getParent();
+                SimpleTag stg = (SimpleTag) adaptee; 
+                JspTag p2 = stg.getParent();
+                if(p1 == p2) {
+                    out.println("Test PASSED. getParent() returns the same value as getAdaptee().getParent()");
+                } else {
+                    out.println("Test FAILED.  getParent() does not return the same value as getAdaptee().getParent()");
+                }
+            } else {
+                out.println("Test PASSED. adaptee is not a SimpleTag and need to update tests.");
+            }
+        } else {
+            out.println("Test FAILED.  TagAdapter was null.");
+        }
+    }
+%>
+
+<%!
+    public void tagAdapterDoStartTagTest(HttpServletRequest req,
+                                        HttpServletResponse res,
+                                        JspWriter out)
+    throws ServletException, IOException {
+        TagAdapter adapter = getTagAdapter();
+        if (adapter != null) {
+            try {
+                adapter.doStartTag();
+            } catch (Throwable t) {
+                if (t instanceof UnsupportedOperationException) {
+                    out.println("Test PASSED");
+                } else if (t instanceof JspException) {
+                    out.println("Test FAILED.  JspException was incorrectly" +
+                        " thrown when calling doStartTag() on the TagAdapter.");
+                } else {
+                    out.println("Test FAILED.  Exception thrown when TagAdapter" +
+                        ".doStartTag() was called, but was not an instance" +
+                        " of UnsupportedOperationException.  Received: " +
+                        t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED.  TagAdapter was null.");
+        }
+    }
+%>
+
+<%!
+    public void tagAdapterDoEndTagTest(HttpServletRequest req,
+                                       HttpServletResponse res,
+                                       JspWriter out)
+    throws ServletException, IOException {
+        TagAdapter adapter = getTagAdapter();
+        if (adapter != null) {
+            try {
+                adapter.doEndTag();
+            } catch (Throwable t) {
+                if (t instanceof UnsupportedOperationException) {
+                    out.println("Test PASSED");
+                } else if (t instanceof JspException) {
+                    out.println("Test FAILED.  JspException was incorrectly" +
+                        " thrown when calling doEndTag() on the TagAdapter.");
+                } else {
+                    out.println("Test FAILED.  Exception thrown when TagAdapter" +
+                        ".doEndTag() was called, but was not an instance" +
+                        " of UnsupportedOperationException.  Received: " +
+                        t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED.  TagAdapter was null.");
+        }
+    }
+%>
+
+<%!
+    public void tagAdapterReleaseTest(HttpServletRequest req,
+                                      HttpServletResponse res,
+                                      JspWriter out)
+    throws ServletException, IOException {
+        TagAdapter adapter = getTagAdapter();
+        if (adapter != null) {
+            try {
+                adapter.release();
+            } catch (Throwable t) {
+                if (t instanceof UnsupportedOperationException) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Exception thrown when TagAdapter" +
+                        ".release() was called, but was not an instance" +
+                        " of UnsupportedOperationException.  Received: " +
+                        t.getClass().getName());
+                }
+            }
+        } else {
+            out.println("Test FAILED.  TagAdapter was null.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp
new file mode 100644
index 0000000000..bb51239d00
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/TagAdapterValidationTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagadapter" prefix="tatest"  %>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld
new file mode 100644
index 0000000000..08d6f9c9ca
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/WEB-INF/tagadapter.tld
@@ -0,0 +1,37 @@
+
+
+
+
+    TagAdapter Validation
+    1.0
+    tagadapter
+    
+        simpleparent
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagadapter.TASimpleTag
+        scriptless
+    
+    
+        classicchild
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagadapter.TagAdapterVerifierTag
+        JSP 
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagadapter/jsp_tagadapter_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp
new file mode 100644
index 0000000000..1dbf73b33e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/CanBeRequestTimeTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagattrinfo" prefix="tagattrinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp
new file mode 100644
index 0000000000..8a8e5c9118
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetIdAttribute.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagattrinfo" prefix="tagattrinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp
new file mode 100644
index 0000000000..63b4649b0b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetNameTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagattrinfo" prefix="tagattrinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp
new file mode 100644
index 0000000000..f29b0c2368
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/GetTypeNameTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagattrinfo" prefix="tagattrinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp
new file mode 100644
index 0000000000..afa8183a5e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsFragmentTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagattrinfo" prefix="tagattrinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp
new file mode 100644
index 0000000000..688c1b2e10
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/IsRequiredTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagattrinfo" prefix="tagattrinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp
new file mode 100644
index 0000000000..0b903875ca
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/ToStringTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagattrinfo" prefix="tagattrinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld
new file mode 100644
index 0000000000..36d5c4cce0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/WEB-INF/tagattributeinfo.tld
@@ -0,0 +1,47 @@
+
+
+
+
+    TagLibraryInfo Validation
+    1.0
+    tagattributeinfo
+    
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagattributeinfo.TagAttributeInfoTEI
+        JSP 
+        
+            test
+            true
+        
+        
+            dynAttribute
+            false
+            true
+            java.lang.Integer
+        
+        
+            fragAttribute
+            true
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/jsp_tagattrinfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/jsp_tagattrinfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/jsp_tagattrinfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagattributeinfo/jsp_tagattrinfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/ConstructorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/ConstructorTest.jsp
new file mode 100644
index 0000000000..1009b0f5e9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/ConstructorTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagdata" prefix="tagdata" %>
+
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp
new file mode 100644
index 0000000000..eee60fcb1b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeStringTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagdata" prefix="tagdata" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp
new file mode 100644
index 0000000000..15046e9302
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributeTest.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagdata" prefix="tagdata" %>
+
+    
+	${'EL Expression'}
+    
+    
+	static
+    
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp
new file mode 100644
index 0000000000..63b7c89b74
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/GetAttributesTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagdata" prefix="tagdata" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp
new file mode 100644
index 0000000000..036832163f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/SetAttributeTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagdata" prefix="tagdata" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld
new file mode 100644
index 0000000000..7484368eaf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/WEB-INF/tagdata.tld
@@ -0,0 +1,57 @@
+
+
+
+
+    TagLibraryInfo Validation
+    1.0
+    tagdata
+    
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagdata.TagDataTEI
+        JSP 
+        
+            test
+            true
+        
+        
+            dynAttribute
+            false
+            true
+        
+        
+            dynAttribute2
+            false
+            true
+        
+        
+            dynAttribute3
+            false
+            true
+        
+        
+            dynAttribute4
+            false
+            true
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/jsp_tagdata_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/jsp_tagdata_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/jsp_tagdata_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagdata/jsp_tagdata_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp
new file mode 100644
index 0000000000..659524e831
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoDefaultImplTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagextrainfo.TagExtraInfoTEI"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagextrainfo" prefix="tagextrainfo" %>
+
+<%
+    if (TagExtraInfoTEI.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    TagExtraInfoTEI.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp
new file mode 100644
index 0000000000..4632461d11
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoEmptyReturnTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagextrainfo.TagExtraInfoTEI"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagextrainfo" prefix="tagextrainfo" %>
+
+<%
+    if (TagExtraInfoTEI.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    TagExtraInfoTEI.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp
new file mode 100644
index 0000000000..48e572d8d0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNonEmptyReturnTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagextrainfo.TagExtraInfoTEI"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagextrainfo" prefix="tagextrainfo" %>
+
+<%
+    if (TagExtraInfoTEI.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    TagExtraInfoTEI.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp
new file mode 100644
index 0000000000..bef8e9cba2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/TagExtraInfoNullReturnTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagextrainfo.TagExtraInfoTEI"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagextrainfo" prefix="tagextrainfo" %>
+
+<%
+    if (TagExtraInfoTEI.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    TagExtraInfoTEI.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld
new file mode 100644
index 0000000000..50b6ce0dcc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/WEB-INF/tagextrainfo.tld
@@ -0,0 +1,37 @@
+
+
+
+
+    TagLibraryInfo Validation
+    1.0
+    tagextrainfo
+    
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagextrainfo.TagExtraInfoTEI
+        JSP 
+        
+            test
+            true
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagextrainfo/jsp_tagextrainfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp
new file mode 100644
index 0000000000..a199396d01
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetNameTest.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagfileinfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp
new file mode 100644
index 0000000000..b8a1d10e89
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetPathTest.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagfileinfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp
new file mode 100644
index 0000000000..c789c5910e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/GetTagInfoTest.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagfileinfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld
new file mode 100644
index 0000000000..e984a05a43
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tagfileinfo.tld
@@ -0,0 +1,41 @@
+
+
+
+
+    TagFileInfo Validation
+    1.0
+    tagfileinfo
+    
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagfileinfo.TagFileInfoTEI
+        JSP 
+        
+            test
+            true
+        
+    
+    
+        TagFile1
+        /WEB-INF/tags/tagfileinfo/TagFile1.tag
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag
new file mode 100644
index 0000000000..6a1bb6656c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/WEB-INF/tags/tagfileinfo/TagFile1.tag
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag display-name="TagFile1"
+        dynamic-attributes="true"
+        small-icon="/16/icon.jpg"
+        large-icon="/32/icon.jpg"
+        description="Simple Tag File"
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/jsp_tagfileinfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/jsp_tagfileinfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/jsp_tagfileinfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagfileinfo/jsp_tagfileinfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp
new file mode 100644
index 0000000000..645b4114bb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetAttributesTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp
new file mode 100644
index 0000000000..4c779474e1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetBodyContentTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp
new file mode 100644
index 0000000000..e986368967
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetDisplayNameTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp
new file mode 100644
index 0000000000..f079927323
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetInfoStringTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp
new file mode 100644
index 0000000000..6065cca400
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetLargeIconTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp
new file mode 100644
index 0000000000..20748a9b31
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetSmallIconTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp
new file mode 100644
index 0000000000..e496f2a2fd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagClassNameTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp
new file mode 100644
index 0000000000..c0bb3ed357
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagExtraInfoTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp
new file mode 100644
index 0000000000..b88746d1b3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagLibraryTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp
new file mode 100644
index 0000000000..64931b2ca0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagNameTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp
new file mode 100644
index 0000000000..412ae8aced
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/GetTagVariableInfosTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp
new file mode 100644
index 0000000000..2ae57e7959
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/HasDynamicAttributesTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp
new file mode 100644
index 0000000000..9b22fc9c9a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagExtraInfoTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp
new file mode 100644
index 0000000000..9e18c8feb3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/SetTagLibraryTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taginfo" prefix="taginfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld
new file mode 100644
index 0000000000..7bfbd3cdb1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/WEB-INF/taginfo.tld
@@ -0,0 +1,56 @@
+
+
+
+
+    TagInfo Validation
+    1.0
+    taginfo
+    
+        simple test tag
+        test tag
+        
+            /16/icon.jpg
+            /32/icon.jpg
+        
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taginfo.TagInfoTEI
+        JSP 
+        
+            test
+            true
+        
+        true
+    
+    
+        simple test tag
+        test2
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        tagdependent
+        
+            var1
+        
+        
+            var2
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/jsp_taginfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/jsp_taginfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/jsp_taginfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taginfo/jsp_taginfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp
new file mode 100644
index 0000000000..d37a6359af
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp
new file mode 100644
index 0000000000..553f36a9b0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetFunctionsTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp
new file mode 100644
index 0000000000..ff3ebc6659
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetInfoStringTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp
new file mode 100644
index 0000000000..2eae90d230
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetPrefixStringTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp
new file mode 100644
index 0000000000..145ba26b0e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetReliableURNTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp
new file mode 100644
index 0000000000..67d6fd9e3c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetRequiredVersionTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp
new file mode 100644
index 0000000000..d32eab2061
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetShortNameTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp
new file mode 100644
index 0000000000..8c365f1607
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFileTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp
new file mode 100644
index 0000000000..9b2f938476
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagFilesTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp
new file mode 100644
index 0000000000..87250db998
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagLibraryInfosTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo2" prefix="taglibinfo2" %>
+    
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
+   
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp
new file mode 100644
index 0000000000..566e8b189a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp
new file mode 100644
index 0000000000..11f165ce2a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetTagsTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp
new file mode 100644
index 0000000000..ead1b8d593
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/GetURITest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/taglibinfo" prefix="taglibinfo" %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld
new file mode 100644
index 0000000000..523e7d0f09
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo.tld
@@ -0,0 +1,67 @@
+
+
+
+
+    TagLibraryInfo Validation
+    1.0
+    taglibinfo
+    http://java.sun.com/tck/jsp/taglibinfo
+    
+        tag1
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taglibraryinfo.TagLibraryInfoTEI
+        JSP 
+        
+            test
+            true
+        
+    
+    
+        tag2
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        JSP 
+        
+            test
+            false
+        
+    
+    
+        TagFile1
+        /WEB-INF/tags/taglibinfo/TagFile1.tag
+    
+    
+        TagFile2
+        /WEB-INF/tags/taglibinfo/TagFile2.tag
+    
+    
+        upperCase
+        upperCase
+        com.sun.ts.tests.jsp.common.util.JspFunctions
+        java.lang.String upperCase(java.lang.String)
+    
+    
+        lowerCase
+        lowerCase
+        com.sun.ts.tests.jsp.common.util.JspFunctions
+        java.lang.String lowerCase(java.lang.String)
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld
new file mode 100644
index 0000000000..26d709de57
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/taglibinfo2.tld
@@ -0,0 +1,67 @@
+
+
+
+
+    TagLibraryInfo Validation
+    1.0
+    taglibinfo2
+    http://java.sun.com/tck/jsp/taglibinfo2
+    
+        tag1
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taglibraryinfo.TagLibraryInfoTEI
+        JSP 
+        
+            test
+            true
+        
+    
+    
+        tag2
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        JSP 
+        
+            test
+            false
+        
+    
+    
+        TagFile1
+        /WEB-INF/tags/taglibinfo/TagFile1.tag
+    
+    
+        TagFile2
+        /WEB-INF/tags/taglibinfo/TagFile2.tag
+    
+    
+        upperCase
+        upperCase
+        com.sun.ts.tests.jsp.common.util.JspFunctions
+        java.lang.String upperCase(java.lang.String)
+    
+    
+        lowerCase
+        lowerCase
+        com.sun.ts.tests.jsp.common.util.JspFunctions
+        java.lang.String lowerCase(java.lang.String)
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag
new file mode 100644
index 0000000000..5bc6b7fa45
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%-- Tag on a log... --%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag
new file mode 100644
index 0000000000..f0b732016c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/WEB-INF/tags/taglibinfo/TagFile2.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%-- Another Tag on a log... --%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/jsp_taglibinfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/jsp_taglibinfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/jsp_taglibinfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryinfo/jsp_taglibinfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp
new file mode 100644
index 0000000000..ccf4b98733
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TLVTranslationErrorTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tlvfail" prefix="fail"  %>
+
+Test FAILED.  A translation error should have occurred.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp
new file mode 100644
index 0000000000..a4b5a1a14a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/TagLibraryValidatorTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taglibraryvalidator.APIValidator"%>
+<%@ page contentType="text/plain" %>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/tlv" prefix="tlv1" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tlv" prefix="tlv2" %>
+
+<%
+    int count = APIValidator.callCount;
+    if (count != 1) {
+        response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+            "Test FAILED.  The TagLibraryValidator was called " + count +
+            " time(s) for the URI 'http://java.sun.com/tck/jsp/tlv', expected a count of 1");
+    } 
+%>
+Test PASSED.  Validator call count was 1.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld
new file mode 100644
index 0000000000..1213dfa71f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalfail.tld
@@ -0,0 +1,32 @@
+
+
+
+
+    Tag Library for TagLibraryValidator Tests
+    TagLibraryValidator Test Tag Library
+    1.0
+    taglibvalfail
+    
+        Validator to verify API/container interoperation.
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taglibraryvalidator.FailingValidator
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld
new file mode 100644
index 0000000000..8f811b030b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/WEB-INF/taglibvalidator.tld
@@ -0,0 +1,36 @@
+
+
+
+
+    Tag Library for TagLibraryValidator Tests
+    TagLibraryValidator Test Tag Library
+    1.0
+    taglibvalidator
+    
+        Validator to verify API/container interoperation.
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.taglibraryvalidator.APIValidator
+        
+            initParam
+            paramValue
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/taglibraryvalidator/jsp_taglibvalidator_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp
new file mode 100644
index 0000000000..21abc1b76b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodyEvalBodyAgainTest.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+<%! int i = 0; %>
+
+    Body Evaluated<%= ++i %>
+
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp
new file mode 100644
index 0000000000..e5a4ba38bc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoAfterBodySkipBodyTest.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+<%! int i = 0; %>
+
+    Body Evaluated<%= ++i %>
+
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp
new file mode 100644
index 0000000000..e39bc8aa51
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagEvalPageTest.jsp
@@ -0,0 +1,44 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+
+    
+        Test FAILED.
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+${validate.result}
+${validate1.result}1
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp
new file mode 100644
index 0000000000..0d88b87055
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoEndTagSkipPageTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+
+    
+        Test FAILED.
+    
+
+Test FAILED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp
new file mode 100644
index 0000000000..479937ca1f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartEvalBodyIncludeTest.jsp
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+
+    Test FAILED
+
+<%
+    // body evaluation should have used the out for the page.
+    // Flush the current out.
+    out.clearBuffer();
+%>
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp
new file mode 100644
index 0000000000..e67df7f5a1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/DoStartSkipBodyTest.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+
+    Test FAILED.
+
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp
new file mode 100644
index 0000000000..cad4f75dba
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/FindAncestorTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+
+    
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/MethodValidation.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/MethodValidation.jsp
new file mode 100644
index 0000000000..82e5cb1f1c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/MethodValidation.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+
+
+
+
+
+${validate.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp
new file mode 100644
index 0000000000..e631dc838a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagInitializationTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp
new file mode 100644
index 0000000000..5009c80509
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportApiTest.jsp
@@ -0,0 +1,164 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.io.IOException,
+                 jakarta.servlet.jsp.tagext.TagSupport,
+                 jakarta.servlet.jsp.tagext.Tag,
+                 com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.util.Enumeration"%>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void doStartTagTest(HttpServletRequest req,
+                               HttpServletResponse res,
+                               JspWriter out)
+    throws ServletException, IOException {
+        TagSupport support = new TagSupport();
+        int retValue = 0;
+        try {
+            retValue = support.doStartTag();
+        } catch (JspException je) {
+            throw new ServletException("Unexpected Exception!", je);
+        }
+        if (retValue == Tag.SKIP_BODY) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected the default return value" +
+                " of TagSupport.doStartTag() to be Tag.SKIP_BODY.  Received:" +
+                "  " + JspTestUtil.getTagStatusAsString("doStartTag", "Tag",
+                    retValue));
+        }
+    }
+%>
+
+<%!
+    public void doEndTagTest(HttpServletRequest req,
+                             HttpServletResponse res,
+                             JspWriter out)
+    throws ServletException, IOException {
+        TagSupport support = new TagSupport();
+        int retValue = 0;
+        try {
+            retValue = support.doEndTag();
+        } catch (JspException je) {
+            throw new ServletException("Unexpected Exception!", je);
+        }
+        if (retValue == Tag.EVAL_PAGE) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected the default return value" +
+                " of TagSupport.doEndTag() to be Tag.EVAL_PAGE.  Received:" +
+                "  " + JspTestUtil.getTagStatusAsString("doEndTag", "Tag",
+                    retValue));
+        }
+    }
+%>
+
+<%!
+    public void doAfterBodyTest(HttpServletRequest req,
+                                HttpServletResponse res,
+                                JspWriter out)
+    throws ServletException, IOException {
+        TagSupport support = new TagSupport();
+        int retValue = 0;
+        try {
+            retValue = support.doAfterBody();
+        } catch (JspException je) {
+            throw new ServletException("Unexpected Exception!", je);
+        }
+        if (retValue == Tag.SKIP_BODY) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected the default return value" +
+                " of TagSupport.doAfterBody() to be Tag.SKIP_BODY.  Received:" +
+                "  " + JspTestUtil.getTagStatusAsString("doAfterBody", "IterationTag",
+                    retValue));
+        }
+    }
+%>
+
+<%!
+    public void setGetValue(HttpServletRequest req,
+                            HttpServletResponse res,
+                            JspWriter out)
+    throws ServletException, IOException {
+        TagSupport support = new TagSupport();
+        support.setValue("key1", "value1");
+        String retValue = (String) support.getValue("key1");
+        if (retValue.equals("value1")) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected TagSupport.getValue() to return" +
+                "'value1' for key 'key1'.  The actual value received was: " +
+                retValue);
+        }
+    }
+%>
+
+<%!
+    public void getValues(HttpServletRequest req,
+                          HttpServletResponse res,
+                          JspWriter out)
+    throws ServletException, IOException {
+        TagSupport support = new TagSupport();
+        support.setValue("key1", "value1");
+        support.setValue("key3", "value3");
+        support.setValue("key2", "value2");
+        Enumeration e = support.getValues();
+        if (JspTestUtil.checkEnumeration(e,
+            new String[] { "key1", "key2", "key3" })) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected the following values to be found" +
+                " in the Enumeration returned by getValues(): [ key1, key2, key3 ]" +
+                ".  Values in the Enumeration: " +
+                JspTestUtil.getAsString(support.getValues()));
+        }
+    }
+%>
+
+<%!
+    public void removeValue(HttpServletRequest req,
+                            HttpServletResponse res,
+                            JspWriter out)
+    throws ServletException, IOException {
+        TagSupport support = new TagSupport();
+        support.setValue("key1", "value1");
+        support.setValue("key2", "value2");
+        support.removeValue("key1");
+        if (support.getValue("key1") == null) {
+            if (support.getValue("key2") != null) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Passed 'key1' to TagSupport.remove" +
+                    "Value(), but 'key2' was removed as well.");
+            }
+        } else {
+            out.println("Test FAILED.  Passed 'key1' to TagSupport.remove" +
+                "Value(), but 'key1' was not removed.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<%
+    JspTestUtil.invokeTest(this, request, response, out);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp
new file mode 100644
index 0000000000..951bc291ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/TagSupportSynchronizationTest.jsp
@@ -0,0 +1,129 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagsupport" prefix="tag"  %>
+
+<%-- Validate synchronization when iterating over body --%>
+Iteration synchronization
+--------------------------------------------
+<%! int counter = 2; %>
+
+    <%
+        int beg = (begin != null) ? begin.intValue() : 0;
+        int nes = (nested != null) ? nested.intValue() : 0;
+        if (counter == 2) {
+            // doStartTag() called initial value of 1
+           if (beg < 1) {
+               out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+                  " doStartTag().  Expected a value of '1'.  Received: " + beg);
+           }
+           if (beg > 1) {
+               out.println("Test FAILED. Variable 'begin' seems to have been" +
+                   " synchronized too many times after doStartTag().  Expected " +
+                   "a value of '1'.  Received: " + beg);
+           }
+           if (nes < 1) {
+               out.println("Test FAILED.  Variable 'nested' not synchronized after" +
+                   " doStartTag().  Expected a value of '1'.  Received: " + nes);
+           }
+           if (nes > 1) {
+               out.println("Test FAILED. Variable 'nested' seems to have been" +
+                   " synchronized too many times after doStartTag().  Expected " +
+                   "a value of '1'.  Received: " + nes);
+           }
+       } else {
+           // doAfterBody() called with EVAL_BODY_AGAIN new value of 2
+           if (beg < 2) {
+               out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+                   " doAfterBody().  Expected a value of '2'.  Received: " + beg);
+           }
+           if (beg > 2) {
+               out.println("Test FAILED. Variable 'begin' seems to have been" +
+                   " synchronized too many times after doAfterBody().  Expected " +
+                   "a value of '2'.  Received: " + beg);
+           }
+           if (nes != 2) {
+               out.println("Test FAILED.  Variable 'nested' not synchronized after" +
+                   " doAfterBody().  Expected a value of '2'.  Received: " + nes);
+           }
+           if (nes > 2) {
+               out.println("Test FAILED. Variable 'nested' seems to have been" +
+                   " synchronized too many times after doAfterBody().  Expected " +
+                   "a value of '2'.  Received: " + nes);
+           }
+       }
+       counter--;
+    %>
+
+<%
+    // doAfterBody() has been called with SKIP_BODY, then doEndTag() value
+    // incremented by 2.
+    int beg = (begin != null) ? begin.intValue() : 0;
+    int eend = (end != null) ? end.intValue() : 0;
+    if (beg < 4) {
+        out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+            " doEndTag().  Expected a value of '4'.  Received: " + beg);
+    }
+    if (beg > 4) {
+        out.println("Test FAILED. Variable 'begin' seems to have been" +
+            " synchronized too many times after doEndTag().  Expected " +
+            "a value of '4'.  Received: " + beg);
+    }
+    if (eend < 4) {
+        out.println("Test FAILED. Variable 'end' not synchronized after " +
+            " doEndTag().  Expected a value of '4'.  Received: " + eend);
+    }
+    if (eend > 4) {
+        out.println("Test FAILED. Variable 'end' seems to have been" +
+            " synchronized too many times after doEndTag().  Expected " +
+            "a value of '4'.  Received: " + eend);
+    }
+    pageContext.removeAttribute("begin");
+    pageContext.removeAttribute("end");
+%>
+
+<%-- Validate synchronization when doStartTag() returns SKIP_BODY --%>
+Tag Synchronization
+--------------------------------------------
+
+<%
+    // doStartTag() and doEndTag() have each been called once.
+    beg = (begin != null) ? begin.intValue() : 0;
+    eend = (end != null) ? end.intValue() : 0;
+    if (beg < 2) {
+        out.println("Test FAILED.  Variable 'begin' not synchronized after" +
+            " doStartTag() and/or doEndTag().  Expected a value of '2'.  Received: " + beg);
+    }
+    if (beg > 2) {
+        out.println("Test FAILED. Variable 'begin' seems to have been" +
+            " synchronized too many times after doStartTag() and/ordoEndTag().  Expected " +
+            "a value of '2'.  Received: " + beg);
+    }
+    if (eend < 2) {
+        out.println("Test FAILED. Variable 'end' not synchronized after " +
+            " doStartTag() and/or doEndTag().  Expected a value of '2'.  Received: " + eend);
+    }
+    if (eend > 2) {
+        out.println("Test FAILED. Variable 'end' seems to have been" +
+            " synchronized too many times after doStartTag() and/or doEndTag().  Expected " +
+            "a value of '2'.  Received: " + eend);
+    }
+    pageContext.removeAttribute("begin");
+    pageContext.removeAttribute("end");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld
new file mode 100644
index 0000000000..1a994e59c5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/WEB-INF/tagsupport.tld
@@ -0,0 +1,129 @@
+
+
+
+
+    Tags for Tag/Container behavior tests
+    Tag
+    1.0
+    tagsupport
+    
+        parent
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.ParentTag
+        JSP 
+        
+            result
+            false
+        
+    
+    
+        init
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.InitializationTag
+        JSP 
+        
+            attribute1
+            true
+        
+        
+            attribute2
+            true
+        
+        
+            attribute3
+            true
+        
+    
+    
+        interaction
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.ContainerInteractionTag
+        JSP 
+        
+            doStartTag
+            true
+            java.lang.String
+        
+        
+            doEndTag
+            true
+            java.lang.String
+        
+        
+            doAfterBody
+            false
+            java.lang.String
+        
+        
+            bodyCount
+            java.lang.Integer
+        
+        
+            result
+            true
+        
+    
+    
+        ancestor
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.FindAncestorTag
+        JSP 
+    
+    
+        sync
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagsupport.SynchronizationTag
+        JSP 
+        
+            begin
+            java.lang.Integer
+            yes
+            AT_BEGIN
+        
+        
+            nested
+            java.lang.Integer
+            yes
+            NESTED
+        
+        
+            end
+            java.lang.Integer
+            yes
+            AT_END
+        
+        
+            doStartTag
+            true
+            java.lang.String
+        
+        
+            doEndTag
+            true
+            java.lang.String
+        
+        
+            doAfterBody
+            false
+            java.lang.String
+        
+        
+            bodyCount
+            java.lang.Integer
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagsupport/jsp_tagsupport_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp
new file mode 100644
index 0000000000..25cf104f5c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetClassNameTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagvarinfo" prefix="tagvarinfo" %>
+<% String var2 = null; %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp
new file mode 100644
index 0000000000..b827d6699b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetDeclareTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagvarinfo" prefix="tagvarinfo" %>
+<% String var2 = null; %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp
new file mode 100644
index 0000000000..e3f1bb9ab8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameFromAttributeTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagvarinfo" prefix="tagvarinfo" %>
+<% String var2 = null; %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp
new file mode 100644
index 0000000000..2c1f07b04c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetNameGivenTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagvarinfo" prefix="tagvarinfo" %>
+<% String var2 = null; %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp
new file mode 100644
index 0000000000..0a4e4f6bfa
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/GetScopeTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.BaseTCKExtraInfo"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/tagvarinfo" prefix="tagvarinfo" %>
+<% String var2 = null; %>
+
+<%
+    if (BaseTCKExtraInfo.teiWasCalled()) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.  Configured TEI was not called by container.");
+    }
+    BaseTCKExtraInfo.reset();
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld
new file mode 100644
index 0000000000..371e91c638
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/WEB-INF/tagvarinfo.tld
@@ -0,0 +1,59 @@
+
+
+
+
+    Tag Library for TagVariableInfo Tests
+    TagVariableInfo Test Tag Library
+    1.0
+    tagvarinfo
+    
+        Simple Test Tag
+        Simple Test Tag
+        test
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.tagvariableinfo.TagVarInfoTEI
+        JSP 
+        
+            var1
+            java.lang.Integer
+            true
+        
+        
+            test
+            AT_BEGIN
+        
+        
+            var2
+            false
+            AT_END
+        
+        
+            var3
+            NESTED
+        
+        
+            test
+            true
+            java.lang.String
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/jsp_tagvarinfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/jsp_tagvarinfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/jsp_tagvarinfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/tagvariableinfo/jsp_tagvarinfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp
new file mode 100644
index 0000000000..3f7304899b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/TryCatchFinallyTest.jsp
@@ -0,0 +1,47 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/trycatchfinally" prefix="try"  %>
+
+<% try { %>
+
+
+<% } catch (Throwable t) { } %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+
+
+
+
+
+${verifier.result}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld
new file mode 100644
index 0000000000..6332c98628
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/WEB-INF/trycatchfinally.tld
@@ -0,0 +1,42 @@
+
+
+
+
+    Test Tag(s) for TryCatchFinally
+    trycatchfinally
+    1.0
+    trycatchfinally
+    
+        tcf
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.trycatchfinally.TCFTestTag
+        JSP 
+        
+            location
+            true
+        
+    
+    
+        throwit
+        com.sun.ts.tests.jsp.api.jakarta_servlet.jsp.tagext.trycatchfinally.ThrowTag
+        JSP 
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/trycatchfinally/jsp_tcfinally_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp
new file mode 100644
index 0000000000..8253609432
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/VariableInfoTest.jsp
@@ -0,0 +1,150 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.IOException,
+                 jakarta.servlet.jsp.tagext.VariableInfo" %>
+<%@ page contentType="text/plain" %>
+
+<%-- Begin test definitions --%>
+
+<%!
+    public void variableInfoCtorTest(HttpServletRequest req,
+                                     HttpServletResponse res,
+                                     JspWriter out)
+    throws ServletException, IOException {
+        VariableInfo infoBegin = new VariableInfo("beginVar",
+            "com.sun.ts.tests.jsp.api.MyVar", true, VariableInfo.AT_BEGIN);
+        VariableInfo infoNested = new VariableInfo("nestedVar",
+            "com.sun.ts.tests.jsp.api.MyVar", false, VariableInfo.NESTED);
+        VariableInfo infoEnd = new VariableInfo("endVar",
+            "com.sun.ts.tests.jsp.api.MyVar", true, VariableInfo.AT_END);
+        if (infoBegin != null) {
+            if (infoNested != null) {
+                if (infoEnd != null) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Unable to create instance of VariableInfo.");
+                }
+            } else {
+                out.println("Test FAILED.  Unable to create instance of VariableInfo.");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to create instance of VariableInfo.");
+        }
+    }
+%>
+
+<%!
+    public void variableInfoGetVarNameTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        VariableInfo info = new VariableInfo("myVar",
+            "com.sun.ts.tests.jsp.api.MyVar", true, VariableInfo.NESTED);
+        if (info != null) {
+            String varName = info.getVarName();
+            if (varName != null) {
+                if (varName.equals("myVar")) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected 'myVar' to be returned" +
+                        " from VariableInfo.getVarName().");
+                    out.println("Received: " + varName);
+                }
+            } else {
+                out.println("Test FAILED.  VariableInfo.getVarName() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to create instance of VariableInfo.");
+        }
+    }
+%>
+
+<%!
+    public void variableInfoGetClassNameTest(HttpServletRequest req,
+                                             HttpServletResponse res,
+                                             JspWriter out)
+    throws ServletException, IOException {
+        VariableInfo info = new VariableInfo("myVar",
+            "com.sun.ts.tests.jsp.api.MyVar", true, VariableInfo.AT_END);
+        if (info != null) {
+            String className = info.getClassName();
+            if (className != null) {
+                if (className.equals("com.sun.ts.tests.jsp.api.MyVar")) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected 'com.sun.ts.tests.jsp.api.MyVar'" +
+                        " to be retuned from VariableInfo.getClassName()");
+                    out.println("Received: " + className);
+                }
+            } else {
+                out.println("Test FAILED.  VariableInfo.getClassName() returned null.");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to create instance of VariableInfo.");
+        }
+    }
+%>
+
+<%!
+    public void variableInfoGetDeclareTest(HttpServletRequest req,
+                                           HttpServletResponse res,
+                                           JspWriter out)
+    throws ServletException, IOException {
+        VariableInfo info = new VariableInfo("myVar",
+            "com.sun.ts.tests.jsp.api.MyVar", true, VariableInfo.AT_END);
+        if (info != null) {
+            boolean declare = info.getDeclare();
+            if (declare == true) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected 'true'" +
+                   " to be retuned from VariableInfo.getDeclare()");
+                out.println("Received: false");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to create instance of VariableInfo.");
+        }
+    }
+%>
+
+<%!
+    public void variableInfoGetScopeTest(HttpServletRequest req,
+                                         HttpServletResponse res,
+                                         JspWriter out)
+    throws ServletException, IOException {
+        VariableInfo info = new VariableInfo("myVar",
+                "com.sun.ts.tests.jsp.api.MyVar", false, VariableInfo.NESTED);
+        if (info != null) {
+            int scope = info.getScope();
+            if (scope == VariableInfo.NESTED) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  VariableInto.getScope() did not return" +
+                    "the expected value, VariableInto.NESTED.");
+            }
+        } else {
+            out.println("Test FAILED.  Unable to create instance of VariableInfo.");
+        }
+    }
+%>
+
+<%-- Test invocation --%>
+
+<% JspTestUtil.invokeTest(this, request, response, out); %>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml
similarity index 100%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/tagext/variableinfo/jsp_varinfo_web.xml
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/WEB-INF/config_charsequence.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/WEB-INF/config_charsequence.tld
new file mode 100644
index 0000000000..d2a22e2a2c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/WEB-INF/config_charsequence.tld
@@ -0,0 +1,38 @@
+
+
+
+
+
+    1.0
+    charsequence
+  
+    DeferredSyntaxAllowedAsLiteral test
+    DeferredSyntaxAllowedAsLiteral
+    com.sun.ts.tests.jsp.spec.configuration.charsequence.DeferredSyntaxAllowedAsLiteralTag
+    empty
+    
+      use of '#{' in an attribute value
+      poundExpr
+      true
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseActionTest.jsp
new file mode 100644
index 0000000000..551ac8a82e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseActionTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/config_charsequence.tld" %>
+
+<%
+  pageContext.setAttribute("foo", "bar");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp
new file mode 100644
index 0000000000..a2e4fb40b1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%
+  pageContext.setAttribute("foo", "bar");
+%>
+From template text: #{foo}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.gf
new file mode 100644
index 0000000000..56a7c7db75
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.gf
@@ -0,0 +1 @@
+From tag handler: #{foo}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.jsp
new file mode 100644
index 0000000000..551ac8a82e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueActionTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/config_charsequence.tld" %>
+
+<%
+  pageContext.setAttribute("foo", "bar");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf
new file mode 100644
index 0000000000..a4204ae22a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf
@@ -0,0 +1 @@
+From template text: #{foo}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp
new file mode 100644
index 0000000000..a2e4fb40b1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%
+  pageContext.setAttribute("foo", "bar");
+%>
+From template text: #{foo}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/jsp_config_charsequence_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/jsp_config_charsequence_web.xml
new file mode 100644
index 0000000000..0331cfbfd9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/jsp_config_charsequence_web.xml
@@ -0,0 +1,49 @@
+
+
+
+
+  JspConfigCharsequence
+  
+    5
+  
+  
+    
+      /deferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp
+      true
+    
+    
+      /deferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp
+      false
+    
+    
+      /deferredSyntaxAllowedAsLiteralTrueActionTest.jsp
+      true
+    
+    
+      /deferredSyntaxAllowedAsLiteralFalseActionTest.jsp
+      false
+    
+    
+      /noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp
+    
+    
+      /noDeferredSyntaxAllowedAsLiteralActionTest.jsp
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralActionTest.jsp
new file mode 100644
index 0000000000..551ac8a82e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralActionTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/config_charsequence.tld" %>
+
+<%
+  pageContext.setAttribute("foo", "bar");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp
new file mode 100644
index 0000000000..a2e4fb40b1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/charsequence/noDeferredSyntaxAllowedAsLiteralTemplateTextTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%
+  pageContext.setAttribute("foo", "bar");
+%>
+From template text: #{foo}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/compat13/ElCompatTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/compat13/ElCompatTest.jsp
new file mode 100644
index 0000000000..a114dcc367
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/compat13/ElCompatTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+${testPassed}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalse/ElEvaluationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalse/ElEvaluationTest.jsp
new file mode 100644
index 0000000000..a114dcc367
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalse/ElEvaluationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+${testPassed}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalsex/ElEvaluationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalsex/ElEvaluationTest.jspx
new file mode 100644
index 0000000000..20ae5c43ac
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconffalsex/ElEvaluationTest.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+
+    
+    ${testPassed}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftrue/ElEvaluationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftrue/ElEvaluationTest.jsp
new file mode 100644
index 0000000000..a114dcc367
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftrue/ElEvaluationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+${testPassed}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftruex/ElEvaluationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftruex/ElEvaluationTest.jspx
new file mode 100644
index 0000000000..3856536b3a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elconftruex/ElEvaluationTest.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+
+    
+    ${testPassed}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalse/ElEvaluationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalse/ElEvaluationTest.jsp
new file mode 100644
index 0000000000..e1dcffa71e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalse/ElEvaluationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" isELIgnored="false" %>
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+${testPassed}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalsex/ElEvaluationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalsex/ElEvaluationTest.jspx
new file mode 100644
index 0000000000..dab3fe3332
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagefalsex/ElEvaluationTest.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+    
+
+    
+    ${testPassed}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetrue/ElEvaluationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetrue/ElEvaluationTest.jsp
new file mode 100644
index 0000000000..eb6145325b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetrue/ElEvaluationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" isELIgnored="true" %>
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+${testPassed}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetruex/ElEvaluationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetruex/ElEvaluationTest.jspx
new file mode 100644
index 0000000000..55b10709c2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elpagetruex/ElEvaluationTest.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+    
+
+    
+    ${testPassed}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspec/ElEvaluationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspec/ElEvaluationTest.jsp
new file mode 100644
index 0000000000..a114dcc367
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspec/ElEvaluationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+${testPassed}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspecx/ElEvaluationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspecx/ElEvaluationTest.jspx
new file mode 100644
index 0000000000..3856536b3a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/elunspecx/ElEvaluationTest.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+
+    
+    ${testPassed}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23_web.xml
new file mode 100644
index 0000000000..87d6d5b42a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval23_web.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+    JspConfigurationElEval23
+    
+        5
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval_web.xml
new file mode 100644
index 0000000000..9c489a3d89
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/elevaluation/jsp_config_eleval_web.xml
@@ -0,0 +1,82 @@
+
+
+
+
+    JspConfigurationElEval
+    
+        5
+    
+    
+        
+        
+            Unspecified in configuration and by JSP
+            /elunspec/*
+        
+        
+            Set to false in configuration not specified in JSP
+            /elconffalse/*
+            false
+        
+        
+            Set to true in config not specified in JSP
+            /elconftrue/*
+            true
+        
+        
+            Set to false in page...overrides config
+            /elpagefalse/*
+            true
+        
+        
+            Set to true in page...overrides config
+            /elpagetrue/*
+            false
+        
+        
+        
+            Unspecified in configuration and by JSP
+            /elunspecx/*
+            true
+        
+        
+            Set to false in configuration not specified in JSP
+            /elconffalsex/*
+            false
+            true
+        
+        
+            Set to true in config not specified in JSP
+            /elconftruex/*
+            true
+            true
+        
+        
+            Set to false in page...overrides config
+            /elpagefalsex/*
+            true
+            true
+        
+        
+            Set to true in page...overrides config
+            /elpagetruex/*
+            false
+            true
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jsp
new file mode 100644
index 0000000000..37fce2d28b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" pageEncoding="ISO-8859-1" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jspx
new file mode 100644
index 0000000000..c5289b445e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/DifferentEncodingSpecifiedTest.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+    
+    
+      A different encoding (UTF-8) is specified in web.xml.
+    
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/NoEncodingSpecifiedTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/NoEncodingSpecifiedTest.jsp
new file mode 100644
index 0000000000..9a2585761c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/NoEncodingSpecifiedTest.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/SameEncodingSpecifiedTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/SameEncodingSpecifiedTest.jsp
new file mode 100644
index 0000000000..bba7ce851a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/SameEncodingSpecifiedTest.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" pageEncoding="UTF-8" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/jsp_config_encode_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/jsp_config_encode_web.xml
new file mode 100644
index 0000000000..bade980de6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/encoding/jsp_config_encode_web.xml
@@ -0,0 +1,36 @@
+
+
+
+
+    JspConfigurationEncoding
+    
+        5
+    
+    
+        
+            *.jsp
+            UTF-8
+        
+        
+            /DifferentEncodingSpecifiedTest.jspx
+            UTF-8
+            true
+        
+    
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/build.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda1.jsp
similarity index 77%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/build.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda1.jsp
index eaf394125c..03860fc50e 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/build.xml
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda1.jsp
@@ -1,5 +1,4 @@
-
-
+--%>
 
-
-  
-
+In coda1
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/build.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda2.jsp
similarity index 77%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/build.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda2.jsp
index 42abafbedd..111edcccf3 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/build.xml
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda2.jsp
@@ -1,5 +1,4 @@
-
-
+--%>
 
-
-  
-
+In coda2
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/build.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda3.jsp
similarity index 76%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/build.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda3.jsp
index bd270ca39e..4dcd64c492 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_servlet/jsp/el/build.xml
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/coda3.jsp
@@ -1,5 +1,4 @@
-
-
+--%>
 
-
-  
-
+In coda3
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/identical/willSee.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/identical/willSee.jsp
new file mode 100644
index 0000000000..915a2f3eef
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/identical/willSee.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+Test PASSED.  This page is served since jsp-property-group has
+precedence over servlet-mapping
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/jsp_config_general_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/jsp_config_general_web.xml
new file mode 100644
index 0000000000..a7de23f556
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/jsp_config_general_web.xml
@@ -0,0 +1,75 @@
+
+
+
+
+    JspConfigurationGeneral
+    
+        aservlet
+        com.sun.ts.tests.jsp.spec.configuration.general.AServlet
+    
+    
+        aservlet
+        /specific/svr/*
+    
+    
+        aservlet
+        /identical/willSee.jsp
+    
+    
+        aservlet
+        /mostSpecific/*
+    
+    
+        5
+    
+    
+        
+            /specific/*
+            /coda1.jsp
+        
+        
+            /specific/svr/page/*
+            /coda1.jsp
+        
+        
+            /identical/willSee.jsp
+            /coda1.jsp
+        
+        
+            
+            /mostSpecific/*
+            true
+            /prelude1.jsp
+            /coda1.jsp
+        
+        
+            
+            /mostSpecific/page/*
+            /prelude2.jsp
+            /coda2.jsp
+        
+        
+            
+            /mostSpecific/page/willSee.jsp
+            false
+            /prelude3.jsp
+            /coda3.jsp
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/mostSpecific/page/willSee.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/mostSpecific/page/willSee.jsp
new file mode 100644
index 0000000000..1e284a3d74
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/mostSpecific/page/willSee.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%
+    pageContext.setAttribute("elMessage", "el is enabled", 
+            PageContext.PAGE_SCOPE);
+%>
+${elMessage}
+Test PASSED.  This page is served since at least one jsp-property-group
+contains the most specific mapping.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude1.jsp
new file mode 100644
index 0000000000..8221c1d4e9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude1.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+In prelude1
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude2.jsp
new file mode 100644
index 0000000000..6a6923c399
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude2.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+In prelude2
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude3.jsp
new file mode 100644
index 0000000000..2b603e0434
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/prelude3.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+In prelude3
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/page/willSee.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/page/willSee.jsp
new file mode 100644
index 0000000000..2dcfe3566a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/page/willSee.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+Test PASSED.  This page is served since jsp-property-group has
+more specific url-pattern.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/willNotSee.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/willNotSee.jsp
new file mode 100644
index 0000000000..52e91c9a0d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/general/specific/svr/willNotSee.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+Test FAILED.  This page should not be served since mapped servlet has
+more specific url-pattern.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/IncludesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/IncludesTest.jsp
new file mode 100644
index 0000000000..7b239dc41d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/IncludesTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+JSP Body
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda1.jspf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda1.jspf
new file mode 100644
index 0000000000..ac7de4b806
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda1.jspf
@@ -0,0 +1,18 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+Coda1
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda2.jspf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda2.jspf
new file mode 100644
index 0000000000..ca2a181dd3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda2.jspf
@@ -0,0 +1,18 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+Coda2
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda3.jspf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda3.jspf
new file mode 100644
index 0000000000..872c090272
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/coda3.jspf
@@ -0,0 +1,18 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+Coda3
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude1.jspf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude1.jspf
new file mode 100644
index 0000000000..d66eda8c08
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude1.jspf
@@ -0,0 +1,18 @@
+
+Prelude1
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude2.jspf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude2.jspf
new file mode 100644
index 0000000000..4e10801ad7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude2.jspf
@@ -0,0 +1,18 @@
+
+Prelude2
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude3.jspf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude3.jspf
new file mode 100644
index 0000000000..8290cf14ad
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/WEB-INF/jspf/prelude3.jspf
@@ -0,0 +1,18 @@
+
+Prelude3
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/jsp_config_includes_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/jsp_config_includes_web.xml
new file mode 100644
index 0000000000..8356b2fabd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/jsp_config_includes_web.xml
@@ -0,0 +1,45 @@
+
+
+
+
+    JspConfigurationIncludes
+    
+        5
+    
+    
+        
+            *.jsp
+            /WEB-INF/jspf/prelude1.jspf
+            /WEB-INF/jspf/coda1.jspf
+        
+        
+            /two/*
+            /WEB-INF/jspf/prelude2.jspf
+            /WEB-INF/jspf/coda2.jspf
+        
+        
+            /three/*
+            true
+            /WEB-INF/jspf/prelude2.jspf
+            /WEB-INF/jspf/prelude3.jspf
+            /WEB-INF/jspf/coda2.jspf
+            /WEB-INF/jspf/coda3.jspf
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/three/Includes3Test.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/three/Includes3Test.jspx
new file mode 100644
index 0000000000..ad11dba0ec
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/three/Includes3Test.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+  
+  
+    JSP Body 3
+  
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/two/Includes2Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/two/Includes2Test.jsp
new file mode 100644
index 0000000000..137a795fb8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/includes/two/Includes2Test.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+JSP Body 2
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/WEB-INF/tag.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/WEB-INF/tag.tld
new file mode 100644
index 0000000000..2ee0add5c3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/WEB-INF/tag.tld
@@ -0,0 +1,36 @@
+
+
+
+
+    1.0
+    tag
+    
+        echo
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        JSP 
+        
+            echo
+            true
+            true
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/jsp_config_scr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/jsp_config_scr_web.xml
new file mode 100644
index 0000000000..6884758cdd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/jsp_config_scr_web.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    JspConfigurationScripting
+    
+        5
+    
+    
+        
+            http://java.sun.com/tck/jsp/scr
+            /WEB-INF/tag.tld
+        
+        
+        
+            Unspecified in property-group
+            /scrunspec/*
+        
+        
+            Property group sets scripting-invalid to false
+            /scrfalse/*
+            false
+        
+        
+            Property group sets scripting-invalid to true
+            /scrtrue/*
+            true
+        
+        
+        
+            Unspecified in property-group
+            /scrunspecx/*
+            true
+        
+        
+            Property group sets scripting-invalid to false
+            /scrfalsex/*
+            false
+            true
+        
+        
+            Property group sets scripting-invalid to true
+            /scrtruex/*
+            true
+            true
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/DeclarationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/DeclarationTest.jsp
new file mode 100644
index 0000000000..69ff4eacb2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/DeclarationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%! int i = 0; %>
+Test PASSED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ExpressionTest.jsp
new file mode 100644
index 0000000000..e537060724
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ExpressionTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%= "Test PASSED" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ScriptletTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ScriptletTest.jsp
new file mode 100644
index 0000000000..4bbe33117b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalse/ScriptletTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% out.println("Test PASSED"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/DeclarationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/DeclarationTest.jspx
new file mode 100644
index 0000000000..1aa32c08eb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/DeclarationTest.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ExpressionTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ExpressionTest.jspx
new file mode 100644
index 0000000000..bfedd56b31
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ExpressionTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ScriptletTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ScriptletTest.jspx
new file mode 100644
index 0000000000..1139b8200c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrfalsex/ScriptletTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/AttributeExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/AttributeExpressionTest.jsp
new file mode 100644
index 0000000000..cb8e17a2af
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/AttributeExpressionTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/scr" prefix="scr" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/DeclarationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/DeclarationTest.jsp
new file mode 100644
index 0000000000..69ff4eacb2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/DeclarationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%! int i = 0; %>
+Test PASSED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ExpressionTest.jsp
new file mode 100644
index 0000000000..e537060724
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ExpressionTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%= "Test PASSED" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ScriptletTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ScriptletTest.jsp
new file mode 100644
index 0000000000..4bbe33117b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtrue/ScriptletTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% out.println("Test PASSED"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/AttributeExpressionTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/AttributeExpressionTest.jspx
new file mode 100644
index 0000000000..6601061311
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/AttributeExpressionTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/DeclarationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/DeclarationTest.jspx
new file mode 100644
index 0000000000..1aa32c08eb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/DeclarationTest.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ExpressionTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ExpressionTest.jspx
new file mode 100644
index 0000000000..bfedd56b31
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ExpressionTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ScriptletTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ScriptletTest.jspx
new file mode 100644
index 0000000000..1139b8200c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrtruex/ScriptletTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/DeclarationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/DeclarationTest.jsp
new file mode 100644
index 0000000000..69ff4eacb2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/DeclarationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%! int i = 0; %>
+Test PASSED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ExpressionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ExpressionTest.jsp
new file mode 100644
index 0000000000..e537060724
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ExpressionTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%= "Test PASSED" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ScriptletTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ScriptletTest.jsp
new file mode 100644
index 0000000000..4bbe33117b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspec/ScriptletTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% out.println("Test PASSED"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/DeclarationTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/DeclarationTest.jspx
new file mode 100644
index 0000000000..1aa32c08eb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/DeclarationTest.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ExpressionTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ExpressionTest.jspx
new file mode 100644
index 0000000000..bfedd56b31
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ExpressionTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ScriptletTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ScriptletTest.jspx
new file mode 100644
index 0000000000..1139b8200c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/scripting/scrunspecx/ScriptletTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/jsp_config_xml_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/jsp_config_xml_web.xml
new file mode 100644
index 0000000000..89979578c7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/jsp_config_xml_web.xml
@@ -0,0 +1,38 @@
+
+
+
+
+    JspConfigurationXml
+    
+        5
+    
+    
+        
+            /unspec/*
+        
+        
+            /xmlfalse/*
+            false
+        
+        
+            /xmltrue/*
+            true
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/unspec/NonXmlTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/unspec/NonXmlTest.jsp
new file mode 100644
index 0000000000..e6b161d1ec
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/unspec/NonXmlTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+Test PASSED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmlfalse/NonXmlTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmlfalse/NonXmlTest.jsp
new file mode 100644
index 0000000000..e6b161d1ec
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmlfalse/NonXmlTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+Test PASSED
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmltrue/XmlJspTest.xsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmltrue/XmlJspTest.xsp
new file mode 100644
index 0000000000..e28f329335
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/configuration/xml/xmltrue/XmlJspTest.xsp
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    Test PASSED]]>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDuplicatedAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDuplicatedAttributeTest.jsp
new file mode 100644
index 0000000000..8adb804f37
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDuplicatedAttributeTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+<%--
+    a translation-time error must occur of the the jsp:attribute
+    action is used to specify an attribute when that attribute already
+    exists as an xml attribute
+--%>
+
+
+    Test PASSED
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest1.jsp
new file mode 100644
index 0000000000..e3bcddb035
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest1.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        value
+    
+
+
+
+    
+        value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest2.jsp
new file mode 100644
index 0000000000..d4c385e55d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeDynamicTest2.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <%= "value" %>
+    
+
+
+
+    
+        <%= "value" %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeElementInteractionTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeElementInteractionTest.jspx
new file mode 100644
index 0000000000..55af3de74b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeElementInteractionTest.jspx
@@ -0,0 +1,29 @@
+
+
+
+
+    
+
+    
+        
+            passed
+        
+        Test PASSED
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeEmptyBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeEmptyBodyTest.jsp
new file mode 100644
index 0000000000..76adb87607
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeEmptyBodyTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest1.jsp
new file mode 100644
index 0000000000..dca59f7547
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest1.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <%= "fragment body" %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest2.jsp
new file mode 100644
index 0000000000..36db499f66
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest2.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <%! String t = "fragment body"; %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest3.jsp
new file mode 100644
index 0000000000..45838aa8bc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest3.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <% String t = "fragment body"; %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest4.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest4.jsp
new file mode 100644
index 0000000000..433ad42f60
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest4.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <%= "fragment body" %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest5.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest5.jsp
new file mode 100644
index 0000000000..b6b5d30dc9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest5.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <%! String t = "fragment body"; %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest6.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest6.jsp
new file mode 100644
index 0000000000..86960fb833
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentNonScrBodyTest6.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <% String t = "fragment body"; %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentTest.jsp
new file mode 100644
index 0000000000..28ace30363
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeFragmentTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        jspfragment body
+    
+
+
+
+    
+        jspfragment body
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNameReqAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNameReqAttributeTest.jsp
new file mode 100644
index 0000000000..4d11114055
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNameReqAttributeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        somevalue
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNoAttributeFoundTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNoAttributeFoundTest.jsp
new file mode 100644
index 0000000000..72092833d1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeNoAttributeFoundTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest1.jsp
new file mode 100644
index 0000000000..ec4103ccae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest1.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+<%-- Matching QName --%>
+
+    ok
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest2.jsp
new file mode 100644
index 0000000000..ed3f9dff8b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest2.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+<%-- Matching QName --%>
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest3.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest3.jspx
new file mode 100644
index 0000000000..39b20bbc02
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest3.jspx
@@ -0,0 +1,25 @@
+
+
+    
+
+    
+        passed
+        Test PASSED
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest4.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest4.jsp
new file mode 100644
index 0000000000..628ed202ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeQNameTest4.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    dynamic value
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeRtTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeRtTest.jsp
new file mode 100644
index 0000000000..e308fa8e99
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeRtTest.jsp
@@ -0,0 +1,182 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        <%= new Boolean(true) %>
+    
+    
+        <%= new Character('a') %>
+    
+    
+        <%= new Short((short) 1) %>
+    
+    
+        <%= new Integer(1) %>
+    
+    
+        <%= new Long(1l) %>
+    
+    
+        <%= new Float(1.0f) %>
+    
+    
+        <%= new Double(1.0d) %>
+    
+    
+        <%= "string" %>
+    
+
+
+
+    
+        <%= false %>
+    
+    
+        <%= 'b' %>
+    
+    
+        <%= (short) 2 %>
+    
+    
+        <%= 2 %>
+    
+    
+        <%= 2l %>
+    
+    
+        <%= 2.0f %>
+    
+    
+        <%= 2.0d %>
+    
+    
+        <%= "string" %>
+    
+
+
+
+    
+        false
+    
+    
+        b
+    
+    
+        3
+    
+    
+        3
+    
+    
+        3
+    
+    
+        3.0
+    
+    
+        3.0
+    
+    
+        <%= "string" %>
+    
+
+
+
+    
+        <%= new Boolean(true) %>
+    
+    
+        <%= new Character('a') %>
+    
+    
+        <%= new Short((short) 1) %>
+    
+    
+        <%= new Integer(1) %>
+    
+    
+        <%= new Long(1l) %>
+    
+    
+        <%= new Float(1.0f) %>
+    
+    
+        <%= new Double(1.0d) %>
+    
+    
+        <%= "string" %>
+    
+
+
+
+    
+        <%= false %>
+    
+    
+        <%= 'b' %>
+    
+    
+        <%= (short) 2 %>
+    
+    
+        <%= 2 %>
+    
+    
+        <%= 2l %>
+    
+    
+        <%= 2.0f %>
+    
+    
+        <%= 2.0d %>
+    
+    
+        <%= "string" %>
+    
+
+
+
+    
+        false
+    
+    
+        b
+    
+    
+        3
+    
+    
+        3
+    
+    
+        3
+    
+    
+        3.0
+    
+    
+        3.0
+    
+    
+        <%= "string" %>
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeTrimTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeTrimTest.jsp
new file mode 100644
index 0000000000..7f5ca67ff9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeTrimTest.jsp
@@ -0,0 +1,57 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+<%
+    pageContext.setAttribute("trimString", " not trimmed  ");
+%>
+
+
+     not trimmed 
+
+
+
+    
+         trimmed
+    
+
+
+
+    
+        trimmed
+    
+
+
+<%--
+    Trimming should not occur for runtime values no matter the value of
+    the trim attribute.
+--%>
+
+
+    ${trimString}
+
+
+
+    ${trimString}
+
+
+
+    ${trimString}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest1.jsp
new file mode 100644
index 0000000000..b9ab216496
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest1.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    The use of jsp:attribute outside of being nested
+    within a standard or custom action will result in
+    a translation-time error
+--%>
+
+
+    attribute body
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest2.jspx
new file mode 100644
index 0000000000..0503653b5b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest2.jspx
@@ -0,0 +1,29 @@
+
+
+
+
+
+    
+        
+            myAttrValue
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest3.jsp
new file mode 100644
index 0000000000..fe680879e6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/JspAttributeUsageContextTest3.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/attribute" prefix="attr" %>
+
+
+    
+        
+            dynamic
+        
+        
+            value
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/WEB-INF/attribute.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/WEB-INF/attribute.tld
new file mode 100644
index 0000000000..739725060f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/WEB-INF/attribute.tld
@@ -0,0 +1,156 @@
+
+
+
+
+    1.0
+    attribute
+    
+        classic
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute.ClassicAttributeTestTag
+        JSP 
+        
+            fragment
+            true
+        
+        true
+    
+    
+        simple
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute.SimpleAttributeTestTag
+        scriptless
+        
+            fragment
+            true
+        
+        true
+    
+    
+        dynamic
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute.DynamicTag
+        JSP 
+        true
+    
+    
+        attribute
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute.AttributeTag
+        JSP 
+        
+            expected
+            true
+        
+        
+            attribute
+            true
+            true
+        
+    
+    
+        ctype
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute.ClassicTypeTag
+        JSP 
+        
+            boolean
+            true
+            java.lang.Boolean
+        
+        
+            character
+            true
+            java.lang.Character
+        
+        
+            short
+            true
+            java.lang.Short
+        
+        
+            integer
+            true
+            java.lang.Integer
+        
+        
+            long
+            true
+            java.lang.Long
+        
+        
+            float
+            true
+            java.lang.Float
+        
+        
+            double
+            true
+            java.lang.Double
+        
+        
+            string
+            true
+            java.lang.String
+        
+    
+    
+        stype
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.attribute.SimpleTypeTag
+        scriptless
+        
+            boolean
+            true
+            java.lang.Boolean
+        
+        
+            character
+            true
+            java.lang.Character
+        
+        
+            short
+            true
+            java.lang.Short
+        
+        
+            integer
+            true
+            java.lang.Integer
+        
+        
+            long
+            true
+            java.lang.Long
+        
+        
+            float
+            true
+            java.lang.Float
+        
+        
+            double
+            true
+            java.lang.Double
+        
+        
+            string
+            true
+            java.lang.String
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/jsp_core_act_attribute_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/jsp_core_act_attribute_web.xml
new file mode 100644
index 0000000000..750fe30a46
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/attribute/jsp_core_act_attribute_web.xml
@@ -0,0 +1,31 @@
+
+
+
+
+    JspCorSynActAttribute
+    
+        5
+    
+    
+        
+            http://java.sun.com/tck/jsp/attribute
+            /WEB-INF/attribute.tld
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyEmptyBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyEmptyBodyTest.jsp
new file mode 100644
index 0000000000..6c4e9e111a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyEmptyBodyTest.jsp
@@ -0,0 +1,58 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/body" prefix="body" %>
+
+<%--
+    If one or more jsp:attribute elements appear in the body
+    of an action, and there is no jsp:body element appears, it
+    is the equivalent of having an empty body
+--%>
+
+
+    value1
+    value2
+
+
+
+    value1
+
+
+<%--
+     Any empty body can also be provided by jsp:body
+     by the production  and 
+--%>
+
+
+    
+
+
+
+    
+
+
+
+    
+
+
+
+    
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyTest.jsp
new file mode 100644
index 0000000000..6bb114df23
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyTest.jsp
@@ -0,0 +1,44 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/body" prefix="body" %>
+
+<%--
+     Impl note: standard actions that can accept bodies will be tested
+     in the test areas for those actions.  We'll only test custom and
+     standard actions here
+--%>
+
+
+    testpassed
+
+
+
+    testpassed
+
+
+
+    value1
+    testpassed
+
+
+
+    value1
+    testpassed
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest1.jsp
new file mode 100644
index 0000000000..d24c6369fa
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest1.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    jsp:body must appear as a child of an action that accepts
+    a body.
+--%>
+
+bodycontent
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest2.jsp
new file mode 100644
index 0000000000..c40fd360cd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest2.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/body" prefix="body" %>
+<%--
+    jsp:body cannot be used to provide bodies to actions that do
+    not accept bodies
+--%>
+
+
+    bodycontent
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest3.jsp
new file mode 100644
index 0000000000..f9a53b6186
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest3.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/body" prefix="body" %>
+<%--
+    jsp:body cannot be used to provide bodies to actions that do
+    not accept bodies
+--%>
+
+
+    bodycontent
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest4.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest4.jsp
new file mode 100644
index 0000000000..1234de619b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest4.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/body" prefix="body" %>
+
+<%--
+    jsp:body cannot be a child of jsp:body
+--%>
+
+
+    
+        bodycontent
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest5.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest5.jsp
new file mode 100644
index 0000000000..a3015d7f21
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/JspBodyUsageContextTest5.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/body" prefix="body" %>
+<%--
+    jsp:body cannot be a child of jsp:attribute
+--%>
+
+
+    
+        bodycontent
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/WEB-INF/body.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/WEB-INF/body.tld
new file mode 100644
index 0000000000..30b5997d42
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/WEB-INF/body.tld
@@ -0,0 +1,60 @@
+
+
+
+
+    1.0
+    body
+    
+        classic
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.body.ClassicBodyTag
+        JSP 
+        true
+    
+    
+        simple
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.body.SimpleBodyTag
+        scriptless
+        true
+    
+    
+        clnobody
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.body.ClassicNoBodyTag
+        empty
+    
+    
+        smnobody
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.body.SimpleNoBodyTag
+        empty
+    
+    
+        cemptybody
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.body.ClassicEmptyBodyTag
+        JSP 
+        true
+    
+    
+        semptybody
+        com.sun.ts.tests.jsp.spec.core_syntax.actions.body.SimpleEmptyBodyTag
+        scriptless
+        true
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/jsp_core_act_body_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/jsp_core_act_body_web.xml
new file mode 100644
index 0000000000..5934a211be
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/body/jsp_core_act_body_web.xml
@@ -0,0 +1,31 @@
+
+
+
+
+    JspCorSynActBody
+    
+        5
+    
+    
+        
+            http://java.sun.com/tck/jsp/body
+            /WEB-INF/body.tld
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest1.jsp
new file mode 100644
index 0000000000..9052b17122
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest1.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" import="java.io.IOException" %>
+
+    public void displayTestStatus(JspWriter out) throws IOException {
+        out.print("Test PASSED");
+    }
+
+<%
+    displayTestStatus(out);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest2.jspx
new file mode 100644
index 0000000000..e6d25eb1de
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest2.jspx
@@ -0,0 +1,28 @@
+
+
+
+
+    
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest3.jsp
new file mode 100644
index 0000000000..ca1099e7ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest3.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest4.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest4.jspx
new file mode 100644
index 0000000000..8692a3db9c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/JspDeclarationUsageContextTest4.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag1.tag
new file mode 100644
index 0000000000..0c81224f48
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag1.tag
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="java.io.IOException" %>
+
+    public void displayTestStatus(JspWriter out) throws IOException {
+        out.print("Test PASSED");
+    }
+
+<%
+    displayTestStatus(out);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag2.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag2.tagx
new file mode 100644
index 0000000000..e2b530050a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/WEB-INF/tags/JspDeclarationTag2.tagx
@@ -0,0 +1,28 @@
+
+
+
+
+    
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/jsp_core_act_decl_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/jsp_core_act_decl_web.xml
new file mode 100644
index 0000000000..0a7dc5fb9a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/declaration/jsp_core_act_decl_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+    JspCorSynActDecl
+    
+        5
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidApplicationScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidApplicationScopeTest.jsp
new file mode 100644
index 0000000000..81211603df
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidApplicationScopeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidPageScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidPageScopeTest.jsp
new file mode 100644
index 0000000000..adb7702731
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidPageScopeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidRequestScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidRequestScopeTest.jsp
new file mode 100644
index 0000000000..a85d299ed4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidRequestScopeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidScopeTest.jsp
new file mode 100644
index 0000000000..9cecefa132
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidScopeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidSessionScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidSessionScopeTest.jsp
new file mode 100644
index 0000000000..22da94e4e0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyInvalidSessionScopeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyJspAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyJspAttributeTest.jsp
new file mode 100644
index 0000000000..26b8d635f6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyJspAttributeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Body Content
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNoVarVarReaderScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNoVarVarReaderScopeTest.jsp
new file mode 100644
index 0000000000..8c2d50058d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNoVarVarReaderScopeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest1.jsp
new file mode 100644
index 0000000000..9c9be4352e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest1.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest2.jsp
new file mode 100644
index 0000000000..29bef9cee6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyNonEmptyBodyTest2.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyScopeTest.jsp
new file mode 100644
index 0000000000..3f5694487e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyScopeTest.jsp
@@ -0,0 +1,66 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.Reader"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Body Content
+
+
+<%
+    final int[] scopes = {
+        PageContext.REQUEST_SCOPE,
+        PageContext.SESSION_SCOPE,
+        PageContext.APPLICATION_SCOPE
+    };
+
+    final String[] attrNames = {
+        "requestVar", "sessionVar", "applicationVar"
+    };
+
+    for (int i = 0; i < scopes.length; i++) {
+        Object o = pageContext.getAttribute(attrNames[i], scopes[i]);
+        if (o != null) {
+            if (o instanceof Reader) {
+                Reader r = (Reader) o;
+                StringBuffer sb = new StringBuffer();
+                for (int read = r.read(); read != -1; read = r.read()) {
+                    sb.append((char) read);
+                }
+                o = sb.toString();
+            }
+
+            if (((String) o).trim().equals("Body Content")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Attribute found in the " +
+                    JspTestUtil.getScopeName(scopes[i]) + ", but the value" +
+                    " of the attribute was not 'Body Content'.  Received" +
+                    ": " + o);
+            }
+        } else {
+            out.println("Test FAILED.  Unable to find attribute '" +
+                attrNames[i] + "' in the " + JspTestUtil.getScopeName(scopes[i]) +
+                " scope.");
+        }
+    }
+
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest1.jsp
new file mode 100644
index 0000000000..e747bda63f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest1.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest2.jspx
new file mode 100644
index 0000000000..4444e1c699
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest2.jspx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest3.jsp
new file mode 100644
index 0000000000..e9bf105010
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyUsageContextTest3.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+
+
+    ${testPassed}
+
+
+
+   ${testPassed}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarReaderTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarReaderTest.jsp
new file mode 100644
index 0000000000..4dc4b39f8b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarReaderTest.jsp
@@ -0,0 +1,63 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" import="java.io.Reader" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Body Content
+
+
+<%
+    Object export = pageContext.getAttribute("reqVar", PageContext.REQUEST_SCOPE);
+    if (export != null) {
+        if (export instanceof Reader) {
+            StringBuffer sb = new StringBuffer();
+            Reader reader = (Reader) export;
+            for (int read = reader.read(); read != -1; read = reader.read()) {
+                sb.append((char) read);
+            }
+            String result = sb.toString().trim();
+            if (result.equals("Body Content")) {
+                reader.reset();
+                sb = new StringBuffer();
+                for (int read = reader.read(); read != -1; read = reader.read()) {
+                    sb.append((char) read);
+                }
+                result = sb.toString().trim();
+                if (result.equals("Body Content")) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  It seems the exported reader is" +
+                        " not resettable.  Expected content of reader to be" +
+                        " 'Body Content' after the reset.  Received: " +
+                        result);
+                }
+            } else {
+                out.println("Test FAILED.  Expected result of body evaluation to" +
+                    " be 'Body Content'.  Received: " + result);
+            }
+        } else {
+            out.println("Test FAILED.  The type of the exported variable was" +
+                " not java.lang.String.  Received: " + export.getClass().getName());
+        }
+    } else {
+        out.println("Test FAILED.  Variable 'reqVar' was not exported to the" +
+            " request scope by the jsp:doBody action.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarTest.jsp
new file mode 100644
index 0000000000..8e61db9794
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarTest.jsp
@@ -0,0 +1,44 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Body Content
+
+
+<%
+    Object export = pageContext.getAttribute("reqVar", PageContext.REQUEST_SCOPE);
+    if (export != null) {
+        if (export instanceof java.lang.String) {
+            if (((String) export).trim().equals("Body Content")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Expected result of body evaluation to" +
+                    " be 'Body Content'.  Received: " + ((String) export).trim());
+            }
+        } else {
+            out.println("Test FAILED.  The type of the exported variable was" +
+                " not java.lang.String.  Received: " + export.getClass().getName());
+        }
+    } else {
+        out.println("Test FAILED.  Variable 'reqVar' was not exported to the" +
+            " request scope by the jsp:doBody action.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarVarReaderTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarVarReaderTest.jsp
new file mode 100644
index 0000000000..9be0ef7b48
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/JspDoBodyVarVarReaderTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyAttributeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyAttributeTag.tag
new file mode 100644
index 0000000000..4838701f8f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyAttributeTag.tag
@@ -0,0 +1,71 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+    pageVar
+    page
+
+
+
+    pageVarReader
+    page
+
+
+<%
+    Object obj1 = jspContext.getAttribute("pageVar");
+    Object obj2 = jspContext.getAttribute("pageVarReader");
+
+    if (obj1 != null) {
+        if (obj1 instanceof String) {
+            if (((String) obj1).trim().equals("Body Content")) {
+                if (obj2 != null) {
+                    if (obj2 instanceof java.io.Reader) {
+                        StringBuffer sb = new StringBuffer();
+                        java.io.Reader reader = (java.io.Reader) obj2;
+                        for (int read = reader.read(); read != -1; read = reader.read()) {
+                            sb.append((char) read);
+                        }
+                        obj2 = sb.toString().trim();
+                        if (obj2.equals("Body Content")) {
+                            out.println("Test PASSED");
+                        } else {
+                            out.println("Test FAILED.  Expected content of reader" +
+                                " to be 'Body Content'.  Received: " + obj2);
+                        }
+                    } else {
+                        out.println("Test FAILED.  a java.io.Reader object was" +
+                            " not exported when varReader was specified.  Actual" +
+                            " class type: " + obj2.getClass().getName());
+                    }
+                } else {
+                    out.println("Test FAILED.  No object exported when varReader" +
+                        " was specified.");
+                }
+            } else {
+                out.println("Test FAILED.  Expected exported result to be " +
+                    "'Body Content'.  Received: " + ((String) obj1).trim());
+            }
+        } else {
+            out.println("Test FAILED.  Expected exported object for var to be" +
+                " of type java.lang.String.  Received: " + obj1.getClass().getName());
+        }
+    } else {
+        out.println("Test FAILED.  No object exported when 'var' attribute was" +
+            " specified.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidApplicationScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidApplicationScopeTag.tag
new file mode 100644
index 0000000000..e28716c3b6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidApplicationScopeTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidPageScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidPageScopeTag.tag
new file mode 100644
index 0000000000..f1fc63e549
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidPageScopeTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidRequestScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidRequestScopeTag.tag
new file mode 100644
index 0000000000..6218709a4e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidRequestScopeTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidScopeTag.tag
new file mode 100644
index 0000000000..87444aaa83
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidScopeTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidSessionScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidSessionScopeTag.tag
new file mode 100644
index 0000000000..930729322c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyInvalidSessionScopeTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNoVarVarReaderScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNoVarVarReaderScopeTag.tag
new file mode 100644
index 0000000000..e4908aa346
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNoVarVarReaderScopeTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag1.tag
new file mode 100644
index 0000000000..3e4fa9717f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag1.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+    body content
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag2.tag
new file mode 100644
index 0000000000..500d47df94
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyNonEmptyBodyTag2.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+    body content
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyScopeTag.tag
new file mode 100644
index 0000000000..5b8d984b6d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyScopeTag.tag
@@ -0,0 +1,53 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+
+
+
+
+<%
+    Object o = jspContext.getAttribute("defaultPage", PageContext.PAGE_SCOPE);
+    if (o != null) {
+        if (((String) o).trim().equals("Body Content")) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  The page scoped attribute, 'defaultPage' " +
+                "was found, but had an incorrect value.  Expected 'Body Content'" +
+                ", received: " + o);
+        }
+    } else {
+        out.println("Test FAILED.  Unable to find the page scoped attribute '" +
+            "defaultPage' in the tag file's page context.");
+    }
+
+    o = jspContext.getAttribute("pageVar", PageContext.PAGE_SCOPE);
+    if (o != null) {
+        if (((String) o).trim().equals("Body Content")) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  The page scoped attribute, 'pageVar' " +
+                "was found, but had an incorrect value.  Expected 'Body Content'" +
+                ", received: " + o);
+        }
+    } else {
+        out.println("Test FAILED.  Unable to find the page scoped attribute '" +
+            "pageVar' in the tag file's page context.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagA.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagA.tag
new file mode 100644
index 0000000000..d75121df49
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagA.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagB.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagB.tagx
new file mode 100644
index 0000000000..75d0f71de8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyUsageContextTagB.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarReaderTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarReaderTag.tag
new file mode 100644
index 0000000000..e9e752fdd6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarReaderTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarTag.tag
new file mode 100644
index 0000000000..7d7f3c08b4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarVarReaderTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarVarReaderTag.tag
new file mode 100644
index 0000000000..61d52fbc7d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/WEB-INF/tags/DoBodyVarVarReaderTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/jsp_core_act_dobody_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/jsp_core_act_dobody_web.xml
new file mode 100644
index 0000000000..7ab05127e5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/dobody/jsp_core_act_dobody_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActDoBody
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest1.jsp
new file mode 100644
index 0000000000..dce3af3a53
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest1.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+body1
+body2
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest2.jspx
new file mode 100644
index 0000000000..3e8b543edd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest2.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+
+    body1
+    body2
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest3.jsp
new file mode 100644
index 0000000000..d829766638
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementDynamicAttributeTest3.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest1.jsp
new file mode 100644
index 0000000000..5e6401694b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest1.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+    value1
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest2.jspx
new file mode 100644
index 0000000000..70189ce905
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest2.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+    
+
+    
+        value1
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest3.jsp
new file mode 100644
index 0000000000..658085b8de
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspAttributeTest3.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest1.jsp
new file mode 100644
index 0000000000..51862ad163
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest1.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+    body1
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest2.jspx
new file mode 100644
index 0000000000..2890aaea8b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest2.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+    
+
+    
+        body1
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest3.jsp
new file mode 100644
index 0000000000..0515a99826
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementJspBodyTest3.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest1.jsp
new file mode 100644
index 0000000000..dafd09c5f6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest1.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+    body
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest2.jspx
new file mode 100644
index 0000000000..2d48643520
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest2.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest3.jsp
new file mode 100644
index 0000000000..4f66055f79
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementNameReqAttributeTest3.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest1.jsp
new file mode 100644
index 0000000000..76026459a3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest1.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+body1
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest2.jspx
new file mode 100644
index 0000000000..78465db13f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest2.jspx
@@ -0,0 +1,29 @@
+
+
+
+
+    
+
+    body1
+    
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest3.jsp
new file mode 100644
index 0000000000..ed24f54b9c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/JspElementTest3.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementDynAttrTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementDynAttrTag.tag
new file mode 100644
index 0000000000..463a7c5437
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementDynAttrTag.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+body1
+body2
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspAttributeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspAttributeTag.tag
new file mode 100644
index 0000000000..5c877247e3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspAttributeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+    value1
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspBodyTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspBodyTag.tag
new file mode 100644
index 0000000000..d404e493a8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementJspBodyTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+    body1
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementTag.tag
new file mode 100644
index 0000000000..d6f77c00b6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/JspElementTag.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+body1
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/NameAttrTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/NameAttrTag.tag
new file mode 100644
index 0000000000..6f79799528
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/WEB-INF/tags/NameAttrTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+body1
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/jsp_core_act_element_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/jsp_core_act_element_web.xml
new file mode 100644
index 0000000000..e5e74c8561
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/element/jsp_core_act_element_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActElement
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest1.jsp
new file mode 100644
index 0000000000..7f673169db
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest1.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+"Test PASSED"
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest2.jspx
new file mode 100644
index 0000000000..afe2bd8105
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest2.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    "Test PASSED"
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest3.jsp
new file mode 100644
index 0000000000..041c5093a4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest3.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest4.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest4.jspx
new file mode 100644
index 0000000000..1b814e3cf9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/JspExpressionUsageContextTest4.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag1.tag
new file mode 100644
index 0000000000..ba9faa42a9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+"Test PASSED"
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag2.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag2.tagx
new file mode 100644
index 0000000000..1b7e4fb6f2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/WEB-INF/tags/JspExpressionTag2.tagx
@@ -0,0 +1,20 @@
+
+
+    "Test PASSED"
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/jsp_core_act_expr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/jsp_core_act_expr_web.xml
new file mode 100644
index 0000000000..9acdf42297
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/expression/jsp_core_act_expr_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+    JspCorSynActExpr
+    
+        5
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest.jsp
new file mode 100644
index 0000000000..41e1d310ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest1.jsp
new file mode 100644
index 0000000000..c70d7449bc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest1.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page errorPage="flushedBufferForwardTest_error.jsp" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest_error.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest_error.jsp
new file mode 100644
index 0000000000..fb071dd37e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/flushedBufferForwardTest_error.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page isErrorPage="true" %>
+<%@ page contentType="text/plain" %>
+
+
+<%
+  if(exception instanceof IllegalStateException) {
+      out.println("Got IllegalStateException");
+  } else {
+      out.println("IllegalStateException not received");
+  }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.html b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.html
new file mode 100644
index 0000000000..d96dd3ad63
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.html
@@ -0,0 +1,6 @@
+
+forwarded
+
+This is forwarded html file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.jsp
new file mode 100644
index 0000000000..2c16aa9629
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/forwardcommon.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+forwarded
+
+<% out.print("This is forwarded file"); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/jsp_coresyntx_act_forward_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/jsp_coresyntx_act_forward_web.xml
new file mode 100644
index 0000000000..cbb0f8385e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/jsp_coresyntx_act_forward_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActFwd
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.gf
new file mode 100644
index 0000000000..d0cdc1e849
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.gf
@@ -0,0 +1,6 @@
+
+forwarded
+
+This is forwarded file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.jsp
new file mode 100644
index 0000000000..072089ec7c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelative.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+ 
+<% 
+    /* 
+      Name: positiveForwardCtxRelative.jsp 
+      Description: Use a valid jsp:forward directive
+                   using a context-relative path.
+      Result: The should be the forwarded page. 
+       
+    */ 
+     
+%>     
+ 
+ 
+ 
+ 
+ 
+ 
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.gf
new file mode 100644
index 0000000000..d96dd3ad63
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.gf
@@ -0,0 +1,6 @@
+
+forwarded
+
+This is forwarded html file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.jsp
new file mode 100644
index 0000000000..5434fd0d8f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardCtxRelativeHtml.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveForwardAbshtml.jsp
+
+<% /** 	Name : positiveForwardCtxRelativeHtml.jsp
+	Description :We are testing for forwarding to a html page using
+         tag. We test if the forwarded static content
+        got  forwarded in the output. Here we use a context-relative path.
+**/ %>	 
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.gf
new file mode 100644
index 0000000000..d0cdc1e849
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.gf
@@ -0,0 +1,6 @@
+
+forwarded
+
+This is forwarded file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.jsp
new file mode 100644
index 0000000000..0deabaf0de
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelative.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+ 
+<% 
+    /* 
+      Name: positiveForwardPageRelative 
+      Description: Use a valid jsp:forward directive
+                   using a page relative path.
+      Result: The page should result due to forwarding 
+       
+    */ 
+     
+%>     
+ 
+ 
+ 
+ 
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.gf
new file mode 100644
index 0000000000..d96dd3ad63
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.gf
@@ -0,0 +1,6 @@
+
+forwarded
+
+This is forwarded html file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.jsp
new file mode 100644
index 0000000000..7c2cb0304a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveForwardPageRelativeHtml.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveForwardRelhtml.jsp
+
+<% /** 	Name : positiveForwardPageRelativeHtml.jsp
+	Description :We are testing for request time Static forwarding using
+         tag. We test the forwarded static content
+        got  forwarded in the output.  Here we use a page-relative path. 
+	Result :
+**/ %>	 
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.gf
new file mode 100644
index 0000000000..d0cdc1e849
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.gf
@@ -0,0 +1,6 @@
+
+forwarded
+
+This is forwarded file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.jsp
new file mode 100644
index 0000000000..352e0a0e06
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrCtxRelative.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveRequestAttrAbs
+
+<% /** 	Name : positiveRequestAttrCtxRelative
+	Description :     We are testing for request time dynamic inclusion 
+	using  tag. We test if we get the forwarded jsp got
+        parsed at request time and forwarded to the output using a 
+        context-relative path.
+**/ %>	 
+<% String test="/forwardcommon"; %>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.gf
new file mode 100644
index 0000000000..d0cdc1e849
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.gf
@@ -0,0 +1,6 @@
+
+forwarded
+
+This is forwarded file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.jsp
new file mode 100644
index 0000000000..d7a8897994
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/positiveRequestAttrPageRelative.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveRequestAttrRelative
+
+<% /**  Name : positiveRequestAttrPageRelative
+        Description : We check if request time attributes work by forwarding
+                      the request using a page-relative path.
+        Result : we should get the forwarded file without error
+ **/ %>
+<% String test="forwardcommon"; %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest.jsp
new file mode 100644
index 0000000000..45bda0a63d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page errorPage="unbufferedWriteForwardTest_error.jsp" %>
+<%@ page buffer="none" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest_error.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest_error.jsp
new file mode 100644
index 0000000000..6d33932d72
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/forward/unbufferedWriteForwardTest_error.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page isErrorPage="true" %>
+<%@ page contentType="text/plain" %>
+
+
+<%
+  if(exception instanceof IllegalStateException) {
+      out.println("Got IllegalStateException");
+  } else {
+      out.println("IllegalStateException not received");
+  }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/jsp_coresyntx_act_getproperty_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/jsp_coresyntx_act_getproperty_web.xml
new file mode 100644
index 0000000000..c78db1660f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/jsp_coresyntx_act_getproperty_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActGetPrpty
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/nullPropertyValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/nullPropertyValueTest.jsp
new file mode 100644
index 0000000000..b36b20e6fb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/nullPropertyValueTest.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page import="com.sun.ts.tests.jsp.spec.core_syntax.actions.getproperty.*" %>
+
+<%
+    StringBean sb = new StringBean();
+    sb.setName(null); 
+    pageContext.setAttribute("sbb", sb, PageContext.PAGE_SCOPE);
+%>
+  
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.gf
new file mode 100644
index 0000000000..f0dd26cd01
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.gf
@@ -0,0 +1,9 @@
+
+positiveGetProps
+
+
+
+
+hello
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.jsp
new file mode 100644
index 0000000000..03e63dfeee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/getproperty/positiveGetProps.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveGetProps
+
+<% /** 	Name : positiveGetProps
+	Description : Create a valid useBean tag in the JSP. Access one of its
+                      properties through a getProperty tag.
+	Result : Should return the value of the property as part of the returned 
+	HTML 
+**/  %>
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/C.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/C.jsp
new file mode 100644
index 0000000000..1c13d3e5fb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/C.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In /C.jsp
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicDynamic_A.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicDynamic_A.jsp
new file mode 100644
index 0000000000..0c15f875e2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicDynamic_A.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In dynamicDynamic_A.jsp
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicStatic_A.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicStatic_A.jsp
new file mode 100644
index 0000000000..3f7a3ae20d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/dynamicStatic_A.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In dynamicStatic_A.jsp
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/forwardtarget.html b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/forwardtarget.html
new file mode 100644
index 0000000000..b75a88d015
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/forwardtarget.html
@@ -0,0 +1,6 @@
+
+forward target
+
+This is forwarded html file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/C.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/C.jsp
new file mode 100644
index 0000000000..a854656365
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/C.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In /include/C.jsp
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/dynamic_B.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/dynamic_B.jsp
new file mode 100644
index 0000000000..bcc4ce98de
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/dynamic_B.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In /include/dynamic_B.jsp
+
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/include2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/include2.jsp
new file mode 100644
index 0000000000..af7651d3d2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/include2.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+included2
+
+<% out.print("Test PASSED. This is /include/include2.jsp"); %>
+
+
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/build.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.html
similarity index 80%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/build.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.html
index 7b94fd8eab..f07e2c4672 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/build.xml
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.html
@@ -1,4 +1,4 @@
-
+
 
 
-
-  
-
+includeMappedServlet
+
+This file shoule not be served.  The mapped servlet should be included.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.jsp
new file mode 100644
index 0000000000..68ec69fe99
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/includeMappedServlet.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%--
+This jsp is to be included by ../includeMappedServletTest.jsp
+--%>
+Test PASSED. The mapped jsp file is included.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/static_B.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/static_B.jsp
new file mode 100644
index 0000000000..27e79e17c4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/include/static_B.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In /include/static_B.jsp
+<%@ include file="C.jsp" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeMappedServletTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeMappedServletTest.jsp
new file mode 100644
index 0000000000..a9a59b629a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeMappedServletTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%--
+the following include action should go to a mapped servlet
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.html b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.html
new file mode 100644
index 0000000000..37053f9ce8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.html
@@ -0,0 +1,6 @@
+
+included
+
+This is included html file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.jsp
new file mode 100644
index 0000000000..25f2cea7e9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includecommon.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+included
+
+<% out.print("This is included file"); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeforward.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeforward.jsp
new file mode 100644
index 0000000000..c766019432
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/includeforward.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/jsp_coresyntx_act_include_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/jsp_coresyntx_act_include_web.xml
new file mode 100644
index 0000000000..a4f3d8f0f2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/jsp_coresyntx_act_include_web.xml
@@ -0,0 +1,40 @@
+
+
+
+
+  JspCorSynActInc
+  
+    includeMappedServlet
+    /include/includeMappedServlet.jsp
+  
+  
+    includeMappedServlet
+    /include/includeMappedServlet.html
+  
+  
+    5
+  
+
+  
+    
+      /include/*
+      true
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.gf
new file mode 100644
index 0000000000..f99931e49c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.gf
@@ -0,0 +1,13 @@
+
+
+
+
+
+included
+
+This is included file
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.jsp
new file mode 100644
index 0000000000..3cce230300
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelative.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+<% 
+    /* 
+      Name: positiveIncludeCtxRelative
+      Description: Use a valid jsp:include 
+      Result: The page should be included. 
+       
+    */ 
+     
+%>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.gf
new file mode 100644
index 0000000000..812185c31b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.gf
@@ -0,0 +1,14 @@
+
+positiveIncludeCtxRelativeHtml
+
+
+
+
+included
+
+This is included html file
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.jsp
new file mode 100644
index 0000000000..d0127f972d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeCtxRelativeHtml.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveIncludeCtxRelativeHtml
+
+<% /** 	Name : positiveIncludeCtxRelativeHtml
+	Description :We are testing for static inclusion of html page using
+         tag. We test if we get the included static content
+        got  included in the output. Here we use absolute path from current 
+        context  as   url.
+**/ %>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.gf
new file mode 100644
index 0000000000..b75a88d015
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.gf
@@ -0,0 +1,6 @@
+
+forward target
+
+This is forwarded html file
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.jsp
new file mode 100644
index 0000000000..c1a2767182
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludeForward.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+Unexpected from test jsp
+
+Unexpected 2 from test jsp
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.gf
new file mode 100644
index 0000000000..f99931e49c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.gf
@@ -0,0 +1,13 @@
+
+
+
+
+
+included
+
+This is included file
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.jsp
new file mode 100644
index 0000000000..8c1b022487
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+<% 
+    /* 
+      Name: positiveIncludePageRelative 
+      Description: Use a valid jsp:include directive 
+      Result: The page should be included. 
+       
+    */ 
+     
+%>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.gf
new file mode 100644
index 0000000000..755cff18a9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.gf
@@ -0,0 +1,13 @@
+
+
+
+
+
+included2
+
+Test PASSED. This is /include/include2.jsp
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.jsp
new file mode 100644
index 0000000000..6a283f02ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelative2.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+<% 
+    /* 
+      Name: positiveIncludePageRelative2
+      Description: Use a valid jsp:include directive 
+      Result: The page include/include2.jsp should be included. 
+       
+    */ 
+     
+%>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.gf
new file mode 100644
index 0000000000..ffae7f7e06
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.gf
@@ -0,0 +1,14 @@
+
+positiveIncludePageRelativeHtml.jsp
+
+
+
+
+included
+
+This is included html file
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.jsp
new file mode 100644
index 0000000000..d982b61e9d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveIncludePageRelativeHtml.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveIncludePageRelativeHtml
+
+<% /** 	Name : positiveIncludePageRelativeHtml
+	Description :We are testing for request time Static inclusion using
+         tag. We test if we get the included static content
+        got  included in the output.here we use relative path from current 
+        context  as   url.
+	Result :
+**/ %>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.gf
new file mode 100644
index 0000000000..98455e439a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.gf
@@ -0,0 +1,15 @@
+
+positiveRequestAttrCtxRelative
+
+
+
+
+
+included
+
+This is included file
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.jsp
new file mode 100644
index 0000000000..4f8e8c887b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrCtxRelative.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveRequestAttrCtxRelative
+
+<% /** 	Name : positiveRequestAttrCtxRelative
+	Description :     We are testing for request time dynamic inclusion 
+	using  tag. We test if we get the included jsp got
+        parsed at request time and included to the output. we use absolute
+        path from contex-root root as url
+**/ %>
+<% String test="/includecommon"; %>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.gf
new file mode 100644
index 0000000000..8ef1225d79
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.gf
@@ -0,0 +1,14 @@
+
+positiveRequestAttrPageRelative
+
+
+
+
+included
+
+This is included file
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.jsp
new file mode 100644
index 0000000000..3054aa62af
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/positiveRequestAttrPageRelative.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveRequestAttrPageRelative
+
+<% /**  Name : positiveRequestAttrPageRelative
+        Description : we check if request time attributes work with include
+                      and we use them in double quoted expression
+        Result : we should get the included file without error
+ **/ %>
+<% String test="includecommon"; %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticDynamic_A.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticDynamic_A.jsp
new file mode 100644
index 0000000000..9a494c1561
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticDynamic_A.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In staticDynamic_A.jsp
+<%@ include file="include/dynamic_B.jsp" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticStatic_A.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticStatic_A.jsp
new file mode 100644
index 0000000000..69fe65328f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/include/staticStatic_A.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+In staticStatic_A.jsp
+<%@ include file="include/static_B.jsp" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeFragmentReqAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeFragmentReqAttributeTest.jsp
new file mode 100644
index 0000000000..dd38103198
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeFragmentReqAttributeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidApplicationScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidApplicationScopeTest.jsp
new file mode 100644
index 0000000000..18b7e26277
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidApplicationScopeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidPageScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidPageScopeTest.jsp
new file mode 100644
index 0000000000..a204d436c7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidPageScopeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidRequestScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidRequestScopeTest.jsp
new file mode 100644
index 0000000000..35f09644a1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidRequestScopeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidScopeTest.jsp
new file mode 100644
index 0000000000..af9040189b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidScopeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidSessionScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidSessionScopeTest.jsp
new file mode 100644
index 0000000000..236590eabd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeInvalidSessionScopeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeJspAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeJspAttributeTest.jsp
new file mode 100644
index 0000000000..4edb148fa5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeJspAttributeTest.jsp
@@ -0,0 +1,60 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.io.Reader"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
+
+<%
+    Object o = pageContext.getAttribute("requestVar", PageContext.REQUEST_SCOPE);
+    if (o != null) {
+        if (o.equals("attribute value")) {
+            o = pageContext.getAttribute("requestVarReader", PageContext.REQUEST_SCOPE);
+            if (o != null) {
+                Reader r = (Reader) o;
+                StringBuffer sb = new StringBuffer();
+                for (int read = r.read(); read != -1; read = r.read()) {
+                    sb.append((char) read);
+                }
+                if (sb.toString().equals("attribute value")) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  The exported requestVarReader contained " +
+                        "incorrrect data.  Expected 'attribute value', received " +
+                        o);
+                }
+            } else {
+                out.println("Test FAILED.  Unable to find the requestVarReader attribute");
+            }
+        } else {
+            out.println("Test FAILED.  Expected the exported variable requestVar was" +
+                " incorrect.  Expected the value to be 'attribute value', received: " +
+                o);
+        }
+    } else {
+        out.println("Test FAILED.  Unable to find the requestVar attribute");
+    }
+
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNoVarVarReaderScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNoVarVarReaderScopeTest.jsp
new file mode 100644
index 0000000000..6198dd6c44
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNoVarVarReaderScopeTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNonEmptyBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNonEmptyBodyTest.jsp
new file mode 100644
index 0000000000..ae449175a0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNonEmptyBodyTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNotInSessionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNotInSessionTest.jsp
new file mode 100644
index 0000000000..8404200aec
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeNotInSessionTest.jsp
@@ -0,0 +1,46 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" session="false" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<% try { %>
+
+
+    
+        attribute value
+    
+
+
+Test FAILED.  This page doesn't participate in a session.  The
+tag called by this page set an attribute in the SESSION scope,
+but no IllegalStateException was thrown.
+
+<% } catch (Throwable t) {
+       if (t instanceof IllegalStateException) {
+           out.println("Test PASSED");
+       } else {
+           out.println("Test FAILED.  An Exception was thrown when the calling" +
+               " page doesn't participate in a session and a tag called by the" +
+               " page attempts to set an attribute in the session scope.\n" +
+               "Expected an instance of IllegalStateException but received" +
+               " " + t.getClass().getName());
+       }
+   }
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeScopeTest.jsp
new file mode 100644
index 0000000000..fda1050d8b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeScopeTest.jsp
@@ -0,0 +1,68 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+                 java.io.Reader"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
+
+<%
+    final int[] scopes = {
+        PageContext.REQUEST_SCOPE,
+        PageContext.SESSION_SCOPE,
+        PageContext.APPLICATION_SCOPE
+    };
+
+    final String[] attrNames = {
+        "requestVar", "sessionVar", "applicationVar"
+    };
+
+    for (int i = 0; i < scopes.length; i++) {
+        Object o = pageContext.getAttribute(attrNames[i], scopes[i]);
+        if (o != null) {
+            if (o instanceof Reader) {
+                Reader r = (Reader) o;
+                StringBuffer sb = new StringBuffer();
+                for (int read = r.read(); read != -1; read = r.read()) {
+                    sb.append((char) read);
+                }
+                o = sb.toString();
+            }
+
+            if (o.equals("attribute value")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  Attribute found in the " +
+                    JspTestUtil.getScopeName(scopes[i]) + ", but the value" +
+                    " of the attribute was not 'attribute value'.  Received" +
+                    ": " + o);
+            }
+        } else {
+            out.println("Test FAILED.  Unable to find attribute '" +
+                attrNames[i] + "' in the " + JspTestUtil.getScopeName(scopes[i]) +
+                " scope.");
+        }
+    }
+
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest1.jsp
new file mode 100644
index 0000000000..1d22c8abef
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest1.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+     jsp:invoke not in a tag file is invalid and thus
+     a translation error must occur
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest2.jspx
new file mode 100644
index 0000000000..a71d1ddc73
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest2.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest3.jsp
new file mode 100644
index 0000000000..b22e4c3112
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeUsageContextTest3.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        Test PASSED
+    
+
+
+
+    
+        Test PASSED
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarReaderTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarReaderTest.jsp
new file mode 100644
index 0000000000..5bcffa8285
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarReaderTest.jsp
@@ -0,0 +1,65 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" import="java.io.Reader,java.io.IOException"%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
+
+<%
+    Object o = pageContext.getAttribute("pageVar", PageContext.REQUEST_SCOPE);
+    if (o != null) {
+        if (o instanceof java.io.Reader) {
+            Reader r = (Reader) o;
+            StringBuffer sb = new StringBuffer();
+            for (int i = r.read(); i != -1; i = r.read()) {
+                sb.append((char) i);
+            }
+            if (sb.toString().equals("attribute value")) {
+                r.reset();
+                sb = new StringBuffer();
+                for (int i = r.read(); i != -1; i = r.read()) {
+                    sb.append((char) i);
+                }
+                if (sb.toString().equals("attribute value")) {
+                    out.println("Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Expected the result from reading the" +
+                        " stream after resetting it to be 'attribute value'.  Received: " +
+                        sb.toString());
+                }
+            } else {
+                out.println("Test FAILED.  Expected the result from reading the " +
+                    " stream to be 'attribute value'.  Received: " +
+                    sb.toString());
+            }
+        } else {
+            out.println("Test FAILED.  The exported result of jsp:invoke" +
+                " using the 'var' attribute of the jsp:invoke action was not" +
+                " of type 'java.lang.String'.  Received: " + o.getClass().getName());
+        }
+    } else {
+        out.println("Test FAILED.  Unabled to find the page scoped variable, " +
+            "'pageVar', that should have been exported by the jsp:invoke action.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarTest.jsp
new file mode 100644
index 0000000000..7ea65acfc9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarTest.jsp
@@ -0,0 +1,49 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
+
+<%
+    Object o = pageContext.getAttribute("pageVar", PageContext.REQUEST_SCOPE);
+    if (o != null) {
+        if (o instanceof java.lang.String) {
+            if (o.equals("attribute value")) {
+                out.println("Test PASSED");
+            } else {
+                out.println("Test FAILED.  The exported result of jsp:invoke" +
+                    " was not the expected value of 'attribute value'.  " +
+                    "Received: " + o);
+            }
+        } else {
+            out.println("Test FAILED.  The exported result of jsp:invoke" +
+                " using the 'var' attribute of the jsp:invoke action was not" +
+                " of type 'java.lang.String'.  Received: " + o.getClass().getName());
+        }
+    } else {
+        out.println("Test FAILED.  Unabled to find the page scoped variable, " +
+            "'pageVar', that should have been exported by the jsp:invoke action.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarVarReaderTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarVarReaderTest.jsp
new file mode 100644
index 0000000000..ed639f9ddb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/JspInvokeVarVarReaderTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+    
+        attribute value
+    
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/FragmentReqAttributeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/FragmentReqAttributeTag.tag
new file mode 100644
index 0000000000..1d07923d45
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/FragmentReqAttributeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidApplicationScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidApplicationScopeTag.tag
new file mode 100644
index 0000000000..7f1a5f375b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidApplicationScopeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidPageScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidPageScopeTag.tag
new file mode 100644
index 0000000000..0d9dd4f7ea
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidPageScopeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidRequestScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidRequestScopeTag.tag
new file mode 100644
index 0000000000..93f8e361e8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidRequestScopeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidScopeTag.tag
new file mode 100644
index 0000000000..037f0ba8c3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidScopeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidSessionScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidSessionScopeTag.tag
new file mode 100644
index 0000000000..7d22a91d6f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/InvalidSessionScopeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspAttributeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspAttributeTag.tag
new file mode 100644
index 0000000000..229ccba5ad
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspAttributeTag.tag
@@ -0,0 +1,43 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
+    
+        attr1
+    
+    
+        requestVar
+    
+    
+        request
+    
+
+
+
+    
+        attr1
+    
+    
+        requestVarReader
+    
+    
+        request
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3a.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3a.tag
new file mode 100644
index 0000000000..678ae535ea
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3a.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3b.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3b.tagx
new file mode 100644
index 0000000000..cb9856cbf6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeUsageContextTag3b.tagx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarReaderTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarReaderTag.tag
new file mode 100644
index 0000000000..188a98d505
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarReaderTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarTag.tag
new file mode 100644
index 0000000000..d8bcece744
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/JspInvokeVarTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NoVarVarReaderScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NoVarVarReaderScopeTag.tag
new file mode 100644
index 0000000000..570e3d86fd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NoVarVarReaderScopeTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NonEmptyBodyTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NonEmptyBodyTag.tag
new file mode 100644
index 0000000000..483c999d8f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NonEmptyBodyTag.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
+    body
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NotInSessionTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NotInSessionTag.tag
new file mode 100644
index 0000000000..7d40b2ca7f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/NotInSessionTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/ScopeTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/ScopeTag.tag
new file mode 100644
index 0000000000..fe5de6a3b9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/ScopeTag.tag
@@ -0,0 +1,55 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
+
+
+
+
+
+<%
+    Object o = jspContext.getAttribute("defaultPage", PageContext.PAGE_SCOPE);
+    if (o != null) {
+        if (o.equals("attribute value")) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  The page scoped attribute, 'defaultPage' " +
+                "was found, but had an incorrect value.  Expected 'attribute value'" +
+                ", received: " + o);
+        }
+    } else {
+        out.println("Test FAILED.  Unable to find the page scoped attribute '" +
+            "defaultPage' in the tag file's page context.");
+    }
+
+    o = jspContext.getAttribute("pageVar", PageContext.PAGE_SCOPE);
+    if (o != null) {
+        if (o.equals("attribute value")) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  The page scoped attribute, 'pageVar' " +
+                "was found, but had an incorrect value.  Expected 'attribute value'" +
+                ", received: " + o);
+        }
+    } else {
+        out.println("Test FAILED.  Unable to find the page scoped attribute '" +
+            "pageVar' in the tag file's page context.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/VarVarReaderTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/VarVarReaderTag.tag
new file mode 100644
index 0000000000..15ec7b31e8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/VarVarReaderTag.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" fragment="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/jspFragmentNullTest.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/jspFragmentNullTest.tag
new file mode 100644
index 0000000000..3d00662ddf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/WEB-INF/tags/jspFragmentNullTest.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="frag" fragment="true" %>
+BEGINEND
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jspFragmentNullTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jspFragmentNullTest.jsp
new file mode 100644
index 0000000000..201000b7b8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jspFragmentNullTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jsp_core_act_invoke_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jsp_core_act_invoke_web.xml
new file mode 100644
index 0000000000..d200d00b6b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/invoke/jsp_core_act_invoke_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActInvoke
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest1.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest1.jspx
new file mode 100644
index 0000000000..e372cc3bab
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest1.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+    
+        Test FAILED
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest2.jsp
new file mode 100644
index 0000000000..da3ff72c6f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputBodyTest2.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputJspRootOmitDeclDefaultTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputJspRootOmitDeclDefaultTest.jspx
new file mode 100644
index 0000000000..35d7d58360
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputJspRootOmitDeclDefaultTest.jspx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+    
+    body
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTagTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTagTest.jsp
new file mode 100644
index 0000000000..31cc488bbc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTagTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTest.jspx
new file mode 100644
index 0000000000..0d7337f75a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclDefaultTest.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest1.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest1.jspx
new file mode 100644
index 0000000000..a8037e1d10
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest1.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest2.jspx
new file mode 100644
index 0000000000..d9137197e7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest2.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest3.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest3.jspx
new file mode 100644
index 0000000000..0155a8cda7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest3.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest4.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest4.jspx
new file mode 100644
index 0000000000..225fa6254a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest4.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest5.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest5.jsp
new file mode 100644
index 0000000000..d2a90f9c94
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest5.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest6.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest6.jsp
new file mode 100644
index 0000000000..10e1fb4ef0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest6.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest7.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest7.jsp
new file mode 100644
index 0000000000..c7d6a63e5e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest7.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest8.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest8.jsp
new file mode 100644
index 0000000000..bafd6b8f8e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputOmitDeclValidValuesTest8.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest1.jsp
new file mode 100644
index 0000000000..81e94b6843
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest1.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest2.jsp
new file mode 100644
index 0000000000..71fe002c43
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest2.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest3.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest3.jspx
new file mode 100644
index 0000000000..0155a8cda7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest3.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest4.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest4.jsp
new file mode 100644
index 0000000000..c6d1ca2264
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/JspOutputUsageContextTest4.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputBodyTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputBodyTag.tagx
new file mode 100644
index 0000000000..2b22eff275
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputBodyTag.tagx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+        Test FAILED
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputDefaultTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputDefaultTag.tagx
new file mode 100644
index 0000000000..4d39771f7e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputDefaultTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclFalseTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclFalseTag.tagx
new file mode 100644
index 0000000000..c28ada60ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclFalseTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclNoTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclNoTag.tagx
new file mode 100644
index 0000000000..676a6cc8f8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclNoTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclTrueTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclTrueTag.tagx
new file mode 100644
index 0000000000..b3f05a89e6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclTrueTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclYesTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclYesTag.tagx
new file mode 100644
index 0000000000..89a61332b9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputOmitDeclYesTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageTag.tag
new file mode 100644
index 0000000000..1706e9dd93
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageXMLTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageXMLTag.tagx
new file mode 100644
index 0000000000..c28ada60ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/WEB-INF/tags/JspOutputUsageXMLTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemPublicTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemPublicTest.jspx
new file mode 100644
index 0000000000..88bb3f607c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemPublicTest.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+  
+  
+    
Example XHTML Document

+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemTest.jspx
new file mode 100644
index 0000000000..d6629367ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/doctypeSystemTest.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+  
+  
+    
Example XHTML Document

+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/jsp_core_act_output_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/jsp_core_act_output_web.xml
new file mode 100644
index 0000000000..75c88ba599
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/jsp_core_act_output_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+    JspCorSynActOutput
+    
+        5
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypePublicNoSystemTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypePublicNoSystemTest.jspx
new file mode 100644
index 0000000000..ba155bfb11
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypePublicNoSystemTest.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+  
+  
+    
Example XHTML Document

+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeRootNoSystem.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeRootNoSystem.jspx
new file mode 100644
index 0000000000..556292d5b0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeRootNoSystem.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+  
+  
+    
Example XHTML Document

+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeSystemNoRoot.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeSystemNoRoot.jspx
new file mode 100644
index 0000000000..9fbcce11f4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeDoctypeSystemNoRoot.jspx
@@ -0,0 +1,26 @@
+
+
+
+
+  
+  
+    
Example XHTML Document

+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeMultipleDoctypeTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeMultipleDoctypeTest.jspx
new file mode 100644
index 0000000000..44f7e429e4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/negativeMultipleDoctypeTest.jspx
@@ -0,0 +1,30 @@
+
+
+
+
+  
+  
+  
+    
Example XHTML Document

+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/simpleDefaultTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/simpleDefaultTest.jspx
new file mode 100644
index 0000000000..0cd68d33e2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/output/simpleDefaultTest.jspx
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamAttributesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamAttributesTest.jsp
new file mode 100644
index 0000000000..b64f09135f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamAttributesTest.jsp
@@ -0,0 +1,44 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    Validate:
+         - The 'value' attributes acceptance of RT/EL expressions.
+         - The ablity to provide values for the 'name' and 'value'
+         - attributes via jsp:attribute actions
+--%>
+
+
+    
+    
+
+
+
+    
+        
+            param1
+        
+    
+    
+        
+            value2
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamForwardTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamForwardTest.jsp
new file mode 100644
index 0000000000..406f8cafc6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamForwardTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+     validate the interaction of jsp:forward with nested jsp:param elements.
+--%>
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamIncludeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamIncludeTest.jsp
new file mode 100644
index 0000000000..990eb3e44c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamIncludeTest.jsp
@@ -0,0 +1,55 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil"%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+     validate the interaction of jsp:include with nested jsp:param elements.
+--%>
+
+
+    
+    
+
+
+<%-- Validate that param1 value2 and param2 are no longer present in the request --%>
+<%
+    String[] param1Values = request.getParameterValues("param1");
+    String[] param2Values = request.getParameterValues("param2");
+
+    if (param1Values.length == 1) {
+      if (param2Values == null) {
+        if ("value1".equals(param1Values[0])) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected the value of param1 to be 'param2'" +
+                " after the include completed.  Actual: " + param1Values[0]);
+        }
+      } else {
+          out.println("Test FAILED.  The parameter, param2, should not exist in" +
+              "the request after the included completed.  However, values were found:" +
+              " " + JspTestUtil.getAsString(param2Values));
+      }
+    } else {
+        out.println("Test FAILED.  Expected param1 to only have 1 value.  The " +
+            "actual number is " + param1Values.length);
+    }
+
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameElValuesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameElValuesTest.jsp
new file mode 100644
index 0000000000..b499b3aef8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameElValuesTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+     EL expressions are not allowed with the name attribute.  A
+     translation-time error must occur.
+--%>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameRtValuesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameRtValuesTest.jsp
new file mode 100644
index 0000000000..03f992f445
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNameRtValuesTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+     RT expressions are not allowed with the name attribute.  A
+     translation-time error must occur.
+--%>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoNameAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoNameAttributeTest.jsp
new file mode 100644
index 0000000000..3bb5791494
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoNameAttributeTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- A jsp:param element with no name attribute == translation-time error --%>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoValueAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoValueAttributeTest.jsp
new file mode 100644
index 0000000000..d82c30a9c6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamNoValueAttributeTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- A jsp:param element with no value attribute == translation-time error --%>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest1.jsp
new file mode 100644
index 0000000000..2414956961
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest1.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- jsp:param not nested in any action == tranlation-time error --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest2.jsp
new file mode 100644
index 0000000000..e906bec55b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest2.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- jsp:param nested in a jsp:useBean action == translation-time error --%>
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest3.jsp
new file mode 100644
index 0000000000..c69a9b4ddd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest3.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- jsp:param nexted within a jsp:plugin element == translation-time error --%>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest4.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest4.jsp
new file mode 100644
index 0000000000..3e66fcc115
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/JspParamUsageContextTest4.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/param" prefix="simple"  %>
+
+<%-- jsp:param nested within a custom action == translation-time error --%>
+
+    
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/Resource.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/Resource.jsp
new file mode 100644
index 0000000000..ec5547a193
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/Resource.jsp
@@ -0,0 +1,60 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil"%>
+
+<%@ page contentType="text/plain" %>
+<%
+    String[] param1Values = request.getParameterValues("param1");
+    String[] param2Values = request.getParameterValues("param2");
+
+    if (param1Values != null) {
+        if (param2Values != null) {
+            if (param1Values.length == 2) {
+                if (param2Values.length == 1) {
+                    if ("value2".equals(param1Values[0])
+                        && "value1".equals(param1Values[1])) {
+                        if ("value2".equals(param2Values[0])) {
+                            out.println("Test PASSED");
+                        } else {
+                            out.println("Test FAILED.  Expected the value of param2 to be value2." +
+                                "  Value(s) received: " + JspTestUtil.getAsString(param2Values));
+                        }
+                    } else {
+                        out.println("Test FAILED.  Expected the first value of param1 to be 'value2'" +
+                            " and the second value to be 'value1'.  Values as received: " +
+                            JspTestUtil.getAsString(param1Values));
+                    }
+                } else {
+                    out.println("Test FAILED.  Expected one value for param2: value1." +
+                        "  Actual param values received: " +
+                        JspTestUtil.getAsString(param2Values));
+                }
+            } else {
+                out.println("Test FAILED.  Expected two values for param1: value2, value1." +
+                    "  Actual param values received: " +
+                    JspTestUtil.getAsString(param1Values));
+            }
+        } else {
+            out.println("Test FAILED.  Request parameter 'param2' not available.");
+        }
+    } else {
+        out.println("Test FAILED.  Request parameter 'param1' not available.");
+    }
+
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/WEB-INF/simple.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/WEB-INF/simple.tld
new file mode 100644
index 0000000000..95413afffd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/WEB-INF/simple.tld
@@ -0,0 +1,31 @@
+
+
+
+
+    1.0
+    simple
+    
+        echo
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/jsp_core_act_param_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/jsp_core_act_param_web.xml
new file mode 100644
index 0000000000..09f3241e08
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/param/jsp_core_act_param_web.xml
@@ -0,0 +1,31 @@
+
+
+
+
+  JspCorSynActParam
+  
+    5
+  
+    
+        
+            http://java.sun.com/tck/jsp/param
+            /WEB-INF/simple.tld
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackBodyTest.jsp
new file mode 100644
index 0000000000..41d44a2abe
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackBodyTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+    
+        fallback_text
+    
+
+expected_text
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackUsageContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackUsageContextTest.jsp
new file mode 100644
index 0000000000..e4848f3fca
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackUsageContextTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+This should be a translation error.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsBodyTest.jsp
new file mode 100644
index 0000000000..557b41f6ea
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsBodyTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+     Validate the body of jsp:params can be provided through the use
+     of jsp:body
+--%>
+
+    
+        
+            
+        
+    
+
+expected_text
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsUsageContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsUsageContextTest.jsp
new file mode 100644
index 0000000000..5de8942f92
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsUsageContextTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- A translation-time error will occur if the jsp:params is used in
+     any other context outside of being nested within a jsp:plugin element --%>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignElAttributeValueTest.jsp
new file mode 100644
index 0000000000..55d58dc600
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The align attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..078aea76b7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The align attribute cannot accept Rt expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAppletTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAppletTest.jsp
new file mode 100644
index 0000000000..38fa91e0ca
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAppletTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+            
+                
+            
+            fallback_text
+
+expected_text
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveElAttributeValueTest.jsp
new file mode 100644
index 0000000000..cd15f528d8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The archive attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..7e3a3b173c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The archive attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginBeanTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginBeanTest.jsp
new file mode 100644
index 0000000000..12521429a1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginBeanTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+            
+                
+            
+            fallback_text
+
+expected_text
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseElAttributeValueTest.jsp
new file mode 100644
index 0000000000..c51c613315
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The codebase attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseReqAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseReqAttributeTest.jsp
new file mode 100644
index 0000000000..7fb2b25de1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseReqAttributeTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- Validate a translation-time error occurs if the 'codebase' attribute is omitted --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..585e6d279f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The codebase attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeElAttributeValueTest.jsp
new file mode 100644
index 0000000000..d30308b6f6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeElAttributeValueTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The code attribute cannot accept EL expression values -> translation error --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeReqAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeReqAttributeTest.jsp
new file mode 100644
index 0000000000..736a032ecc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeReqAttributeTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- Validate a translation-time error occurs if the 'code' attribute is omitted --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..452f000379
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeRtAttributeValueTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The code attribute cannot accept RT expression values -> translation error --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightElAttributeValueTest.jsp
new file mode 100644
index 0000000000..3d01d90539
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- Validate the height attribute can accept EL expressions --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..6ebd027034
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- Validate the height attribute can accept RT expressions --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceElAttributeValueTest.jsp
new file mode 100644
index 0000000000..9ba7edac2a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The hspace attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..af0db4a3a3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The hspace attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlElAttributeValueTest.jsp
new file mode 100644
index 0000000000..2eff09899e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The iepluginurl attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..eb8f5b7f5f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The iepluginurl attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginInvalidTypeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginInvalidTypeTest.jsp
new file mode 100644
index 0000000000..44c0db1cdc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginInvalidTypeTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- Validate a translation-time error occurs if a value other than applet
+     or bean is provided to the type attribute. --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionElAttributeValueTest.jsp
new file mode 100644
index 0000000000..e6e590c567
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The jreversion attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..929e97f4eb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The jreversion attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspAttributeTest.jsp
new file mode 100644
index 0000000000..83e1d3fbc8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspAttributeTest.jsp
@@ -0,0 +1,46 @@
+<%--
+
+    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+    bean
+    foo.class
+    /
+    middle
+    test.jar
+    10
+    1
+    10
+    1
+    1.3.1
+    test
+    
+        http://www.nowaythiswebsitecouldpossiblyexist.com
+    
+    
+        http://www.nowaythis websitecouldpossibleexist.com
+    
+    
+        
+            
+        
+        fallback_text
+    
+
+expected_text
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspParamsNoParametersTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspParamsNoParametersTest.jsp
new file mode 100644
index 0000000000..8df3055901
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspParamsNoParametersTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- If the jsp:params element is nested within the jsp:plugin element,
+     there must be at least one jsp:param element or a translation-time
+     error will occur. --%>
+
+
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameElAttributeValueTest.jsp
new file mode 100644
index 0000000000..b9c2ce45be
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The name attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..c8f56b8328
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The name attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlElAttributeValueTest.jsp
new file mode 100644
index 0000000000..2a6e723be3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The nspluginurl attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..661304bb66
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The nspluginurl attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeElAttributeValueTest.jsp
new file mode 100644
index 0000000000..4e8595eac2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The type attribute cannot accept EL expression values --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..4b07b52ae3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeRtAttributeValueTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The type attribute cannot accept RT expression values --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceElAttributeValueTest.jsp
new file mode 100644
index 0000000000..22857516c8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The vspace attribute cannot accept EL expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..5b229ef7a1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- The vspace attribute cannot accept RT expressions -> translation-time error --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthElAttributeValueTest.jsp
new file mode 100644
index 0000000000..233655c0d7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthElAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- Validate the width attribute can accept EL expressions --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthRtAttributeValueTest.jsp
new file mode 100644
index 0000000000..31ec23c9ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthRtAttributeValueTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%-- Validate the width attribute can accept RT expressions --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml
new file mode 100644
index 0000000000..171b8d6486
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActPlugin
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest1.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest1.jspx
new file mode 100644
index 0000000000..d0a1b5cc3d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest1.jspx
@@ -0,0 +1,25 @@
+
+
+
+
+    
+        
+        Test PASSED
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest2.jsp
new file mode 100644
index 0000000000..13a3504f2b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootJspBodyTest2.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest1.jsp
new file mode 100644
index 0000000000..1ecbd4cf85
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest1.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+    <%@ page contentType="text/plain" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest2.jspx
new file mode 100644
index 0000000000..e2c7459833
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest2.jspx
@@ -0,0 +1,22 @@
+
+
+
+
+    Test PASSED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest3.jsp
new file mode 100644
index 0000000000..1de5f9ba78
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest3.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest4.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest4.jsp
new file mode 100644
index 0000000000..33c77c64a1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootUsageContextTest4.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest1.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest1.jspx
new file mode 100644
index 0000000000..cc3698da1d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest1.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    Test PASSED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest2.jspx
new file mode 100644
index 0000000000..56662d5bf6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrAllowableValuesTest2.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    Test PASSED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest1.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest1.jspx
new file mode 100644
index 0000000000..8b1b09072b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest1.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest2.jsp
new file mode 100644
index 0000000000..027321f345
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionAttrInvalidValueTest2.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest1.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest1.jspx
new file mode 100644
index 0000000000..22353a941b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest1.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest2.jsp
new file mode 100644
index 0000000000..e5dd9d71e6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/JspRootVersionReqAttrTest2.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootJspBodyTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootJspBodyTag.tagx
new file mode 100644
index 0000000000..e5c2bd11a7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootJspBodyTag.tagx
@@ -0,0 +1,24 @@
+
+
+
+
+    
+        Test PASSED
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag1.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag1.tagx
new file mode 100644
index 0000000000..5f72ee7e05
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag1.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    Test PASSED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag2.tag
new file mode 100644
index 0000000000..1ecbd4cf85
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootUsageContextTag2.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+    <%@ page contentType="text/plain" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionInvalidValueTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionInvalidValueTag.tagx
new file mode 100644
index 0000000000..5bec4c2eb6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionInvalidValueTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionReqAttrTag.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionReqAttrTag.tagx
new file mode 100644
index 0000000000..751cfcc650
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/WEB-INF/tags/JspRootVersionReqAttrTag.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    Test FAILED
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/jsp_core_act_root_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/jsp_core_act_root_web.xml
new file mode 100644
index 0000000000..6d4e0ca9d7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/root/jsp_core_act_root_web.xml
@@ -0,0 +1,26 @@
+
+
+
+
+  JspCorSynActRoot
+ 
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest1.jsp
new file mode 100644
index 0000000000..9df33416b9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest1.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+out.print("Test PASSED");
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest2.jspx
new file mode 100644
index 0000000000..80acb7c611
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest2.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+    out.print("Test PASSED");
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest3.jsp
new file mode 100644
index 0000000000..525e37b3ba
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest3.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest4.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest4.jspx
new file mode 100644
index 0000000000..b2cbcecd5e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/JspScriptletUsageContextTest4.jspx
@@ -0,0 +1,22 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag1.tag
new file mode 100644
index 0000000000..f47e4ba1e1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+out.print("Test PASSED");
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag2.tagx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag2.tagx
new file mode 100644
index 0000000000..790403ddee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/WEB-INF/tags/JspScriptletTag2.tagx
@@ -0,0 +1,22 @@
+
+
+
+
+    out.print("Test PASSED");
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/jsp_core_act_scr_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/jsp_core_act_scr_web.xml
new file mode 100644
index 0000000000..7502069a26
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/scriptlet/jsp_core_act_scr_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+    JspCorSynActScr
+    
+        5
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/Errorpage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/Errorpage.jsp
new file mode 100644
index 0000000000..add45cd04a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/Errorpage.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+Errorpage
+
+
Error occured !

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/jsp_coresyntx_act_setproperty_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/jsp_coresyntx_act_setproperty_web.xml
new file mode 100644
index 0000000000..6330610fbd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/jsp_coresyntx_act_setproperty_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActSetPrpty
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.gf
new file mode 100644
index 0000000000..eee41f3ca3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.gf
@@ -0,0 +1,20 @@
+
+positiveBeanPropertyEditor
+
+
+
+
+
+
+
+
+PString Validated
+
+
+true
+
+
+218314
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.jsp
new file mode 100644
index 0000000000..ef1620e933
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveBeanPropertyEditor.jsp
@@ -0,0 +1,43 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveBeanPropertyEditor
+
+<% /** 	Name : positiveBeanPropertyEditor
+	Description : Using a bean that has been configured with a 
+                  PropertyEditor, validate that the editors
+                  are in fact used.
+	Result : Output to the client (see comments below)
+**/ %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.gf
new file mode 100644
index 0000000000..66edd402dd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.gf
@@ -0,0 +1,11 @@
+
+positiveSetBooleanObj
+
+
+
+
+
+true
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.jsp
new file mode 100644
index 0000000000..a86f7ce136
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanObj.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetBooleanObj
+
+<% /** 	Name : positiveSetBooleanObj
+	Description : use a setProperty  to set a Boolean value in a bean
+	Result : should return a Boolean value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.gf
new file mode 100644
index 0000000000..bf8d8cf80d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.gf
@@ -0,0 +1,11 @@
+
+positiveSetBooleanPrim
+
+
+
+
+
+false
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.jsp
new file mode 100644
index 0000000000..3be6b5eb8d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBooleanPrim.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetBooleanPrim
+
+<% /** 	Name : positiveSetBooleanPrim
+	Description : use a setProperty  to set a boolean value in a bean
+	Result :should return a boolean value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.gf
new file mode 100644
index 0000000000..d6a1741860
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.gf
@@ -0,0 +1,11 @@
+
+positiveSetByteObj
+
+
+
+
+
+123
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.jsp
new file mode 100644
index 0000000000..57a88e6469
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetByteObj.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetByteObj
+
+<% /** 	Name : positiveSetByteObj
+	Description :use a setProperty to set a Byte value in a bean 
+	Result :should return a Byte value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.gf
new file mode 100644
index 0000000000..143497d201
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.gf
@@ -0,0 +1,11 @@
+
+positiveSetBytePrim
+
+
+
+
+
+123
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.jsp
new file mode 100644
index 0000000000..82337846a1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetBytePrim.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetBytePrim
+
+<% /** 	Name : positiveSetBytePrim
+	Description : use a setProperty to set a byte value in a bean
+	Result :should return a byte value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.gf
new file mode 100644
index 0000000000..0b721d2cfc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.gf
@@ -0,0 +1,11 @@
+
+positiveSetCharObj
+
+
+
+
+
+A
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.jsp
new file mode 100644
index 0000000000..7c5284e931
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharObj.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetCharObj
+
+<% /** 	Name : positiveSetCharObj
+	Description : use setProperty to set a Character value in a bean.
+	Result :should return a Character value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.gf
new file mode 100644
index 0000000000..21ff916b14
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.gf
@@ -0,0 +1,11 @@
+
+positiveSetCharPrim
+
+
+
+
+
+R
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.jsp
new file mode 100644
index 0000000000..ab36a0a993
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetCharPrim.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetCharPrim
+
+<% /** 	Name : positiveSetCharPrim
+	Description : use setProperty to set a char value in a bean.
+	Result :should return a char value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.gf
new file mode 100644
index 0000000000..8d13282976
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.gf
@@ -0,0 +1,11 @@
+
+positiveSetDoubleObj
+
+
+
+
+
+123456.0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.jsp
new file mode 100644
index 0000000000..44e571b95a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoubleObj.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetDoubleObj
+
+<% /** 	Name : positiveSetDoubleObj
+	Description : use a setProperty to set a Double value in a bean
+	Result :should return a Double value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.gf
new file mode 100644
index 0000000000..80ba573146
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.gf
@@ -0,0 +1,11 @@
+
+positiveSetDoublePrim
+
+
+
+
+
+123456.0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.jsp
new file mode 100644
index 0000000000..c837d6ea38
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetDoublePrim.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetDoublePrim
+
+<% /** 	Name : positiveSetDoublePrim
+	Description : use a setProperty to set a double value in a bean
+	Result :should return a double value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.gf
new file mode 100644
index 0000000000..c846952ec7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.gf
@@ -0,0 +1,11 @@
+
+positiveSetFloatObj
+
+
+
+
+
+15.0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.jsp
new file mode 100644
index 0000000000..92f0065582
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatObj.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetFloatObj
+
+<% /** 	Name : positiveSetFloatObj
+	Description : use a setProperty to set a Float value in a bean
+	Result :should return a Float value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.gf
new file mode 100644
index 0000000000..44f29217ef
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.gf
@@ -0,0 +1,11 @@
+
+positiveSetFloatPrim
+
+
+
+
+
+123.0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.jsp
new file mode 100644
index 0000000000..3541d92649
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetFloatPrim.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetFloatPrim
+
+<% /** 	Name : positiveSetFloatPrim
+	Description : use a setProperty to set a float value in a bean
+	Result :should return a float value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.gf
new file mode 100644
index 0000000000..b853aed200
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.gf
@@ -0,0 +1,48 @@
+
+positiveSetIndexedProp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1 2 3
+1 2 3
+1 2 3
+24 25 26
+1.1 1.2 1.3
+1 1 1
+1.1 1.2 1.3
+false true false
+-128 127
+1 2 3
+-32768 32767
+-2147483648 2147483647
+1.1 1.2 3.14
+-9223372036854775808 9223372036854775807
+1.1 2.81 3.14
+true false true
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.jsp
new file mode 100644
index 0000000000..18a50dc82d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIndexedProp.jsp
@@ -0,0 +1,226 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetIndexedProp
+
+<%
+/**
+ *  TestCase name : positiveSetIndexedProp
+ *  Description   : Here, the setProperty tag is used to set the value for
+ *                  an indexed property.An array is declared and defined in a
+ *                  scriptlet and then assigned through the setProperty tag, with 
+ *                  an expression.
+ *  Result        : Expected to set the value of the array.
+ */
+ %>
+
+<%
+//Declare primative arrays
+byte[] bArray = { 1, 2, 3 };
+char[] cArray = { '1', '2', '3' };
+short[] sArray = { 1, 2, 3 };
+int[] iArray = {24, 25, 26 }; 
+float[] fArray = { 1.1f, 1.2f, 1.3f };
+long[] lArray = { 1, 1, 1 };
+double[] dArray = { 1.1d, 1.2d, 1.3d };
+boolean[] boArray = { false, true, false };
+
+//Declare Object arrays
+Boolean[] booleanArray = { new Boolean( "true" ), new Boolean( "false" ), new Boolean( "true" ) };
+Byte[] byteArray = { new Byte( Byte.MIN_VALUE ), new Byte( Byte.MAX_VALUE ) };
+Character[] charArray = { new Character( '1' ), new Character( '2' ), new Character( '3' ) };
+Short[] shortArray = { new Short( Short.MIN_VALUE ), new Short( Short.MAX_VALUE ) };
+Integer[] integerArray = { new Integer( Integer.MIN_VALUE ), new Integer( Integer.MAX_VALUE ) };
+Float[] floatArray = { new Float( 1.1f ), new Float( 1.2F ), new Float( 3.14f ) };
+Long[] longArray = { new Long( Long.MIN_VALUE ), new Long( Long.MAX_VALUE ) };
+Double[] doubleArray = { new Double( 1.1d ), new Double( 2.81d ), new Double( 3.14d ) };
+
+%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<%
+// Accessing the set property.
+byte[] bary = myBean.getBArray();
+for(int j = 0; j < bary.length; j++ ) {
+    if ( j == bary.length - 1 ) {
+       out.println( bary[ j ] );
+    } else {
+       out.print( bary[ j ] + " " );
+    }
+}
+
+char[] cary = myBean.getCArray();
+for(int j = 0; j < cary.length; j++ ) {
+    if ( j == cary.length - 1 ) {
+       out.println( cary[ j ] );
+    } else {
+       out.print( cary[ j ] + " " );
+    }
+}
+
+short[] sary = myBean.getSArray();
+for(int j = 0; j < sary.length; j++ ) {
+    if ( j == sary.length - 1 ) {
+       out.println( sary[ j ] );
+    } else {
+       out.print( sary[ j ] + " " );
+    }
+}
+
+int[] iary = myBean.getIArray();
+for(int j = 0; j < iary.length; j++ ) {
+    if ( j == iary.length - 1 ) {
+       out.println( iary[ j ] );
+    } else {
+       out.print( iary[ j ] + " " );
+    }
+}
+
+float[] fary = myBean.getFArray();
+for(int j = 0; j < fary.length; j++ ) {
+    if ( j == fary.length - 1 ) {
+       out.println( fary[ j ] );
+    } else {
+       out.print( fary[ j ] + " " );
+    }
+}
+
+long[] lary = myBean.getLArray();
+for(int j = 0; j < lary.length; j++ ) {
+    if ( j == lary.length - 1 ) {
+       out.println( lary[ j ] );
+    } else {
+       out.print( lary[ j ] + " " );
+    }
+}
+
+double[] dary = myBean.getDArray();
+for(int j = 0; j < dary.length; j++ ) {
+    if ( j == dary.length - 1 ) {
+       out.println( dary[ j ] );
+    } else {
+       out.print( dary[ j ] + " " );
+    }
+}
+
+boolean[] boary = myBean.getBoArray();
+for(int j = 0; j < boary.length; j++ ) {
+    if ( j == boary.length - 1 ) {
+       out.println( boary[ j ] );
+    } else {
+       out.print( boary[ j ] + " " );
+    }
+}
+
+Byte[] byteary = myBean.getByteArray();
+for(int j = 0; j < byteary.length; j++ ) {
+    if ( j == byteary.length - 1 ) {
+       out.println( byteary[ j ] );
+    } else {
+       out.print( byteary[ j ] + " " );
+    }
+}
+
+Character[] charary = myBean.getCharArray();
+for(int j = 0; j < charary.length; j++ ) {
+    if ( j == charary.length - 1 ) {
+       out.println( charary[ j ] );
+    } else {
+       out.print( charary[ j ] + " " );
+    }
+}
+
+Short[] shortary = myBean.getShortArray();
+for(int j = 0; j < shortary.length; j++ ) {
+    if ( j == shortary.length - 1 ) {
+       out.println( shortary[ j ] );
+    } else {
+       out.print( shortary[ j ] + " " );
+    }
+}
+
+Integer[] intary = myBean.getIntegerArray();
+for(int j = 0; j < intary.length; j++ ) {
+    if ( j == intary.length - 1 ) {
+       out.println( intary[ j ] );
+    } else {
+       out.print( intary[ j ] + " " );
+    }
+}
+
+Float[] floatary = myBean.getFloatArray();
+for(int j = 0; j < floatary.length; j++ ) {
+    if ( j == floatary.length - 1 ) {
+       out.println( floatary[ j ] );
+    } else {
+       out.print( floatary[ j ] + " " );
+    }
+}
+
+Long[] longary = myBean.getLongArray();
+for(int j = 0; j < longary.length; j++ ) {
+    if ( j == longary.length - 1 ) {
+       out.println( longary[ j ] );
+    } else {
+       out.print( longary[ j ] + " " );
+    }
+}
+
+Double[] doary = myBean.getDoubleArray();
+for(int j = 0; j < doary.length; j++ ) {
+    if ( j == doary.length - 1 ) {
+       out.println( doary[ j ] );
+    } else {
+       out.print( doary[ j ] + " " );
+    }
+}
+
+Boolean[] bolary = myBean.getBooleanArray();
+for(int j = 0; j < bolary.length; j++ ) {
+    if ( j == bolary.length - 1 ) {
+       out.println( bolary[ j ] );
+    } else {
+       out.print( bolary[ j ] + " " );
+    }
+}
+
+%>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.gf
new file mode 100644
index 0000000000..d9d6ceb3af
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.gf
@@ -0,0 +1,11 @@
+
+positiveSetIntObj
+
+
+
+
+
+21
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.jsp
new file mode 100644
index 0000000000..47a29dee68
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntObj.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetIntObj
+
+<% /** 	Name : positiveSetIntObj
+	Description :use a setProperty to set a Integer value in a bean. 
+	Result :should return a Integer value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.gf
new file mode 100644
index 0000000000..1363276687
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.gf
@@ -0,0 +1,11 @@
+
+positiveSetIntPrim
+
+
+
+
+
+12
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.jsp
new file mode 100644
index 0000000000..b2e906271d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetIntPrim.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetIntPrim
+
+<% /** 	Name : positiveSetIntPrim
+	Description :use a setProperty to set a int value in a bean. 
+	Result :should return a int value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.gf
new file mode 100644
index 0000000000..5eab825f68
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.gf
@@ -0,0 +1,11 @@
+
+positiveSetLongObj
+
+
+
+
+
+12345
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.jsp
new file mode 100644
index 0000000000..a9fa861352
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongObj.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetLongObj
+
+<% /** 	Name : positiveSetLongObj
+	Description : use a setProperty to set a Long value in a bean
+	Result :should return a Long value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.gf
new file mode 100644
index 0000000000..91b31fe165
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.gf
@@ -0,0 +1,11 @@
+
+positiveSetLongPrim
+
+
+
+
+
+54321
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.jsp
new file mode 100644
index 0000000000..3653b63d05
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetLongPrim.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetLongPrim
+
+<% /** 	Name : positiveSetLongPrim
+	Description : use a setProperty to set a long value in a bean
+	Result :should return a long value.
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.gf
new file mode 100644
index 0000000000..c70282d357
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.gf
@@ -0,0 +1,14 @@
+
+positiveSetPropAll
+
+
+
+
+
+
+Validated

+Frodo

+116165

+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.jsp
new file mode 100644
index 0000000000..0b5978c4c0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropAll.jsp
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetPropAll
+
+<% /** 	Name : positiveSetPropAll
+	Description : Create a valid useBean action in JSP. Set all properties 
+		          of that bean from the request using a 
+		           action. Then access all 
+		          properties of the bean.
+	Result : The client request will set name=Frodo, num=116165, str=Validated, as
+             a result, these values should be displayed when accessed.
+**/ %>
+
+
+
+
+<% out.print(myBean.getStr()); %>

+<% out.print(myBean.getName()); %>

+<% out.print(myBean.getNum()); %>

+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.gf
new file mode 100644
index 0000000000..1fd8ee717d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.gf
@@ -0,0 +1,14 @@
+
+positiveSetPropNoParam
+
+
+
+
+
+
+
+
+SAPPOTA
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.jsp
new file mode 100644
index 0000000000..6e88f684b7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropNoParam.jsp
@@ -0,0 +1,41 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetPropNoParam
+
+<% /** 	Name : positiveSetPropNoParam
+	Description : Create a valid useBean action in JSP. Set a specific 
+	              property of that bean from the request using a 
+	               action. Then access 
+	              that property.Ensure that the request contains a parameter 
+	              with the same name as the Bean Name.
+	Result :As we are setting "param as Str=SAPPOTA"
+		It should return "SAPPOTA".
+**/ %>
+
+
+
+
+
+
+<%
+out.println(myBean.getStr());
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.gf
new file mode 100644
index 0000000000..8a7cf7921b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.gf
@@ -0,0 +1,12 @@
+
+positiveSetPropParam
+
+
+
+
+
+
+MANGO
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.jsp
new file mode 100644
index 0000000000..9c3819275d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropParam.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetPropParam
+
+<% /** 	Name : positiveSetPropParam
+	Description : Create a valid useBean action in JSP. Set a specific 
+		      property of that bean from the request using a 
+		       action. 
+		      Then access that property.
+	Result : As we are setting "param as Name=MANGO", It should 
+		 return "MANGO".
+**/ %>
+
+
+
+
+<%
+out.println(myBean.getName());
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.gf
new file mode 100644
index 0000000000..c3eb962c53
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.gf
@@ -0,0 +1,11 @@
+
+positiveSetPropReqTimeDoubleQuotes
+
+
+
+
+
+HTTP/1.0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.jsp
new file mode 100644
index 0000000000..e1573dc488
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeDoubleQuotes.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetPropReqTimeDoubleQuotes
+
+<% /** 	Name : positiveSetPropReqTimeDoubleQuotes
+	Description : use a scriptlet expression in double quotes
+                      as 'value' attribute in setProperty
+	Result :we should get the expected page without error
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.gf
new file mode 100644
index 0000000000..08504d645d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.gf
@@ -0,0 +1,11 @@
+
+positiveSetPropReqTimeSingleQuotes
+
+
+
+
+
+HTTP/1.0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.jsp
new file mode 100644
index 0000000000..29c1aed4f7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropReqTimeSingleQuotes.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetPropReqTimeSingleQuotes
+
+<% /** 	Name : positiveSetPropReqTimeSingleQuotes
+	Description : use a scriptlet expression in single quotes
+                      as 'value' attribute in setProperty
+	Result :we should get the expected page without error
+**/ %>
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.gf
new file mode 100644
index 0000000000..439165c02e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.gf
@@ -0,0 +1,12 @@
+
+positiveSetPropValue
+
+
+
+
+
+
+KHATTA-MEETHA
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.jsp
new file mode 100644
index 0000000000..8152051ca3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/setproperty/positiveSetPropValue.jsp
@@ -0,0 +1,37 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSetPropValue
+
+<% /** 	Name : positiveSetPropValue
+	Description : Create a valid useBean action in JSP. Set a specific 
+		      property of that bean from the request using a 
+		       action. 
+		      Then access that property.
+	Result : Should return the new value of that property.
+**/ %>
+
+
+
+
+<%
+out.println(myBean.getName());
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest1.jsp
new file mode 100644
index 0000000000..b5223a3894
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest1.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    Custom actions nor scripting elements are allowed
+    in the body of jsp:text
+--%>
+
+
+    elementBody
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest2.jsp
new file mode 100644
index 0000000000..41b5f96305
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest2.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    Custom actions nor scripting elements are allowed
+    in the body of jsp:text
+--%>
+
+
+    <% out.println("Test FAILED"); %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest3.jsp
new file mode 100644
index 0000000000..f551ca50b8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest3.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page import="java.io.PrintWriter"%>
+<%--
+    Custom actions nor scripting elements are allowed
+    in the body of jsp:text
+--%>
+
+
+    <%!
+        public void test(PrintWriter out) {
+            out.println("Test FAILED");
+        }
+    %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest4.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest4.jsp
new file mode 100644
index 0000000000..185c06ba23
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest4.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page import="java.io.PrintWriter"%>
+<%--
+    Custom actions nor scripting elements are allowed
+    in the body of jsp:text
+--%>
+
+
+    <%= "Test FAILED" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest5.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest5.jspx
new file mode 100644
index 0000000000..6381d49ce8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextBodyRestrictionsTest5.jspx
@@ -0,0 +1,31 @@
+
+
+
+
+    
+
+    
+
+    
+       
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest1.jsp
new file mode 100644
index 0000000000..4dec547d08
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest1.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% pageContext.setAttribute("tmplText", "Template Text2"); %>
+
+Template
+Text
+${tmplText}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest2.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest2.jspx
new file mode 100644
index 0000000000..aa58e3eb19
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest2.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+    
+    
+    
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest3.jsp
new file mode 100644
index 0000000000..2aae90edfb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/JspTextUsageContextTest3.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/WEB-INF/tags/JspTextTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/WEB-INF/tags/JspTextTag.tag
new file mode 100644
index 0000000000..e9663c3a9a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/WEB-INF/tags/JspTextTag.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+Template Text
+Template
+Text2
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/jsp_core_act_text_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/jsp_core_act_text_web.xml
new file mode 100644
index 0000000000..38b315cdb6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/text/jsp_core_act_text_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActText
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/ScopeResult.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/ScopeResult.jsp
new file mode 100644
index 0000000000..8c5b4d5239
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/ScopeResult.jsp
@@ -0,0 +1,75 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain;charset=ISO-8859-1" %>
+<%--
+    Simple JSP to valid scoped objects created with jsp:useBean
+--%>
+
+<%! 
+     public void sendPass( HttpServletResponse resp ) {
+        resp.addHeader( "status", "Test Status=PASSED" );
+        return;
+    }
+%>
+
+<%!
+    public void sendFail( HttpServletResponse resp, String msg ) {
+        resp.addHeader( "status", "Test Status=FAILED - " + msg );
+        return;
+    }
+%>
+
+<%
+    String _scope = request.getParameter( "scope" );
+    String _objId = request.getParameter( "objId" );
+   
+
+    if ( _scope.equals( "application" ) ) {
+        if ( ( application.getAttribute( _objId ) ) != null ) {
+            sendPass( response );
+        } else {
+            sendFail( response, "Application scoped object not found in ServletContext" );
+        }
+    }
+
+    if ( _scope.equals( "session" ) ) {
+        if ( ( session.getAttribute( _objId ) ) != null ) {
+            sendPass( response );
+        } else {
+            sendFail( response, "Session scoped object not found in HttpSession" );
+        }
+    }
+
+    if ( _scope.equals( "request" ) ) {
+        if ( ( request.getAttribute( _objId ) ) != null ) {
+            sendPass( response );
+        } else {
+            sendFail( response, "Request scoped object not found in HttpServletResponse" );
+        }
+    }
+
+    if ( _scope.equals( "page" ) ) {
+        if ( ( pageContext.getAttribute( _objId ) ) == null ) {
+            sendPass( response );
+        } else {
+            sendFail( response, "Page scoped object found in current page and should not be" );
+        }
+    }
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/date.ser b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/date.ser
new file mode 100644
index 0000000000000000000000000000000000000000..60a91ec7d2df8f3cbbd7ef2a237ab7d27aca129b
GIT binary patch
literal 46
zcmZ4UmVvdnh=DIFu`E%qv?Mb}&n2-WH6yE$(L1t4l9_>_qM)3Efq~(>D=X{N3IJrU
B4h{eS

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/defaultScope.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/defaultScope.jsp
new file mode 100644
index 0000000000..7b2614b9fb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/defaultScope.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+defaultScopeTest
+
+<% /** 	Name : defaultScopeTest
+	Description : default useBean scope is page
+	Result : Test PASSED
+**/ %>
+
+<%
+  int aScope = pageContext.getAttributesScope("nowDate");
+  if(aScope == pageContext.PAGE_SCOPE) {
+      out.println("Test PASSED. default scope is page: " + aScope);
+  } else {
+      out.println("Test FAILED: default scope is not page: " + aScope);
+  }
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/errorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/errorPage.jsp
new file mode 100644
index 0000000000..e23c7497fe
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/errorPage.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+errorPage
+
+
+<%@ page isErrorPage="true" %>
+<%
+ out.println("errorPage");
+%>
+
+ 
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/jsp_coresyntx_act_usebean_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/jsp_coresyntx_act_usebean_web.xml
new file mode 100644
index 0000000000..15a0831888
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/jsp_coresyntx_act_usebean_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynActUseBean
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.gf
new file mode 100644
index 0000000000..5f7435e440
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.gf
@@ -0,0 +1,10 @@
+
+negativeClassCastException
+
+
+
+ClassCastException successfully caught.
+Test status: PASS
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.jsp
new file mode 100644
index 0000000000..40a31bfe32
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastException.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeClassCastException
+
+<% /** 	Name : negativeClassCastException
+	Description : Using a bean of a particular type declared with
+                  session scope from another page, attempt to verify
+                  that a ClassCastException is thrown if the bean
+                  on this page specifies a conflicting type.
+	Result : Catch the ClassCastException and print a message.
+**/ %>
+<% try { %>
+
+<% } catch ( java.lang.ClassCastException cce ) {
+    out.println( "ClassCastException successfully caught.\nTest status: PASS" );
+   }
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastExceptionFwd.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastExceptionFwd.jsp
new file mode 100644
index 0000000000..a6618bad92
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeClassCastExceptionFwd.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeClassCastExceptionFwd
+
+<% /** 	Name : negativeClassCastFwd
+        Description: Declare a bean with session scope
+                     and then forward the request to another
+                     page.
+	    Result : None.  The interesting stuff will occur in the 
+                 negativeClassCastException.jsp page.
+**/ %>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeDuplicateIDFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeDuplicateIDFatalTranslationError.jsp
new file mode 100644
index 0000000000..ec29766f84
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeDuplicateIDFatalTranslationError.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateIDFatalTranslation
+
+<% /** 	Name : negativeDuplicateIDFatalTranslation
+	Description : Verify that duplicate useBean id's
+                  within the same translation unit yeild
+                  a fatal translation error.
+	Result : Fatal translation error
+**/ %>
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeInvalidScope.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeInvalidScope.jsp
new file mode 100644
index 0000000000..b258940b39
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeInvalidScope.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeInvalidScope
+
+<% /** 	Name : negativeInvalidScope
+	Description : use invalid jsp:useBean scope value
+	Result : Fatal translation error
+**/ %>
+
+<%
+ out.println(currentDate.toString());
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeSessionScopeFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeSessionScopeFatalTranslationError.jsp
new file mode 100644
index 0000000000..01e7f86370
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeSessionScopeFatalTranslationError.jsp
@@ -0,0 +1,37 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page session="false" %>
+
+negativeSessionScopeFatalTranslationError
+
+<% /** 	Name : negativeSessionScopeFatalTranslationError
+	Description : Declare a bean with scope set to session,
+                  and configure the page so that it doesn't
+                  participate in a session.  This should 
+                  cause a fatal translation error.
+	Result : Fatal translation error
+**/ %>
+
+
+<%
+ out.println(myBean.getCount());
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeTypeAssignable.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeTypeAssignable.jsp
new file mode 100644
index 0000000000..cd67360bc5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/negativeTypeAssignable.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeTypeAssignable
+
+<% /** 	Name : negativeTypeAssignableTest
+	Description : we are using 'class' and 'type' together and 'class' 
+		      is not assignable to 'type'. 
+	Result :translation error
+**/ %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveApplicationScopedObject.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveApplicationScopedObject.jsp
new file mode 100644
index 0000000000..1e558de8ca
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveApplicationScopedObject.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveApplicationScopedObject
+
+
+
+    
+    
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.gf
new file mode 100644
index 0000000000..f6e0f2ea41
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.gf
@@ -0,0 +1,11 @@
+
+positiveBeanNameType
+
+
+
+
+
+0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.jsp
new file mode 100644
index 0000000000..c4eac0a622
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameType.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveBeanNameType
+
+<% /** 	Name : positiveBeanNameType
+	Description : Declaring the bean using beanName.  
+    When using beanName, the bean can either be a serialized
+    Object, or a fully qualified class. 
+    This test uses a fully qualfied class with the same type.
+	Result :We should get page output without error
+**/ %>
+
+
+
+<%
+ out.println(myBean.getCount());
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.gf
new file mode 100644
index 0000000000..33e6850667
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.gf
@@ -0,0 +1,11 @@
+
+positiveBeanNameTypeCast
+
+
+
+
+
+0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.jsp
new file mode 100644
index 0000000000..1945fa7265
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBeanNameTypeCast.jsp
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveBeanNameTypeCast
+
+<% /** 	Name : positiveBeanNameTypeCast
+	Description : Declaring the bean using beanName.  
+    When using beanName, the bean can either be a serialized
+    Object, or a fully qualified class.  When the class is loaded,
+    it is cast to the type specified by the "type" attribute.  
+    This test uses a fully qualfied class.
+	Result :We should get page output without error
+**/ %>
+
+
+
+<%
+ out.println(myBean.getCount());
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.gf
new file mode 100644
index 0000000000..7fc93e9727
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.gf
@@ -0,0 +1,12 @@
+
+positiveBodyNew
+
+
+
+
+
+
+APPLE
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.jsp
new file mode 100644
index 0000000000..14914a011c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveBodyNew.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveBodyNew
+
+<% /** 	Name : positiveBodyNew
+	Description : Try to create a valid useBean tag in the JSP page with a
+                      non-empty body. Ensure that the classname specified
+                      does not exist.
+	Result :Should return the contents of the HTML page along with what
+                exists in the body.
+**/ %>
+
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.gf
new file mode 100644
index 0000000000..79c2240b0f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.gf
@@ -0,0 +1,10 @@
+
+positiveClassTypeCast
+
+
+
+
+0
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.jsp
new file mode 100644
index 0000000000..0b7f0bcd3c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveClassTypeCast.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveClassTypeCast
+
+<% /** 	Name : positiveClassTypeCast
+	Description : we are using 'class' and 'type' together and 'class' 
+		      is assignable to 'type'. 
+	Result :we should get the expected page without an error
+**/ %>
+
+
+<% out.println( ncounter.getCount());  %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.gf
new file mode 100644
index 0000000000..480ad55007
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.gf
@@ -0,0 +1,9 @@
+
+positiveNoBody
+
+
+
+
+hello
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.jsp
new file mode 100644
index 0000000000..271cb95d64
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveNoBody.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveNoBody
+
+<% /** 	Name : positiveNoBody
+	Description : Create a new instance of a bean with no body.
+                  Access the name property.
+	Result : Returns the default instance value of the name property: hello.
+**/ %>
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positivePageScopedObject.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positivePageScopedObject.jsp
new file mode 100644
index 0000000000..8991d81d71
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positivePageScopedObject.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positivePageScopedObject
+
+
+
+    
+    
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveRequestScopedObject.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveRequestScopedObject.jsp
new file mode 100644
index 0000000000..da0e9ff96d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveRequestScopedObject.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveRequestScopedObject
+
+
+
+    
+    
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveSessionScopedObject.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveSessionScopedObject.jsp
new file mode 100644
index 0000000000..a723fd16eb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/positiveSessionScopedObject.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSessionScopedObject
+
+
+
+    
+    
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/requestTimeBeanName.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/requestTimeBeanName.jsp
new file mode 100644
index 0000000000..2ae3833db7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/requestTimeBeanName.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+requestTimeBeanNameTest
+
+<% /** 	Name : requestTimeBeanNameTest
+	Description : use a request-time attribute expression for beanName
+	Result : Test PASSED
+**/ %>
+<%! String aName = "java.util.Date"; %>
+
+<%
+  out.println(aDate.toString());
+  out.println("Test PASSED.");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/serBeanName.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/serBeanName.jsp
new file mode 100644
index 0000000000..7f41c5cc74
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean/serBeanName.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+serBeanNameTest
+
+<% /** 	Name : serBeanNameTest
+	Description : use beanName of the form a/b/c.ser
+	Result : Test PASSED
+**/ %>
+
+<%
+  out.println(aSer.getTime());
+  out.println("Test PASSED.");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/WEB-INF/tags/beanBody.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/WEB-INF/tags/beanBody.tag
new file mode 100644
index 0000000000..82729ad0e6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/WEB-INF/tags/beanBody.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+In beanBody tag after doBody
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/blockSCopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/blockSCopeTest.jsp
new file mode 100644
index 0000000000..1df5d43e4d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/blockSCopeTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<% { // introduce a new block %>
+    
+    <%
+      list.add("one");
+    %>
+<% } // close the block %>
+
+<%
+// the variable customer is out of scope now but
+// the object is still valid (and accessible via pageContext)
+// declear list as a new variable.
+  String list = "two";
+  out.println(pageContext.getAttribute("list"));
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTest.jsp
new file mode 100644
index 0000000000..e92414fe98
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%
+  list.add("one");
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTestInclude.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTestInclude.jsp
new file mode 100644
index 0000000000..725afd9c02
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/existingWithBodyTestInclude.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+  This body should be ignored
+
+<%
+  out.println(list);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/inScriptlessTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/inScriptlessTest.jsp
new file mode 100644
index 0000000000..20254370a8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/inScriptlessTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+${list1}
+invoke tag
+
+  
+  ${list2}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/jsp_coresyntx_act_usebean2_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/jsp_coresyntx_act_usebean2_web.xml
new file mode 100644
index 0000000000..0c14203c62
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/jsp_coresyntx_act_usebean2_web.xml
@@ -0,0 +1,33 @@
+
+
+
+
+  JspCorSynActUseBean2
+  
+    5
+  
+
+  
+    
+        Property group sets scripting-invalid to true
+        /inScriptlessTest.jsp
+        true
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/noClassNoBeanNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/noClassNoBeanNameTest.jsp
new file mode 100644
index 0000000000..7c351f52d1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/noClassNoBeanNameTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%
+try {
+%>
+  
+  Test FAILED.
+<%
+} catch (InstantiationException ex) {
+  out.println("Test PASSED. InstantiationException is raised.");
+} catch (Throwable th) {
+  out.println("Test FAILED. Unexpected exception type.");
+}
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTest.jsp
new file mode 100644
index 0000000000..986e170293
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTest.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+  add to list
+  <%
+    list.add("one");
+  %>
+  added to list
+  
+
+<%
+    out.println(list.get(0));
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTestInclude.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTestInclude.jsp
new file mode 100644
index 0000000000..1ee9e665f7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/usebean2/unrestrictedBodyTestInclude.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+In unrestrictedBodyTestInclude.jsp
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/includecommon.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/includecommon.jsp
new file mode 100644
index 0000000000..cecf510eda
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/includecommon.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+included
+
+
+<% out.println("This is included file"); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/jsp_coresyntx_direct_include_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/jsp_coresyntx_direct_include_web.xml
new file mode 100644
index 0000000000..99be0892e2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/jsp_coresyntx_direct_include_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynDirctInc
+  
+    24
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.gf
new file mode 100644
index 0000000000..ed172d80ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.gf
@@ -0,0 +1,16 @@
+
+positiveIncludeCtxRelativeDirective
+
+
+
+
+included
+
+
+This is included file
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.jsp
new file mode 100644
index 0000000000..aa22cdcf88
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludeCtxRelativeDirective.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveIncludeCtxRelativeDirective
+
+<% /** 	Name : positiveIncludeCtxRelativeDirective
+	Description : Create a JSP page with the include directive using 
+	              a context-relative path. The included 
+	              page should exist in the desired location
+	Result :Send out the HTML of the first page with the output of the 
+	        second page and revert back to sending the first page once 
+	        second page is complete.
+**/ %>
+
+<%@ include file = "/includecommon.jsp" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.gf
new file mode 100644
index 0000000000..c659648ba3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.gf
@@ -0,0 +1,16 @@
+
+positiveIncludePageRelative
+
+
+
+
+included
+
+
+This is included file
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.jsp
new file mode 100644
index 0000000000..7bcbe9236f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/include/positiveIncludePageRelativeDirective.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveIncludePageRelative
+
+<% /** 	Name : positiveIncludePageRelative
+	Description : Create a JSP page with the include directive using a 
+	              page-relative path. The included 
+	              page should exist in the desired location
+	Result :Send out the HTML of the first page with the output of the 
+	        second page and revert back to sending the first page once 
+	        second page is complete.
+**/ %>
+
+<%@ include file = "includecommon.jsp" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseActionTest.jsp
new file mode 100644
index 0000000000..44a28163a5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseActionTest.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralFalseActionTest
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      page directive attribute is set to false, a 
+                      translation error occurs when the '{#' character 
+                      sequence is used in an action.
+**/ %>
+
+<%@ taglib prefix="test" uri="/WEB-INF/deferredsyntaxaction.tld" %>
+<%@ page deferredSyntaxAllowedAsLiteral="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp
new file mode 100644
index 0000000000..083c85b80b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralFalseTemplateTextTest
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      page directive attribute is set to false, a 
+                      translation error occurs when the '{#' character 
+                      sequence is used in template text.
+**/ %>
+
+<%@ page deferredSyntaxAllowedAsLiteral="false" %>
+
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.gf
new file mode 100644
index 0000000000..bc50afbede
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.gf
@@ -0,0 +1 @@
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.jsp
new file mode 100644
index 0000000000..0ccd79b5cc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueActionTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralFalseActionTest
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      page directive attribute is set to true, the
+                      '{#' character sequence is allowed in an action.
+**/ %>
+
+<%@ taglib prefix="test" uri="/WEB-INF/deferredsyntaxaction.tld" %>
+<%@ page deferredSyntaxAllowedAsLiteral="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf
new file mode 100644
index 0000000000..bc50afbede
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.gf
@@ -0,0 +1 @@
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp
new file mode 100644
index 0000000000..8cdd75a865
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralTrueActionTest
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      page directive attribute is set to true, the '{#' 
+                      character sequence is allowed in template text.
+
+**/ %>	 
+
+<%@ page deferredSyntaxAllowedAsLiteral="true" %>
+
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundFalseTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundFalseTest.jsp
new file mode 100644
index 0000000000..ed5e567262
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundFalseTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : ErrorOnELNotFoundFalseTest
+	Description : Verify that when the ErrorOnELNotFound 
+                      page directive attribute is set to false, referencing 
+                      an unknown identifier does not trigger a
+                      ProeprtyNotFoundException
+**/ %>
+
+<%@ page errorOnELNotFound="false" %>
+
+${notfound}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundTrueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundTrueTest.jsp
new file mode 100644
index 0000000000..0f458d56b4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/ErrorOnELNotFoundTrueTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : ErrorOnELNotFoundTrueTest
+	Description : Verify that when the ErrorOnELNotFound 
+                      page directive attribute is set to false, referencing 
+                      an unknown identifier does trigger a
+                      ProeprtyNotFoundException
+**/ %>
+
+<%@ page errorOnELNotFound="true" %>
+
+${notfound}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/FatalTranslationErrorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/FatalTranslationErrorPage.jsp
new file mode 100644
index 0000000000..4328281565
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/FatalTranslationErrorPage.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+FatalTranslationErrorPage
+
+<% 
+    // The code below should cause the container
+    // to throw a fatal translation error.
+    if ( exception == null ) {
+        out.println( "Exception was null" );
+    else {
+        out.println( "Exception was not null" );
+    }
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.gf
new file mode 100644
index 0000000000..370acb93ff
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.gf
@@ -0,0 +1,2 @@
+Non-deferred value = dollar
+Deferred value = pound
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.jsp
new file mode 100644
index 0000000000..bae399728b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseActionTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : IsELIgnoredFalseActionTest
+	Description : Verify that EL expressions are recognized by the
+                      container in actions when the isELIgnored 
+                      attribute is set to false.
+**/ %>	 
+<%@ taglib prefix="test" uri="/WEB-INF/iselignoredaction.tld" %>
+
+<%@ page isELIgnored="false" %>
+
+<%
+    pageContext.setAttribute("dexp", "dollar", PageContext.PAGE_SCOPE);
+    pageContext.setAttribute("pexp", "pound", PageContext.PAGE_SCOPE); 
+ %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.gf
new file mode 100644
index 0000000000..5e3cf678b9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.gf
@@ -0,0 +1,3 @@
+begin
+    dollar
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.jsp
new file mode 100644
index 0000000000..9b67165dfe
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextDollarTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : IsELIgnoredFalseTemplateTextDollarTest
+	Description : Verify that EL expressions are interpreted by the
+                      container in template text when the isELIgnored 
+                      attribute is set to false and the '$' character is 
+                      used.
+**/ %>	 
+<%@ page isELIgnored="false" %>
+
+<%
+    pageContext.setAttribute("dexp", "dollar", PageContext.PAGE_SCOPE);
+ %>
+
+begin
+    ${dexp}
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextPoundTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextPoundTest.jsp
new file mode 100644
index 0000000000..caf4a253ca
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredFalseTemplateTextPoundTest.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : IsELIgnoredFalseTemplateTextPoundTest
+	Description : Verify that EL expressions are recognized by the
+                      container in template text when the isELIgnored 
+                      attribute is set to false and the '#' character is 
+                      used. Since the use of the '#' character is illegal
+                      in template text, a translation error should be 
+                      generated.
+**/ %>	 
+<%@ page isELIgnored="false" %>
+
+<%
+    pageContext.setAttribute("pexp", "pound", PageContext.PAGE_SCOPE);
+ %>
+
+begin
+    #{pexp}
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.gf
new file mode 100644
index 0000000000..96e3a65fb3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.gf
@@ -0,0 +1,2 @@
+Dollar value = ${dval}
+Pound value = #{pval}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.jsp
new file mode 100644
index 0000000000..8426f34275
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueActionTest.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : IsELIgnoredTrueActionTest
+	Description : Verify that EL expressions are ignored by the
+                      container in actions when the isELIgnored 
+                      attribute is set to true.
+**/ %>	 
+<%@ taglib prefix="test" uri="/WEB-INF/iselignoredaction.tld" %>
+
+<%@ page isELIgnored="true" %>
+
+<%
+    pageContext.setAttribute("dval", "dollar", PageContext.PAGE_SCOPE);
+    pageContext.setAttribute("pval", "pound", PageContext.PAGE_SCOPE); 
+ %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.gf
new file mode 100644
index 0000000000..367a239587
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.gf
@@ -0,0 +1,4 @@
+begin
+    ${dval}
+    #{pval}
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.jsp
new file mode 100644
index 0000000000..d7e4464d92
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/IsELIgnoredTrueTemplateTextTest.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : IsELIgnoredTrueActionTest
+	Description : Verify that EL expressions are interpreted by the
+                      container in template text when the isELIgnored 
+                      attribute is set to true.
+**/ %>	 
+
+<%@ page isELIgnored="true" %>
+
+<%
+    pageContext.setAttribute("dval", "dollar", PageContext.PAGE_SCOPE);
+    pageContext.setAttribute("pval", "pound", PageContext.PAGE_SCOPE); 
+ %>
+
+begin
+    ${dval}
+    #{pval}
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/deferredsyntaxaction.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/deferredsyntaxaction.tld
new file mode 100644
index 0000000000..0e292df2fa
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/deferredsyntaxaction.tld
@@ -0,0 +1,37 @@
+
+
+
+
+
+  1.0
+  DeferredSyntaxAction
+  
+    DeferredSyntaxAction test
+    DeferredSyntaxAction
+    com.sun.ts.tests.jsp.spec.core_syntax.directives.page.DeferredSyntaxActionTag
+    empty
+    
+      literal
+      true
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/iselignoredaction.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/iselignoredaction.tld
new file mode 100644
index 0000000000..90018e67eb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/WEB-INF/iselignoredaction.tld
@@ -0,0 +1,60 @@
+
+
+
+
+
+  1.0
+  IsELIgnoredAction
+  
+    IsELIgnoredFalseAction test
+    IsELIgnoredFalseAction
+    com.sun.ts.tests.jsp.spec.core_syntax.directives.page.IsELIgnoredFalseActionTag
+    empty
+    
+      dollarExpr
+      true
+      true
+      java.lang.String
+    
+    
+      poundExpr
+      true
+      
+        java.lang.String
+      
+    
+  
+  
+    IsELIgnoredTrueAction test
+    IsELIgnoredTrueAction
+    com.sun.ts.tests.jsp.spec.core_syntax.directives.page.IsELIgnoredTrueActionTag
+    empty
+    
+      dollarValue
+      true
+    
+    
+      poundValue
+      true
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/duplicateErrorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/duplicateErrorPage.jsp
new file mode 100644
index 0000000000..c783987e16
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/duplicateErrorPage.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+duplicateErrorPage.jsp
+
+This error page is used by negativeDuplicateErrorPageFatalTranslationError.jsp
+where two different errorPage page directive attributes are specified. 
+negativeDuplicateErrorPageFatalTranslationError.jsp must fail.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTest.jsp
new file mode 100644
index 0000000000..1ff4f1c60b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page errorPage="errorPageExceptionAttributeTestError.jsp" autoFlush="false" %>
+<%! int i=0; %>
+<%= 9/i %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTestError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTestError.jsp
new file mode 100644
index 0000000000..e7792216ff
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorPageExceptionAttributeTestError.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page isErrorPage="true"  %>
+
+<%
+  Object jspException = request.getAttribute("jakarta.servlet.jsp.jspException");
+  Object error_exception = 
+    request.getAttribute("jakarta.servlet.error.exception");
+  if(jspException == null) { 
+    out.println("Test FAILED. jakarta.servlet.jsp.jspException is null");
+  } else if(error_exception == null) {
+    out.println("Test FAILED. jakarta.servlet.error.exception is null");
+  } else if(error_exception != jspException) {
+    out.println("Test FAILED. jakarta.servlet.error.exception and jakarta.servlet.jsp.jspException are not the same");
+  } else {
+    out.println("Test PASSED. jakarta.servlet.error.exception and jakarta.servlet.jsp.jspException are the same");
+    out.println(jspException.toString());
+  }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorpagedefault.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorpagedefault.jsp
new file mode 100644
index 0000000000..655286e313
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/errorpagedefault.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+errorpage
+
+<% out.println("This is test error page for isErrorPage=false"); 
+   if ( exception == null ) {
+       out.println( "implicit exception object is null" );
+   }
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicit.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicit.jsp
new file mode 100644
index 0000000000..6580b783aa
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicit.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+<%
+  
+   out.println(request.getProtocol());
+   
+   %>
+   
+   
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.gf
new file mode 100644
index 0000000000..5d54825340
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.gf
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+true
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.jsp
new file mode 100644
index 0000000000..504bc6f231
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportHttp.jsp
@@ -0,0 +1,45 @@
+<%--
+
+    Copyright (c) 2021 Oracle and/or its affiliates and others.
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+<% /**	Name: implicitImportJsp
+	Description: Use jsp page directive with language="java" 
+		    Do not specify jakarta.servlet.http in the import attribute
+		    as it should be available implicitly.  Validate
+		    that an Cookie object can be created.
+			    
+	Result:No error
+**/ %>
+
+
+
+<%@ page language="java" %>
+
+<%
+
+  Cookie cookie = new Cookie("name","value");
+    
+  
+%>
+
+<%= cookie instanceof jakarta.servlet.http.Cookie %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.gf
new file mode 100644
index 0000000000..208204e274
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.gf
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+true
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.jsp
new file mode 100644
index 0000000000..e2cd4ab01d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportJsp.jsp
@@ -0,0 +1,44 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+<% /**	Name: implicitImportJsp
+	Description: Use jsp page directive with language="java"
+                 with no import statement.  Validate that
+                 jakarta.servlet.jsp.* was imported implicitly
+                 by creating an instance of JspFactory.
+	Result:No error
+**/ %>
+
+
+
+
+<%@ page language="java"  %>
+
+<%
+
+   JspFactory jfac=JspFactory.getDefaultFactory();
+
+%>
+
+<%= jfac instanceof jakarta.servlet.jsp.JspFactory %>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.gf
new file mode 100644
index 0000000000..8524b5720b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.gf
@@ -0,0 +1,15 @@
+
+implicitImportLang
+
+
+
+
+
+
+
+sun
+5
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.jsp
new file mode 100644
index 0000000000..e15bf80513
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportLang.jsp
@@ -0,0 +1,46 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+implicitImportLang
+
+<% /**	Name: implicitImportLang
+		Description: Use a jsp directive with language="java" 
+			    Do not specify the import attribute.  The java.lang 
+                package should be available implicitly.  Validate
+                that a String and Integer object can be created.
+			    
+		Result:No error
+**/ %>
+
+<%@ page language="java" %>
+
+
+
+<%  
+    String str="sun";
+     out.println(str);
+    Integer i=new Integer(5);
+    String x=i.toString();
+    out.println(x);
+
+
+ %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.gf
new file mode 100644
index 0000000000..75a25da6e1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.gf
@@ -0,0 +1,6 @@
+
+
+HTTP/1.0
+
+   
+   
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.jsp
new file mode 100644
index 0000000000..0e904dd9e7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/implicitImportServlet.jsp
@@ -0,0 +1,46 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+
+<% /**	Name: implicitImportServlet
+		Description: Use jsp page directive with language="java" 
+			    Do not specify the import attribute. The jakarta.servlet
+			    package should be available implicitly.  Validate
+                that a RequestDispatch object can be created.
+			    
+		Result:No error
+**/ %>		
+
+
+
+<%@ page language="java"  %>
+
+<%
+
+try{
+
+ RequestDispatcher rd = getServletConfig().getServletContext().getRequestDispatcher( "/implicit.jsp");
+ rd.forward(request, response);
+
+  }catch(Exception o){o.printStackTrace();}
+
+%>
+
+	  
+	  
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/jsp_coresyntx_directive_page_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/jsp_coresyntx_directive_page_web.xml
new file mode 100644
index 0000000000..7fa6b8cd07
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/jsp_coresyntx_directive_page_web.xml
@@ -0,0 +1,29 @@
+
+
+
+
+  JspCorSynDirctPage
+  
+    5
+  
+  
+    java.lang.ArithmeticException
+    /willNotSee.jsp
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/myerrorpage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/myerrorpage.jsp
new file mode 100644
index 0000000000..d081552e9f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/myerrorpage.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+myerrorpage
+
+
+<%@ page isErrorPage="true"  %>
+<% out.println("This is a test error page"); %>
+<% out.println("You have recieved the correct error page."); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBuffAutoflush.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBuffAutoflush.jsp
new file mode 100644
index 0000000000..7b7575023f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBuffAutoflush.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeBuffAutoflush
+
+<% /**	Name: negativeBuffAutoflush
+		Description: Set autoflush to false when buffer=none
+		Result: translation error
+**/ %>		
+<%@ page autoFlush="false" %>
+<%@ page buffer="none" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.gf
new file mode 100644
index 0000000000..cb3d0d887d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.gf
@@ -0,0 +1,5 @@
+Buffer overflow occurred.  Exception successfully caught.
+Test status: PASS
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.jsp
new file mode 100644
index 0000000000..4c10528b73
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferOverflowException.jsp
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeBufferOverflowException
+
+<% /**	Name: negativeBufferOverflowException
+		Description: Set autoflush to false. Write more
+                     date out than the 8KB buffer can handle.
+		Result: An exception should be thrown.
+**/ %>		
+<%@ page autoFlush="false" %>
+<% try {
+      for (int d = 0; d < 60000; d++ ) {
+          out.print(d+"    ");  
+      }
+   } catch ( Throwable t ) {
+       out.clear();
+       out.println( "Buffer overflow occurred.  Exception successfully caught." );
+       out.println( "Test status: PASS" );
+   }
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix.jsp
new file mode 100644
index 0000000000..cc4374c543
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeBufferSuffixTest
+
+<%@ page buffer="23k" %>
+Test FAILED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix2.jsp
new file mode 100644
index 0000000000..7e6fe3bb9e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeBufferSuffix2.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+  
+  Test FAILED.
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError.jsp
new file mode 100644
index 0000000000..8b93e3eb4c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateAutoFlushFatalTranslationError
+
+<% /**	Name: negativeDuplicateAutoFlushFatalTranslationError 
+		Description: Verify that multiple uses of autoFlush attribute
+                     with different values result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page autoFlush="false" autoFlush="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError2.jsp
new file mode 100644
index 0000000000..2f0f7ac662
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateAutoFlushFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateAutoFlushFatalTranslationError
+
+<% /**	Name: negativeDuplicateAutoFlushFatalTranslationError 
+		Description: Verify that multiple uses of autoFlush attribute
+                     with different values result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page autoFlush="false" %>
+<%@ page autoFlush="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError.jsp
new file mode 100644
index 0000000000..db587a1964
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateBufferFatalTranslationError
+
+<% /**	Name: negativeDuplicateBufferFatalTranslationError 
+		Description: Verify that multiple uses of buffer attribute
+                     result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page buffer="12kb" buffer="8kb" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError2.jsp
new file mode 100644
index 0000000000..ebc7090453
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateBufferFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateBufferFatalTranslationError
+
+<% /**	Name: negativeDuplicateBufferFatalTranslationError 
+		Description: Verify that multiple uses of buffer attribute
+                     result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page buffer="12kb" %>
+<%@ page buffer="8kb" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError.jsp
new file mode 100644
index 0000000000..f0cde0ae84
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateContentFatalTranslationError
+
+<%
+/**
+  Name : negativeDuplicateContentFatalTranslationError
+  Description : Verify that multiple uses of the contentType attribute
+                result in a fatal translation error.
+  Result : A fatal translation error
+**/
+%>
+<%@ page contentType="text/plain;charset=ISO-8859-1" contentType="text/html;charset=ISO-8859-1" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError2.jsp
new file mode 100644
index 0000000000..c2f10d5865
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateContentFatalTranslationError2.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateContentFatalTranslationError
+
+<%
+/**
+  Name : negativeDuplicateContentFatalTranslationError
+  Description : Verify that multiple uses of the contentType attribute
+                result in a fatal translation error.
+  Result : A fatal translation error
+**/
+%>
+<%@ page contentType="text/plain;charset=ISO-8859-1" %>
+<%@ page contentType="text/html;charset=ISO-8859-1" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError.jsp
new file mode 100644
index 0000000000..ad91f56529
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateErrorPageFatalTranslationError
+
+<% /** 	Name : negativeDuplicateErrorPageFatalTranslationError
+	Description : Verify that multiple uses of the errorPage attribute
+                      with different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page errorPage="FatalTranslationErrorPage.jsp" errorPage="duplicateErrorPage.jsp" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError2.jsp
new file mode 100644
index 0000000000..d9c8e16d06
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateErrorPageFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateErrorPageFatalTranslationError
+
+<% /** 	Name : negativeDuplicateErrorPageFatalTranslationError
+	Description : Verify that multiple uses of the errorPage attribute
+                      with different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page errorPage="FatalTranslationErrorPage.jsp" %>
+<%@ page errorPage="duplicateErrorPage.jsp" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError.jsp
new file mode 100644
index 0000000000..cedac31d28
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateExtendsFatalTranslationError
+
+<% /** 	Name : negativeDuplicateExtendsFatalTranslationError
+	Description : Verify that multiple uses of the extends attribute
+                  result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page extends="com.sun.ts.tests.jsp.spec.core_syntax.directives.page.SuperPage" extends="com.sun.ts.tests.jsp.spec.core_syntax.directives.page.DuperPage"  %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError2.jsp
new file mode 100644
index 0000000000..a733193632
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateExtendsFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateExtendsFatalTranslationError
+
+<% /** 	Name : negativeDuplicateExtendsFatalTranslationError
+	Description : Verify that multiple uses of the extends attribute
+                  result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page extends="com.sun.ts.tests.jsp.spec.core_syntax.directives.page.SuperPage" %>
+<%@ page extends="com.sun.ts.tests.jsp.spec.core_syntax.directives.page.DuperPage"  %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError.jsp
new file mode 100644
index 0000000000..9a3392a95e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateInfoFatalTranslationError
+
+<% /** 	Name : negativeDuplicateInfoFatalTranslationError
+	Description : Verify that multiple uses of the info attribute with
+                      different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page info="Fatal Translation Error" info="Another Fatal" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError2.jsp
new file mode 100644
index 0000000000..4aba8f47cd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateInfoFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateInfoFatalTranslationError
+
+<% /** 	Name : negativeDuplicateInfoFatalTranslationError
+	Description : Verify that multiple uses of the info attribute with
+                      different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page info="Fatal Translation Error" %>
+<%@ page info="Another Fatal" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError.jsp
new file mode 100644
index 0000000000..fd446684a3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateIsELIgnoredFatalTranslationError
+
+<% /**	Name: negativeDuplicateIsELIgnoredFatalTranslationError 
+		Description: Verify that multiple uses of isELIgnored attribute
+                     result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page isELIgnored="true" isELIgnored="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError2.jsp
new file mode 100644
index 0000000000..4a7efeb327
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsELIgnoredFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateIsELIgnoredFatalTranslationError
+
+<% /**	Name: negativeDuplicateIsELIgnoredFatalTranslationError 
+		Description: Verify that multiple uses of isELIgnored attribute
+                     result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page isELIgnored="true" %>
+<%@ page isELIgnored="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError.jsp
new file mode 100644
index 0000000000..4b3edc86f0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateIsErrorPageFatalTranslationError
+
+<% /**	Name: negativeDuplicateIsErrorPageFatalTranslationError 
+		Description: Verify that multiple uses of isErrorPage attribute
+                     with different values result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page isErrorPage="false" isErrorPage="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError2.jsp
new file mode 100644
index 0000000000..34efcd4e14
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsErrorPageFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateIsErrorPageFatalTranslationError
+
+<% /**	Name: negativeDuplicateIsErrorPageFatalTranslationError 
+		Description: Verify that multiple uses of isErrorPage attribute
+                     with different values result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page isErrorPage="false" %>
+<%@ page isErrorPage="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError.jsp
new file mode 100644
index 0000000000..602f731227
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateIsThreadSafeFatalTranslationError
+
+<% /**	Name: negativeDuplicateIsThreadSafeFatalTranslationError 
+		Description: Verify that multiple uses of isThreadSafe attribute
+                     with different values result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page isThreadSafe="true" isThreadSafe="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp
new file mode 100644
index 0000000000..eb06130005
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateIsThreadSafeFatalTranslationError
+
+<% /**	Name: negativeDuplicateIsThreadSafeFatalTranslationError 
+		Description: Verify that multiple uses of isThreadSafe attribute
+                     with different values result in a fatal translation error.
+		Result: A fatal translation error
+**/ %>		
+<%@ page isThreadSafe="true" %>
+<%@ page isThreadSafe="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError.jsp
new file mode 100644
index 0000000000..11dfb47fdc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateLanguageFatalTranslationError
+
+<% /** 	Name : negativeDuplicateLanguageFatalTranslationError
+	Description : Verify that multiple uses of the language attribute with
+                      different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page language="java" language="c" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError2.jsp
new file mode 100644
index 0000000000..97fbd33553
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateLanguageFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateLanguageFatalTranslationError
+
+<% /** 	Name : negativeDuplicateLanguageFatalTranslationError
+	Description : Verify that multiple uses of the language attribute with
+                      different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page language="java" %>
+<%@ page language="c" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError.jsp
new file mode 100644
index 0000000000..69bd765625
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateSessionFatalTranslationError
+
+<% /** 	Name : negativeDuplicateSessionFatalTranslationError
+	Description : Verify that multiple uses of the session attribute with
+                      different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page session="true" session="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError2.jsp
new file mode 100644
index 0000000000..2d074f24d9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateSessionFatalTranslationError2.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeDuplicateSessionFatalTranslationError
+
+<% /** 	Name : negativeDuplicateSessionFatalTranslationError
+	Description : Verify that multiple uses of the session attribute with
+                      different values result in a fatal translation error.
+	Result : A fatal translation error.
+**/ %>	 
+<%@ page session="true" %>
+<%@ page session="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeFatalTranslationError.jsp
new file mode 100644
index 0000000000..2e75ed5d2c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeFatalTranslationError.jsp
@@ -0,0 +1,37 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeFatalTranslationError
+
+<% /** 	Name : negativeFatalTranslationError
+	Description : Here, the errorPage attribute of the page
+                  directive is used.  An exception is
+	              generated by dividing an integer value by 0.
+                  The request is forward onto an error page where
+                  the isErrorPage attribute is set to the default
+                  of false.  The Error page will attempt to access
+                  the implicit exception object.
+	Result : A fatal translation error should occur.
+**/ %>	 
+
+<%@ page errorPage="FatalTranslationErrorPage.jsp" autoFlush="false" %>
+<%! int i=0; %>
+<%= 9/i %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportIo.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportIo.jsp
new file mode 100644
index 0000000000..48bf262c50
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportIo.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeImportUtil
+
+<% /**    Name: negativeImportUtil
+    	        Description: Use jsp page directive with language="java".
+                Validate that java.util.* is not imported by default
+**/ %>
+<%@ page language="java" %>
+
+<%  
+    File file=new File(); 
+ %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportUtil.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportUtil.jsp
new file mode 100644
index 0000000000..4c9b3f4f8a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeImportUtil.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeImportUtil
+
+<% /**    Name: negativeImportUtil
+    	        Description: Use jsp page directive with language="java".
+                Validate that java.util.* is not imported by default
+**/ %>
+<%@ page language="java" %>
+
+<%  
+    Properties props=new Properties(); 
+ %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeMultiplePageEncoding.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeMultiplePageEncoding.jsp
new file mode 100644
index 0000000000..3751d4b371
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeMultiplePageEncoding.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeMultiplePageEncoding
+
+<% /**	Name: negativeMultiplePageEncoding
+		Description: Validate the multiple pageEncoding attributes
+                     cause translation error
+		Result:a translation error
+**/ %>
+<%@ page pageEncoding="UTF-8" %>
+<%@ page pageEncoding="ISO-8859-15" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeSessionFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeSessionFatalTranslationError.jsp
new file mode 100644
index 0000000000..b4cbe037c4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeSessionFatalTranslationError.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+negativeSessionFatalTranslationError
+
+<% /**	Name : negativeSessionFatalTranslationError
+		Description:Set the value of the session attribute to "false".
+			        Try to access the implicit session object.
+		Result: A fatal translation error should occur.
+**/ %>		
+
+<%@ page session="false" %>
+<% 
+    if ( session == null ) {
+        out.println( "Session object shouldn't be available." );
+    }
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffAutoflush.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffAutoflush.jsp
new file mode 100644
index 0000000000..f3d2894728
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffAutoflush.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveBuffAutoflush
+
+<% /**	Name: positiveBuffAutoflush
+		Description: Set autoflush to true. Use default buffer size of 8kb.
+			  Write more than 8kb of data to the out object
+		Result: Should return all data written to out without throwing an
+			  exception.
+**/ %>		
+
+<%@ page autoFlush="true" %>
+<% for(int d=0;d<6000;d++) out.print(d+"    ");  %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffCreate.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffCreate.jsp
new file mode 100644
index 0000000000..c2b3fbf65a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveBuffCreate.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveBuffCreate
+
+<% /**	Name: positiveBuffCreate
+		Description: Create a buffer  size of say 12kb. Keep autoflush
+			  set to false(default).Write characters to the out object. Invoke
+			  the flush() method on out to flush the output to the client.
+		Result:Should return the output that you sent to the client.
+**/ %>		
+
+<%@ page buffer="12kb" autoFlush="false" %>
+<% for(int d=0;d<1000;d++) out.print(d+"    "); out.flush(); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveContenttype.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveContenttype.jsp
new file mode 100644
index 0000000000..b5f708362b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveContenttype.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveContenttype
+
+<%
+/**
+  Name : positiveContenttype
+  Description : Here, the contentType directive is used to set the contentType as text/plain
+  and charset as ISO-8859-1.
+  Result : Expected to give the same values at javatest side, when these values are trapped.
+**/
+%>
+<%@ page contentType="text/plain;charset=ISO-8859-1" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDefaultIsErrorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDefaultIsErrorPage.jsp
new file mode 100644
index 0000000000..791b8f3bce
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDefaultIsErrorPage.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDefaultIsErrorPage
+
+<% /** 	Name : positiveDefaultIsErrorPage.jsp
+	Description : Test the value of isErrorPage=false is default in a page. 
+		      This is set in the 'errorpagedefault.jsp'	
+**/ %>
+
+<%@ page errorPage="errorpagedefault.jsp" autoFlush="false" %>
+<%! int i=0; %>
+<%= 9/i %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateAutoFlush.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateAutoFlush.jsp
new file mode 100644
index 0000000000..6ebc2b46c0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateAutoFlush.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateAutoFlush
+
+<% /** 	Name : positiveDuplicateAutoFlush
+	Description : Verify that multiple uses of the autoFlush attribute with
+                      identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page autoFlush="true" %>
+<%@ page autoFlush="true" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateBuffer.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateBuffer.jsp
new file mode 100644
index 0000000000..64130f5610
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateBuffer.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateBuffer
+
+<% /**	Name: positiveDuplicateBuffer 
+	Description: Verify that multiple uses of buffer attribute
+                     with identical values accepted.
+	Result: Test Passed.
+**/ %>		
+<%@ page buffer="8kb" %>
+<%@ page buffer="8kb" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateContent.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateContent.jsp
new file mode 100644
index 0000000000..d484d447f7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateContent.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateContent
+
+<%
+/**
+  Name : positiveDuplicateContent
+  Description : Verify that multiple uses of the contentType attribute
+                with identical values are accepted.              
+  Result : Test Passed.
+**/
+%>
+<%@ page contentType="text/plain;charset=ISO-8859-1" %>
+<%@ page contentType="text/plain;charset=ISO-8859-1" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateErrorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateErrorPage.jsp
new file mode 100644
index 0000000000..9e5e0a6793
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateErrorPage.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateErrorPage
+
+<% /** 	Name : positiveDuplicateErrorPage
+	Description : Verify that multiple uses of the errorPage attribute
+                      with identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page errorPage="FatalTranslationErrorPage.jsp" %>
+<%@ page errorPage="FatalTranslationErrorPage.jsp" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateExtends.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateExtends.jsp
new file mode 100644
index 0000000000..af626a8531
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateExtends.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateExtends
+
+<% /** 	Name : positiveDuplicateExtends
+	Description : Verify that multiple uses of the extends attribute
+                      with identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page extends="com.sun.ts.tests.jsp.spec.core_syntax.directives.page.SuperPage" %>
+<%@ page extends="com.sun.ts.tests.jsp.spec.core_syntax.directives.page.SuperPage" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateInfo.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateInfo.jsp
new file mode 100644
index 0000000000..993aaa081d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateInfo.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateInfo
+
+<% /** 	Name : positiveDuplicateInfo
+	Description : Verify that multiple uses of the info attribute with
+                      identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page info="two info attributes" %>
+<%@ page info="two info attributes" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsELIgnored.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsELIgnored.jsp
new file mode 100644
index 0000000000..0f4e5abbab
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsELIgnored.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateIsELIgnored
+
+<% /** 	Name : positiveDuplicateIsELIgnored
+	Description : Verify that multiple uses of the isELIgnored attribute with
+                      identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page isELIgnored="true" %>
+<%@ page isELIgnored="true" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsErrorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsErrorPage.jsp
new file mode 100644
index 0000000000..fdb614418e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsErrorPage.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateIsErrorPage
+
+<% /** 	Name : positiveDuplicateIsErrorPage
+	Description : Verify that multiple uses of the isErrorPage attribute with
+                      identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page isErrorPage="false" %>
+<%@ page isErrorPage="false" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsThreadSafe.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsThreadSafe.jsp
new file mode 100644
index 0000000000..f63faae84b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsThreadSafe.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateIsThreadSafe
+
+<% /** 	Name : positiveDuplicateIsThreadSafe
+	Description : Verify that multiple uses of the isThreadSafe attribute with
+                      identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page isThreadSafe="false" %>
+<%@ page isThreadSafe="false" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateLanguage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateLanguage.jsp
new file mode 100644
index 0000000000..d03cfe29f6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateLanguage.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateLanguage
+
+<% /** 	Name : positiveDuplicateLanguage
+	Description : Verify that multiple uses of the language attribute with
+                      identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page language="java" %>
+<%@ page language="java" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateSession.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateSession.jsp
new file mode 100644
index 0000000000..96ce51146f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateSession.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveDuplicateSession
+
+<% /** 	Name : positiveDuplicateSession
+	Description : Verify that multiple uses of the session attribute with
+                      identical values accepted.
+	Result : Test Passed.
+**/ %>	 
+<%@ page session="true" %>
+<%@ page session="true" %>
+Test PASSED.
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.gf
new file mode 100644
index 0000000000..269dddc3fd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.gf
@@ -0,0 +1,11 @@
+
+myerrorpage
+
+
+
+This is a test error page
+
+You have recieved the correct error page.
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.jsp
new file mode 100644
index 0000000000..fec8bc398e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveErrorPage.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveErrorPage
+
+<% /** 	Name : positiveErrorPage
+	Description : Here, the errorPage attribute of the page
+                  directive is used.  An exception is
+	              generated by dividing an integer value by 0.
+	Result : Expected to show the specified errorpage.
+**/ %>	 
+
+<%@ page errorPage="myerrorpage.jsp" autoFlush="false" %>
+<%! int i=0; %>
+<%= 9/i %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.gf
new file mode 100644
index 0000000000..4729019fd0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.gf
@@ -0,0 +1,8 @@
+
+positiveExtends
+
+
+
+true
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.jsp
new file mode 100644
index 0000000000..0d233d9bb7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveExtends.jsp
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveExtends
+
+<% /** 
+       Name : positiveExtends
+       Description: we use extends directive to point our own defined class
+                    as super class to the jsp
+       Result: we should get true to the expression after the directive
+  */ %>
+<%@ page extends="com.sun.ts.tests.jsp.spec.core_syntax.directives.page.SuperPage" %>
+<%= (this instanceof com.sun.ts.tests.jsp.spec.core_syntax.directives.page.SuperPage ) %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.gf
new file mode 100644
index 0000000000..bfba96235d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.gf
@@ -0,0 +1,12 @@
+
+positiveImport
+
+
+
+
+
+harry
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.jsp
new file mode 100644
index 0000000000..34f7b39d6d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveImport.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveImport
+
+<% /**	Name: positiveImport
+		Description: Use jsp page directive with language="java" and an
+			  import attribute of java.util.Properties.  Validate 
+              that the Properties object can be created.
+		Result:No error
+**/ %>
+
+<%@ page language="java" import="java.util.Properties" %>
+
+<%  Properties props=new Properties(); 
+    props.put("name","harry");
+    String name=(String)props.getProperty("name");
+    out.println(name);
+ %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.gf
new file mode 100644
index 0000000000..1dbe05c3d4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.gf
@@ -0,0 +1,10 @@
+
+positiveInfo
+
+
+
+
+positiveInfo of JCK
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.jsp
new file mode 100644
index 0000000000..c5cee35817
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveInfo.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveInfo
+
+<% /**	Name :positiveInfo
+		Description: Set the value of the info attribute to a specific
+			  value.Then invoke the getServletInfo method on the current 
+			  page's Servlet object
+		Result: Should return the correct value of the set string. 
+**/ %>
+
+<%@ page info="positiveInfo of JCK" %>
+<% out.println(getServletInfo()); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.gf
new file mode 100644
index 0000000000..4694145386
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.gf
@@ -0,0 +1,9 @@
+
+positiveLang
+
+
+
+
+hello
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.jsp
new file mode 100644
index 0000000000..e0acf9f4ff
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveLang.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveLang
+
+<% /**	Name: positiveLang
+		Description: Use jsp page directive with the language
+              attribute in a page with the language attribute 
+              set to "java".
+		Result:No error should be returned
+**/ %>
+
+<%@ page language="java" %>
+hello
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveMultipleImport.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveMultipleImport.jsp
new file mode 100644
index 0000000000..6efcff602e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveMultipleImport.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveMultipleImport
+
+<% /**	Name: positiveMultipleImport
+		Description: Validate the multiple import attributes
+                     can be used without causing a fatal translation error.
+		Result:No error
+**/ %>
+<%@ page language="java" import="java.util.Properties" import="java.util.Hashtable" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveNoErrorPageBuff.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveNoErrorPageBuff.gf
new file mode 100644
index 0000000000..5ef1d28a19
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveNoErrorPageBuff.gf
@@ -0,0 +1,6 @@
+
+errorpageNoBuff
+
+This is a test error page
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSession.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSession.jsp
new file mode 100644
index 0000000000..ef223dc9ff
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSession.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSession
+
+<% /**	Name : positiveSession
+		Description:Set the value of the session attribute to "true".
+			   Then try to access the implicit session object and 
+			   call one of its methods
+		Result: Returns the output of the method invoked on the 
+				session object
+**/ %>		
+
+<%@ page session="true" %>
+<% out.println("got "+session.isNew()); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSessionDefault.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSessionDefault.jsp
new file mode 100644
index 0000000000..378ee86e40
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveSessionDefault.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveSessionDefault
+
+<% /**	Name : positiveSessionDefault
+		Description:Do not set the value of the session at all.
+			    Try to invoke a method on the implicit session
+			    object.
+		Result: Returns the output of the method invoked on the session 
+				object.
+**/ %>		
+
+<% out.println("got "+session.isNew()); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/willNotSee.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/willNotSee.jsp
new file mode 100644
index 0000000000..64ee60009c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/willNotSee.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page isErrorPage="true"  %>
+This error page must not be displayed since the jsp page
+defines an errorPage.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/WEB-INF/common.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/WEB-INF/common.tld
new file mode 100644
index 0000000000..2062dae7b6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/WEB-INF/common.tld
@@ -0,0 +1,35 @@
+
+
+
+
+    1.0
+    common
+    
+        simple
+        com.sun.ts.tests.jsp.common.tags.tck.SimpleTag
+        JSP 
+        
+            echo
+            true
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/jsp_core_syntx_direct_taglib_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/jsp_core_syntx_direct_taglib_web.xml
new file mode 100644
index 0000000000..c87925299e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/jsp_core_syntx_direct_taglib_web.xml
@@ -0,0 +1,31 @@
+
+
+
+
+  JspCorSynDirctTaglib
+  
+    5
+  
+  
+    
+      http://java.sun.com/tck/jsp/common
+      /WEB-INF/common.tld
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/positiveTagLib.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/positiveTagLib.jsp
new file mode 100644
index 0000000000..6bf233d2ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/taglib/positiveTagLib.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+positiveTagLib
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/common" prefix="common" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/Errorpage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/Errorpage.jsp
new file mode 100644
index 0000000000..823f62c85b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/Errorpage.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkException
+
+<%@ page isErrorPage="true" %>
+
+
+Is exception an instance of java.lang.ArithmeticException: <%= exception instanceof java.lang.ArithmeticException %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.gf
new file mode 100644
index 0000000000..93b84d15a2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.gf
@@ -0,0 +1,10 @@
+
+checkApplication Test 
+
+
+
+
+true

+Value of Context Init parameter param1: bilbo

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.jsp
new file mode 100644
index 0000000000..4e225840db
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkApplication.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkApplication Test 
+
+<% /**	Name:checkApplicationTest
+		Description: Returns true if application
+		 	is of type jakarta.servlet.ServletContext
+		 	else returns false. Then verify that the
+            Context init parameter, contextParam1, is
+            available using the application object.
+		Result: Returns true if the application object
+                is the correct object type and print 
+                a non-null value for the context init 
+                parameter.
+**/ %>
+
+
+<%= (application instanceof jakarta.servlet.ServletContext) %>

+Value of Context Init parameter param1: <%= application.getInitParameter( "contextParam1" ) %>

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.gf
new file mode 100644
index 0000000000..c69121dcc7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.gf
@@ -0,0 +1,11 @@
+
+checkConfig Test 
+
+
+
+true
+

+Value of param1 is: hobbit

+Value of param2 is: gollum

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp
new file mode 100644
index 0000000000..8adf08296c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkConfig.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkConfig Test 
+
+<% /**	Name:checkConfig
+		Description: Checks whether configuration information
+			 is being passed to the server page. Verify that the
+             implicit config object is an instance of
+             jakarta.servlet.ServletConfig and then print out the
+             values of two servlet initialization parameters.
+		Result: Display true and the values of configParam1 and configParam2 
+**/ %>
+
+<%= (config instanceof jakarta.servlet.ServletConfig) %>
+

+Value of param1 is: <%= config.getInitParameter( "configParam1" ) %>

+Value of param2 is: <%= config.getInitParameter( "configParam2" ) %>

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.gf
new file mode 100644
index 0000000000..24b5ae710a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.gf
@@ -0,0 +1,9 @@
+
+checkException
+
+
+
+
+Is exception an instance of java.lang.ArithmeticException: true
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.jsp
new file mode 100644
index 0000000000..61851a80be
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkException.jsp
@@ -0,0 +1,42 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkException Test 
+
+<% /**	Name:checkExceptionTest
+		Description: Cause a java.lang.ArithmeticException by 
+                     dividing by zero.  The Exception should
+                     be passed to the error page as specified
+                     by the errorPage attribute of the page
+                     directive.  The errorpage will verify the
+                     type of exception.
+			 type java.lang.Throwable
+        Result: Errorpage is called up, where this check is done.
+                Should return true.					 
+**/ %>
+
+<%@ page errorPage="Errorpage.jsp" %>
+
+<%
+ int i=0; 
+ int j=9;
+ int k=j/i;
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.gf
new file mode 100644
index 0000000000..18b7fb3265
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.gf
@@ -0,0 +1,8 @@
+
+checkOut
+
+
+
+true
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.jsp
new file mode 100644
index 0000000000..5a9a9635b6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkOut.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkOut
+
+<% /** Name: checkOut
+	   Description: Checking 'out' is of the type
+	   		 jakarta.servlet.jsp.JspWriter
+	   Result: true	   	
+**/ %>
+
+<%= (out instanceof jakarta.servlet.jsp.JspWriter ) %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.gf
new file mode 100644
index 0000000000..67f189b159
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.gf
@@ -0,0 +1,9 @@
+
+checkPage
+
+
+
+true

+true

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.jsp
new file mode 100644
index 0000000000..beb0dc8d77
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPage.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkPage
+
+<% /**	Name: checkPage
+	    Description: Validate that the implicit page
+                     object is of type java.lang.Object.
+                     Also verify that this is the same
+                     reference as page.
+		Result: writes true twice.
+**/ %>
+
+<%= (page instanceof java.lang.Object ) %>

+<%= ( page == this ) %>

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.gf
new file mode 100644
index 0000000000..374393ffed
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.gf
@@ -0,0 +1,10 @@
+
+checkPageContext
+
+
+
+true

+true

+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp
new file mode 100644
index 0000000000..1cfddc1fcb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkPageContext.jsp
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkPageContext
+
+<% /**	Name:checkPageContext 
+        Description: Verify that implicit object pageContext
+                     is an instance of jakarta.servlet.jsp.PageContext.
+                     Then use PageContext.setAttribute() and 
+                     PageContext.getAttribute() to set and retrieve
+                     an attribute from the page.
+		Result: true should be returned twice. 
+**/ %>
+
+<%= (pageContext instanceof jakarta.servlet.jsp.PageContext) %>

+<%
+    pageContext.setAttribute( "available", new String( "true" ), PageContext.PAGE_SCOPE );
+    String temp = (String) pageContext.findAttribute( "available" );
+    out.print( temp );
+%>

+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.gf
new file mode 100644
index 0000000000..fb15c6e248
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.gf
@@ -0,0 +1,19 @@
+
+checkRequest
+
+
+
+true
+
+

+
+HTTP/1.0
+
+

+
+
+
+2
+

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp
new file mode 100644
index 0000000000..dd2fc56fa1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkRequest.jsp
@@ -0,0 +1,41 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkRequest
+
+<% /** Name:checkRequest
+	   Description: Checks whether 'request' is an instance 
+	   		of jakarta.servlet.ServletRequest and uses the request
+	   		object for getting the protocol and getting parameter 
+	   		value passing Years.
+		Result:returns true,HTTP/1.0,2 	
+**/ %>
+
+<%= (request instanceof jakarta.servlet.ServletRequest) %>
+
+

+
+<% out.println(request.getProtocol()); %>
+

+
+
+
+<% out.println(request.getParameter("Years")); %>

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.gf
new file mode 100644
index 0000000000..034b39ef48
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.gf
@@ -0,0 +1,9 @@
+
+checkResponse
+
+
+
+true

+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp
new file mode 100644
index 0000000000..22782b0c3b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkResponse.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkResponse
+
+<% /**	Name:checkResponse
+		Description: Checks whether response is an object
+			 of type jakarta.servlet.ServletResponse. Then verify
+             that a method can be called against the response object.
+**/ %>
+
+<%= (response instanceof jakarta.servlet.ServletResponse) %>

+<% 
+   response.addHeader("TestHeader", "Method call OK");
+%>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.gf
new file mode 100644
index 0000000000..783042bb06
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.gf
@@ -0,0 +1,12 @@
+
+checkSession Test 
+
+
+
+true
+

+

+ true 
+

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.jsp
new file mode 100644
index 0000000000..f82bb66557
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/checkSession.jsp
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+checkSession Test 
+
+<% /**	Name:checkSession
+		Description: Checking 'session' is of type jakarta.servlet.HttpSession
+			  and also whether an identifier is assigned to this session
+			  or not.
+		Result: returns true		
+**/ %>
+
+<%= (session instanceof jakarta.servlet.http.HttpSession) %>
+

+

+<% 
+   if(session.getId()!=null) {
+%> true <% }
+   else {
+%> false <% } %>
+

+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/jsp_coresyntx_implicitobjects_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/jsp_coresyntx_implicitobjects_web.xml
new file mode 100644
index 0000000000..e97d82a5f4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/implicitobjects/jsp_coresyntx_implicitobjects_web.xml
@@ -0,0 +1,46 @@
+
+
+
+
+  JspCorSynImplicitObj
+  
+    contextParam1
+    bilbo
+  
+  
+    checkConfigLogicalName
+    /checkConfig.jsp
+    
+      configParam1
+      hobbit
+    
+    
+      configParam2
+      gollum
+    
+    0
+  
+  
+    checkConfigLogicalName
+    /checkConfig
+  
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/jsp_coresyntx_script_declaration_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/jsp_coresyntx_script_declaration_web.xml
new file mode 100644
index 0000000000..92f8d59a6b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/jsp_coresyntx_script_declaration_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynScrptDeclar
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.gf
new file mode 100644
index 0000000000..6733f7504a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.gf
@@ -0,0 +1,10 @@
+
+positiveDeclaration
+
+
+
+
+627
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jsp
new file mode 100644
index 0000000000..0fa1eee8fb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jsp
@@ -0,0 +1,71 @@
+<%--
+
+  The Apache Software License, Version 1.1
+
+  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
+  reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer. 
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The end-user documentation included with the redistribution, if
+     any, must include the following acknowlegement:  
+        "This product includes software developed by the 
+         Apache Software Foundation (http://www.apache.org/)."
+     Alternately, this acknowlegement may appear in the software itself,
+     if and wherever such third-party acknowlegements normally appear.
+  
+  4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+     Foundation" must not be used to endorse or promote products derived
+     from this software without prior written permission. For written 
+     permission, please contact apache@apache.org.
+
+  5. Products derived from this software may not be called "Apache"
+     nor may "Apache" appear in their names without prior written
+     permission of the Apache Group.
+
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+  ====================================================================
+
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the Apache Software Foundation.  For more
+  information on the Apache Software Foundation, please see
+  .
+
+--%>
+
+
+positiveDeclaration
+
+<% /**	Name : positiveDeclaration
+		Description: Create a JSP page with a valid Java 
+			declaration element. Use the declared variable 
+			in the page in a scriptlet.   
+		Result: No error  
+ **/ %>
+
+<%! int i=627; %>
+<% out.println(i); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jspx
new file mode 100644
index 0000000000..77dd11bb48
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/declaration/positiveDeclaration.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+    
+    
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ELTernaryOperatorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ELTernaryOperatorTest.jsp
new file mode 100644
index 0000000000..6f3658b9eb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ELTernaryOperatorTest.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+     Conditional Operator - A ? B : C
+     Evaluate B or C, depending on the result of the evaulation of A
+--%>
+
+${'true' ? 'Test PASSED' : 'Test FAILED'}
+${'false' ? 'Test FAILED' : 'Test PASSED'}
+${1 > 0 ? 'Test PASSED' : 'Test FAILED'}
+${2 <= 2 ? 'Test PASSED' : 'Test FAILED'}
+${1 > 2 ? 'Test FAILED' : 'Test PASSED'}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElAttributeSearchTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElAttributeSearchTest.jsp
new file mode 100644
index 0000000000..286d3a50de
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElAttributeSearchTest.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%
+    pageContext.setAttribute("pageScoped", "page");
+    pageContext.setAttribute("requestScoped", "request", PageContext.REQUEST_SCOPE);
+    pageContext.setAttribute("sessionScoped", "session", PageContext.SESSION_SCOPE);
+    pageContext.setAttribute("applicationScoped", "application", PageContext.APPLICATION_SCOPE);
+%>
+
+
+ 
+  
+   
+    
+   
+  
+ 
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators1Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators1Test.jsp
new file mode 100644
index 0000000000..6f4e9c25a3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators1Test.jsp
@@ -0,0 +1,188 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page
+	import="java.math.BigDecimal,java.math.BigInteger"%>
+<%@ page contentType="text/plain"%>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"%>
+<%
+    pageContext.setAttribute("asdf", "asdf");
+
+    Float f1 = new Float(1.5f);
+    Float f2 = new Float(1.5e-4f);
+    Float f3 = new Float(1.5E+4);
+    BigDecimal bd1 = new BigDecimal(1.6d);
+    BigInteger bi1 = new BigInteger("5");
+    pageContext.setAttribute("float1", f1);
+    pageContext.setAttribute("float2", f2);
+    pageContext.setAttribute("float3", f3);
+    pageContext.setAttribute("double1", new Double(1.5d));
+    pageContext.setAttribute("double2", new Double(1.5e-4d));
+    pageContext.setAttribute("double3", new Double(1.5E+4d));
+    pageContext.setAttribute("long1", new Long(4));
+    pageContext.setAttribute("integer1", new Integer(5));
+    pageContext.setAttribute("short1", new Short((short) 6));
+    pageContext.setAttribute("string1", "1.5");
+    pageContext.setAttribute("string2", "1.5e-4");
+    pageContext.setAttribute("string3", "1.5E+4");
+    pageContext.setAttribute("bigdecimal1", bd1);
+    pageContext.setAttribute("biginteger1", bi1);
+    Double fPlus = new Double(f1.doubleValue() + f2.doubleValue()
+		    + f3.doubleValue());
+    Double fMinus = new Double(f1.doubleValue() - f2.doubleValue()
+		    - f3.doubleValue());
+    Double fMult = new Double(f1.doubleValue() * f2.doubleValue()
+		    * f3.doubleValue());
+    Double dPlus = new Double(1.5d + 1.5e-4d + 1.5E+4d);
+    Double dMinus = new Double(1.5d - 1.5e-4d - 1.5E+4d);
+    Double dMult = new Double(1.5d * 1.5e-4d * 1.5E+4d);
+    Double dMixPlus = new Double(1.5d + 4d);
+    Double dMixMinus = new Double(1.5d - 5d);
+    Double dMixMult = new Double(1.5d * 6d);
+
+    BigDecimal bigDecPlus = bd1.add(new BigDecimal(f1.doubleValue()));
+    BigDecimal bigDecMinus = bd1.subtract(new BigDecimal(bi1));
+    BigDecimal bigDecMult = bd1.multiply(new BigDecimal("1.5e-4"));
+    BigDecimal bigDecPlus1 = bd1.add(new BigDecimal(
+		    new Short((short) 6).doubleValue()));
+    BigDecimal bigDecMinus1 = bd1.subtract(new BigDecimal(
+		    new Integer(5).doubleValue()));
+    BigDecimal bigDecMult1 = bd1.multiply(new BigDecimal(new Long(4)
+		    .doubleValue()));
+
+    BigDecimal bigIntPlusFloat = new BigDecimal(bi1)
+		    .add(new BigDecimal(f1.doubleValue()));
+    BigDecimal bigIntMinusDouble = new BigDecimal(bi1)
+		    .subtract(new BigDecimal("1.5"));
+    BigDecimal bigIntMultString = new BigDecimal(bi1)
+		    .multiply(new BigDecimal("1.5"));
+
+    BigInteger bigIntPlus = bi1.add(new BigInteger(new Integer(5)
+		    .toString()));
+    BigInteger bigIntMinus = bi1.subtract(new BigInteger(new Long(4)
+		    .toString()));
+    BigInteger bigIntMult = bi1.multiply(new BigInteger(new Short(
+		    (short) 6).toString()));
+
+    Long lPlus = new Long(4 + 5);
+    Long lMinus = new Long(4 - 5);
+    Long lMult = new Long(4 * 5);
+    Integer iZero = new Integer(0);
+%>
+<%-- Validates binary operators +, -, * --%>
+
+<%
+    try {
+%>
+${asdf - 6} Test FAILED. Exception did not occur when trying to evaluate
+"'asdf' - 6" using binary operator -.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+${asdf * 6} Test FAILED. Exception did not occur when trying to evaluate
+"'asdf' * 6" using binary operator *.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+
+	
+		
+			
+				
+					
+						
+							
+								
+									
+										
+											
+												
+													
+														
+															
+																
+																	
+																		
+																			
+																				
+																					
+																						
+																							
+																								
+																							
+																						
+																					
+																				
+																			
+																		
+																	
+																
+															
+														
+													
+												
+											
+										
+									
+								
+							
+						
+					
+				
+			
+		
+	
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators2Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators2Test.jsp
new file mode 100644
index 0000000000..b4ce1beea0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators2Test.jsp
@@ -0,0 +1,101 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.math.BigDecimal,
+                 java.math.BigInteger"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+<%
+    pageContext.setAttribute("asdf", "asdf");
+
+    Float f1 = new Float(1.5f);
+    Float f2 = new Float(1.5e-4f);
+    Float f3 = new Float(1.5E+4);
+    BigDecimal bd1 = new BigDecimal(1.6d);
+    BigInteger bi1 = new BigInteger("5");
+    Long l1 = new Long(4);
+    Integer i1 = new Integer(5);
+    Short s1 = new Short((short) 6);
+    pageContext.setAttribute("long1", l1);
+    pageContext.setAttribute("integer1", i1);
+    pageContext.setAttribute("short1", s1);
+    pageContext.setAttribute("float1", f1);
+    pageContext.setAttribute("float2", f2);
+    pageContext.setAttribute("float3", f3);
+    pageContext.setAttribute("double1", new Double(1.5d));
+    pageContext.setAttribute("double2", new Double(1.5e-4d));
+    pageContext.setAttribute("double3", new Double(1.5E+4d));
+    pageContext.setAttribute("string1", "1.5");
+    pageContext.setAttribute("string2", "1.5e-4");
+    pageContext.setAttribute("string3", "1.5E+4");
+    pageContext.setAttribute("bigdecimal1", bd1);
+    pageContext.setAttribute("biginteger1", bi1);
+    Double fDiv = new Double(f1.doubleValue() / f2.doubleValue() / f3.doubleValue());
+    Double dDiv = new Double(1.5d / 1.5e-4 / 1.5E+4);
+    Integer iZero = new Integer(0);
+    Double lDiv = new Double(l1.doubleValue() / s1.doubleValue());
+    Double iDiv = new Double(i1.doubleValue() / s1.doubleValue());
+    BigDecimal bdDiv1 = bd1.divide(new BigDecimal(bi1), BigDecimal.ROUND_HALF_UP);
+    BigDecimal bdDiv2 = bd1.divide(new BigDecimal(new Double(1.5d).doubleValue()), BigDecimal.ROUND_HALF_UP);
+    BigDecimal bdDiv3 = new BigDecimal(bi1).divide(new BigDecimal(new Double(1.5d).doubleValue()), BigDecimal.ROUND_HALF_UP);
+    BigDecimal bdDiv4 = new BigDecimal(bi1).divide(bd1, BigDecimal.ROUND_HALF_UP);
+
+%>
+<%-- Validates binary operators / and div --%>
+
+<% try { %>
+    ${asdf / 6}
+    Test FAILED.  Exception did not occur when trying to evaluate
+    "'asdf' / 6" using binary operator +.
+<% } catch (Throwable t) { } %>
+
+
+
+
+    
+        
+            
+                
+                    
+                        
+                           
+                              
+                                
+                                   
+                                
+                              
+                           
+                        
+                    
+                
+            
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators3Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators3Test.jsp
new file mode 100644
index 0000000000..5c595f8a28
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators3Test.jsp
@@ -0,0 +1,105 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.math.BigDecimal,
+                 java.math.BigInteger"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+<%
+    pageContext.setAttribute("asdf", "asdf");
+
+    Float f1 = new Float(1.5f);
+    Float f2 = new Float(1.5e-4);
+    Float f3 = new Float(1.5E+4);
+    BigDecimal bd1 = new BigDecimal(1.6d);
+    BigInteger bi1 = new BigInteger("5");
+    pageContext.setAttribute("bigdecimal1", bd1);
+    pageContext.setAttribute("biginteger1", bi1);
+    pageContext.setAttribute("float1", f1);
+    pageContext.setAttribute("float2", f2);
+    pageContext.setAttribute("float3", f3);
+    pageContext.setAttribute("double1", new Double(1.5d));
+    pageContext.setAttribute("double2", new Double(1.5e-4d));
+    pageContext.setAttribute("double3", new Double(1.5E+4d));
+    pageContext.setAttribute("long1", new Long(4));
+    pageContext.setAttribute("integer1", new Integer(5));
+    pageContext.setAttribute("short1", new Short((short) 6));
+    pageContext.setAttribute("string1", "1.5");
+    pageContext.setAttribute("string2", "1.5e-4");
+    pageContext.setAttribute("string3", "1.5E+4");
+    Double fMod = new Double(f1.doubleValue() % f2.doubleValue() % f3.doubleValue());
+    Double dMod = new Double(1.5d % 1.5e-4d % 1.5E+4d);
+    Double dMixMod = new Double(1.5d % 4d);
+    Double bigDecimal1 = new Double(bd1.doubleValue() % f1.doubleValue());
+    Double bigDecimal2 = new Double(bd1.doubleValue() % new Double("1.5").doubleValue());
+    Double bigDecimal3 = new Double(bd1.doubleValue() % bi1.doubleValue());
+    Double bigDecimal4 = new Double(bd1.doubleValue() % bd1.doubleValue());
+    Double bigInteger1 = new Double(1.5d % bi1.doubleValue());
+    BigInteger bigInteger2 = bi1.remainder(new BigInteger(new Integer(5).toString()));
+
+    Long lMod = new Long(4 % 5);
+    Integer iZero = new Integer(0);
+%>
+<%-- Validates binary operators % and mod --%>
+
+<% try { %>
+    ${asdf % 6}
+    Test FAILED.  Exception did not occur when trying to evaluate
+    "'asdf' % 6" using binary operator +.
+<% } catch (Throwable t) { } %>
+
+
+
+
+    
+        
+            
+                
+                    
+                        
+                           
+                              
+                                  
+                                     
+                                        
+                                           
+                                        
+                                     
+                                  
+                              
+                           
+                        
+                    
+                
+            
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators4Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators4Test.jsp
new file mode 100644
index 0000000000..16f2718639
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBinaryOperators4Test.jsp
@@ -0,0 +1,47 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%
+    Boolean True = new Boolean(true);
+    Boolean False = new Boolean(false);
+    pageContext.setAttribute("True", True);
+    pageContext.setAttribute("False", False);
+%>
+
+<%-- validate binary operators &&, and, ||, and or --%>
+
+    
+        
+            
+                
+                    
+                        
+                            
+                        
+                    
+                
+            
+        
+    
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanCoercionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanCoercionTest.jsp
new file mode 100644
index 0000000000..55f8398834
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanCoercionTest.jsp
@@ -0,0 +1,45 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain"%>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"%>
+
+
+
+<%
+    try {
+%>
+
+Test FAILED. Failure didn't occur when attempting to coerce 'TypeBean'
+to a Boolean.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%-- Validate coercions to Boolean --%>
+
+	
+
+		
+	
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanLiteralTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanLiteralTest.jsp
new file mode 100644
index 0000000000..fa1ddd4f60
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElBooleanLiteralTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"  %>
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElCharacterCoercionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElCharacterCoercionTest.jsp
new file mode 100644
index 0000000000..d5b1c8b0a6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElCharacterCoercionTest.jsp
@@ -0,0 +1,69 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
+<%-- Validate that if a Boolean or boolean is provided to
+     an action that accepts a Character, an error occurs --%>
+<% try { %>
+
+Test FAILED.  Coercion from boolean to Char didn't result in an error.
+<% } catch (Throwable t) { } %>
+
+<% try { %>
+
+Test FAILED.  Coercion from Boolean to Char didn't result in an error.
+<% } catch (Throwable t) { } %>
+
+<%-- Validate that if any uncoercable type is provided, an error is raised --%>
+<% try { %>
+
+<% } catch (Throwable t) { } %>
+
+<%-- Validate coercion to Character --%>
+
+ 
+  
+   
+    
+     
+      
+       
+        
+         
+        
+       
+      
+     
+    
+   
+  
+ 
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaBeanAccessTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaBeanAccessTest.jsp
new file mode 100644
index 0000000000..bc70e4e93f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaBeanAccessTest.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
+
+
+<% try { %>
+    ${ecma.exception}
+    Test FAILED.  Accessed a bean whose getter method throws an exception,
+    but the exception wasn't propagated by the EL machinery.
+<% } catch (Throwable t) {
+       out.clearBuffer();
+} %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaListArrayTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaListArrayTest.jsp
new file mode 100644
index 0000000000..da7a770395
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaListArrayTest.jsp
@@ -0,0 +1,54 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page import="java.util.ArrayList,
+                 java.util.List"%>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%
+    List list = new ArrayList();
+    list.add("element1");
+    list.add("element2");
+    String[] sArray = new String[] { "value1", "value2" };
+    pageContext.setAttribute("tckArray", sArray);
+    pageContext.setAttribute("tckList", list);
+%>
+
+<%-- validate failure of expr-b coersion to int --%>
+
+<% try { %>
+    ${tckList['asdf']}
+    Test FAILED.  Expression 'tckList['asdf']' should not have been evaluated.
+<% } catch (Throwable t) { } %>
+
+<% try { %>
+   ${tckArray['asdf']}
+   Test FAILED.  Expression 'tckArray['asdf']' should not have been evaluated.
+<% } catch (Throwable t) { } %>
+
+
+<%-- Validate return values --%>
+
+    
+        
+            
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaMapTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaMapTest.jsp
new file mode 100644
index 0000000000..ad9594678a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaMapTest.jsp
@@ -0,0 +1,37 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ page import="java.util.HashMap,
+                 java.util.Map"%>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%
+    Map map = new HashMap();
+    map.put("key1", "value1");
+    pageContext.setAttribute("tckMap", map);
+%>
+
+
+    
+        
+            
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaNullValuesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaNullValuesTest.jsp
new file mode 100644
index 0000000000..01fb5f0a48
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEcmaNullValuesTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+    
+        
+            
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEmptyOperatorTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEmptyOperatorTest.jsp
new file mode 100644
index 0000000000..0989d884fc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElEmptyOperatorTest.jsp
@@ -0,0 +1,76 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.util.List,
+                 java.util.ArrayList,
+                 java.util.Map,
+                 java.util.HashMap,
+                 java.util.Collection"%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%
+    List eList = new ArrayList();
+    List neList = new ArrayList();
+    neList.add("string");
+    Collection eCollection = eList;
+    Collection neCollection = neList;
+    Map eMap = new HashMap();
+    Map neMap = new HashMap();
+    neMap.put("key", "value");
+    String[] eArray = new String[] { };
+    String[] neArray = new String[] { "string" };
+    pageContext.setAttribute("emptyList", eList);
+    pageContext.setAttribute("nonEmptyList", neList);
+    pageContext.setAttribute("emptyCollection", eCollection);
+    pageContext.setAttribute("nonEmptyCollection", neCollection);
+    pageContext.setAttribute("emptyMap", eMap);
+    pageContext.setAttribute("nonEmptyMap", neMap);
+    pageContext.setAttribute("emptyArray", eArray);
+    pageContext.setAttribute("nonEmptyArray", neArray);
+    pageContext.setAttribute("emptyString", "");
+    pageContext.setAttribute("nonEmptyString", "string");
+    Boolean False = new Boolean(false);
+    Boolean True = new Boolean(true);
+%>
+
+<%-- Validate the EL 'empty' operator --%>
+
+ 
+  
+   
+    
+     
+      
+       
+        
+         
+          
+         
+        
+       
+      
+     
+    
+   
+  
+ 
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFloatingPointLiteralTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFloatingPointLiteralTest.jsp
new file mode 100644
index 0000000000..c57c13fea9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFloatingPointLiteralTest.jsp
@@ -0,0 +1,68 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"  %>
+
+ 
+    
+        
+          
+            
+                
+                   
+                       
+                          
+                             
+                                
+                                     
+                                         
+                                              
+                                                 
+                                                      
+                                                 
+                                              
+                                          
+                                      
+                                  
+                              
+                          
+                      
+                  
+              
+          
+        
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionInvocationTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionInvocationTest.jsp
new file mode 100644
index 0000000000..64721427b6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionInvocationTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+${el:substring(1,12,'TTest PASSEDD')}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionNamespaceTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionNamespaceTest.jsp
new file mode 100644
index 0000000000..1977023e6a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElFunctionNamespaceTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitApplicationScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitApplicationScopeTest.jsp
new file mode 100644
index 0000000000..eedf436159
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitApplicationScopeTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<% pageContext.setAttribute("application", "applicationScope", PageContext.APPLICATION_SCOPE); %>
+
+<% pageContext.removeAttribute("application", PageContext.APPLICATION_SCOPE); %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitCookieTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitCookieTest.jsp
new file mode 100644
index 0000000000..2ea5f0db9c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitCookieTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderTest.jsp
new file mode 100644
index 0000000000..6f59b3bd7b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderValuesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderValuesTest.jsp
new file mode 100644
index 0000000000..85d168e8df
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitHeaderValuesTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitInitParamTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitInitParamTest.jsp
new file mode 100644
index 0000000000..f5c4213547
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitInitParamTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageContextTest.jsp
new file mode 100644
index 0000000000..fd116994e9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageContextTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageScopeTest.jsp
new file mode 100644
index 0000000000..5280026523
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitPageScopeTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<% pageContext.setAttribute("page", "pageScope"); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamTest.jsp
new file mode 100644
index 0000000000..a5a707221a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamValuesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamValuesTest.jsp
new file mode 100644
index 0000000000..0a6d7775fb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitParamValuesTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitRequestScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitRequestScopeTest.jsp
new file mode 100644
index 0000000000..f9cfbdfbb6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitRequestScopeTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<% pageContext.setAttribute("request", "requestScope", PageContext.REQUEST_SCOPE); %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitSessionScopeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitSessionScopeTest.jsp
new file mode 100644
index 0000000000..0ce9b1ddb9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElImplicitSessionScopeTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<% pageContext.setAttribute("session", "sessionScope", PageContext.SESSION_SCOPE); %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElIntegerLiteralTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElIntegerLiteralTest.jsp
new file mode 100644
index 0000000000..7fa1d7e934
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElIntegerLiteralTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"  %>
+
+
+    
+        
+          
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElInvocationAndUsageTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElInvocationAndUsageTest.jsp
new file mode 100644
index 0000000000..4b2511cca7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElInvocationAndUsageTest.jsp
@@ -0,0 +1,47 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+<%
+    pageContext.setAttribute("eval", "Evaluated");
+%>
+<%--
+     EL is invoked via the construct ${expr}
+     and must be interpreted by the container
+     when provided as body content of a custom
+     action, an attribute of a custom attribute
+     that accepts rtexpr values or in template
+     text outside of any action.  Expressions will
+     not be evaluated when provided as body content
+     to custom actions have a body type of 'tagdependent'.
+ --%>
+
+Expression in template text: ${pageScope.eval}
+These should not be evaluated: {pageScope.eval}, pageScope.eval}, {pageScope.eval
+
+
+
+    Expression in body of action: ${pageScope.eval}
+
+
+
+    Expression in body of tagdependent body content tag: ${pageScope.eval}
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonExistingFunctionNameTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonExistingFunctionNameTest.jsp
new file mode 100644
index 0000000000..2da337bc37
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonExistingFunctionNameTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+${el:noPossibleWayThisFunctionCouldExist()}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonMatchingFunctionSignatureTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonMatchingFunctionSignatureTest.jsp
new file mode 100644
index 0000000000..f5c4883b46
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonMatchingFunctionSignatureTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+${el:substring(1,'TTestPASSED')}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonStaticPublicFunctionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonStaticPublicFunctionTest.jsp
new file mode 100644
index 0000000000..f6e8c85003
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNonStaticPublicFunctionTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el/nonstatic" prefix="el" %>
+${el:toString()}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNullLiteralTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNullLiteralTest.jsp
new file mode 100644
index 0000000000..84cbaff4ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNullLiteralTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"  %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNumberCoercionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNumberCoercionTest.jsp
new file mode 100644
index 0000000000..dc9a309fed
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElNumberCoercionTest.jsp
@@ -0,0 +1,485 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page
+	import="java.math.BigInteger,java.math.BigDecimal"%>
+<%@ page contentType="text/plain"%>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"%>
+
+
+
+<%-- Validate EL Number coercions --%>
+
+<%-- Validate boolean's cause an error condition --%>
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number (Byte) type is
+required and the EL expression yields a Boolean.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Short) is
+required and the EL expression yields a Boolean.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Integer) is
+required and the EL expression yields a Boolean.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Long) is
+required and the EL expression yields a Boolean.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Float) is
+required and the EL expression yields a Boolean.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Double) is
+required and the EL expression yields a Boolean.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%-- Validate failure in the case where strings can't be converted --%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Byte) is
+required and the EL expression is unable to conver the provided String
+expression into a Number type.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Short) is
+required and the EL expression is unable to conver the provided String
+expression into a Number type.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Integer) is
+required and the EL expression is unable to conver the provided String
+expression into a Number type.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Long) is
+required and the EL expression is unable to conver the provided String
+expression into a Number type.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Float) is
+required and the EL expression is unable to conver the provided String
+expression into a Number type.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when a number type (Double) is
+required and the EL expression is unable to conver the provided String
+expression into a Number type.
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%-- Validate error condition for any other type --%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when an Object that can't be
+converted to a Number type is provided as a value for an attribute that
+only accepts Number types (byte).
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when an Object that can't be
+converted to a Number type is provided as a value for an attribute that
+only accepts Number types (Short).
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when an Object that can't be
+converted to a Number type is provided as a value for an attribute that
+only accepts Number types (Integer).
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when an Object that can't be
+converted to a Number type is provided as a value for an attribute that
+only accepts Number types (Long).
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when an Object that can't be
+converted to a Number type is provided as a value for an attribute that
+only accepts Number types (Float).
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%
+    try {
+%>
+
+Test FAILED. Expected an error condition when an Object that can't be
+converted to a Number type is provided as a value for an attribute that
+only accepts Number types (Double).
+<%
+    } catch (Throwable t) {
+    }
+%>
+
+<%-- Validate Number coercions --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElOtherTypeCoercionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElOtherTypeCoercionTest.jsp
new file mode 100644
index 0000000000..aeeba67340
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElOtherTypeCoercionTest.jsp
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
+
+
+<%-- If the target type has no PropertyEditor, fail --%>
+<% try { %>
+
+<% } catch (Throwable t) { } %>
+
+
+ 
+  
+ 
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElPrimitiveBoxedTypeConversionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElPrimitiveBoxedTypeConversionTest.jsp
new file mode 100644
index 0000000000..8724da2970
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElPrimitiveBoxedTypeConversionTest.jsp
@@ -0,0 +1,47 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+
+<%-- Validate Boxed types can be properly converted to primitive types
+     and primitives types can be converted to boxed types.  If the
+     test passes, no visible output will be displayed.  If the test
+     fails, it will be manifest itself as a translation error. --%>
+
+<%-- boxed to primitive --%>
+
+
+
+
+
+
+
+
+
+<%-- primitive to boxed --%>
+
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators1Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators1Test.jsp
new file mode 100644
index 0000000000..00433fa6a6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators1Test.jsp
@@ -0,0 +1,143 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.math.BigDecimal,
+                 java.math.BigInteger"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%
+    Boolean False = new Boolean(false);
+    Boolean True = new Boolean(true);
+    pageContext.setAttribute("float1", new Float(1.5f));
+    pageContext.setAttribute("double1", new Double(1.6d));
+    pageContext.setAttribute("byte1", new Byte((byte) 1));
+    pageContext.setAttribute("short1", new Short((short) 2));
+    pageContext.setAttribute("integer1", new Integer(3));
+    pageContext.setAttribute("character1", new Character('9'));
+    pageContext.setAttribute("long1", new Long(4L));
+    pageContext.setAttribute("string1", "3");
+    pageContext.setAttribute("bigdecimal1", new BigDecimal("5.1"));
+    pageContext.setAttribute("biginteger1", new BigInteger("6"));
+    pageContext.setAttribute("double2", new Double(5.1));
+    pageContext.setAttribute("integer2", new Integer(6));
+%>
+
+
+ 
+  
+   
+    
+     
+      
+       
+        
+         
+          
+           
+            
+             
+              
+               
+                
+                 
+                  
+                   
+                    
+                     
+                      
+                       
+                        
+                         
+                          
+                           
+                            
+                             
+                              
+                               
+                                
+                                 
+                                  
+                                   
+                                    
+                                     
+                                      
+                                       
+                                        
+                                         
+                                          
+                                           
+                                            
+                                             
+                                              
+                                               
+                                                
+                                                 
+                                                
+                                               
+                                              
+                                             
+                                            
+                                           
+                                          
+                                         
+                                        
+                                       
+                                      
+                                     
+                                    
+                                   
+                                  
+                                 
+                                
+                               
+                              
+                             
+                            
+                           
+                          
+                         
+                        
+                       
+                      
+                     
+                    
+                   
+                  
+                 
+                
+               
+              
+             
+            
+           
+          
+         
+        
+       
+      
+     
+    
+   
+  
+ 
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators2Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators2Test.jsp
new file mode 100644
index 0000000000..7a3b759e67
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElRelationalOperators2Test.jsp
@@ -0,0 +1,109 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.math.BigDecimal,
+                 java.math.BigInteger"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%
+    Boolean False = new Boolean(false);
+    Boolean True = new Boolean(true);
+    pageContext.setAttribute("True", True);
+    pageContext.setAttribute("False", False);
+    pageContext.setAttribute("float1", new Float(1.6f));
+    pageContext.setAttribute("double1", new Double(1.6d));
+    pageContext.setAttribute("byte1", new Byte((byte) 1));
+    pageContext.setAttribute("short1", new Short((short) 2));
+    pageContext.setAttribute("integer1", new Integer(3));
+    pageContext.setAttribute("character1", new Character('9'));
+    pageContext.setAttribute("long1", new Long(4L));
+    pageContext.setAttribute("string1", "3");
+    pageContext.setAttribute("bigdecimal1", new BigDecimal(1.6));
+    pageContext.setAttribute("biginteger1", new BigInteger("3"));
+%>
+
+<%-- Validate relation operators '==', '!=', 'eq', 'ne' --%>
+
+
+ 
+  
+   
+    
+     
+      
+       
+        
+         
+          
+           
+            
+             
+              
+               
+                
+                 
+
+                  
+                   
+                    
+                     
+                      
+                       
+                        
+                         
+                          
+                           
+                            
+                             
+                              
+                               
+                                
+                               
+                              
+                             
+                            
+                           
+                          
+                         
+                        
+                       
+                      
+                     
+                    
+                   
+                  
+                 
+                
+               
+              
+             
+            
+           
+          
+         
+        
+       
+      
+     
+    
+   
+  
+ 
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStaticAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStaticAttributeTest.jsp
new file mode 100644
index 0000000000..44b3dc2f65
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStaticAttributeTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringCoercionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringCoercionTest.jsp
new file mode 100644
index 0000000000..2a726c6da9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringCoercionTest.jsp
@@ -0,0 +1,59 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain"%>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringLiteralTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringLiteralTest.jsp
new file mode 100644
index 0000000000..3a40601f70
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElStringLiteralTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el"  %>
+
+
+    
+        
+          "
+                           object="${\'\\\'string\\\'\'}" display="true" />
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators1Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators1Test.jsp
new file mode 100644
index 0000000000..00bcdb7b7e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators1Test.jsp
@@ -0,0 +1,79 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="java.math.BigDecimal,
+                 java.math.BigInteger"%>
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%-- Validate the unary minus ('-') operator --%>
+
+<%
+    pageContext.setAttribute("float1", new Float(1.5f));
+    pageContext.setAttribute("double1", new Double(1.5d));
+    pageContext.setAttribute("long1", new Long(4L));
+    pageContext.setAttribute("integer1", new Integer(-5));
+    pageContext.setAttribute("short1", new Short((short) 6));
+    pageContext.setAttribute("byte1", new Byte((byte) 1));
+    pageContext.setAttribute("string1", "1.5");
+    pageContext.setAttribute("string2", "1.5e-4");
+    pageContext.setAttribute("string3", "1.5E+4");
+    pageContext.setAttribute("string4", "-15");
+    pageContext.setAttribute("bigdecimal1", new BigDecimal("100.5"));
+    pageContext.setAttribute("biginteger1", new BigInteger("125"));
+%>
+
+
+    
+        
+            
+                
+                    
+                        
+                            
+                                
+                                    
+                                        
+                                           
+                                              
+                                           
+                                        
+                                    
+                                
+                            
+                        
+                    
+                
+            
+        
+    
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators2Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators2Test.jsp
new file mode 100644
index 0000000000..1c268d132c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/ElUnaryOperators2Test.jsp
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/el" prefix="el" %>
+
+<%-- validate unary operator '!' and 'not' --%>
+
+<%
+    Boolean True = new Boolean(true);
+    Boolean False = new Boolean(false);
+    pageContext.setAttribute("True", True);
+    pageContext.setAttribute("False", False);
+%>
+
+
+    
+        
+            
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/el.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/el.tld
new file mode 100644
index 0000000000..23654244f3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/el.tld
@@ -0,0 +1,234 @@
+
+
+
+
+    1.0
+    el
+    
+        checkObject
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.CheckObjectTag
+        JSP 
+        
+            name
+            false
+        
+        
+            object
+            true
+            true
+            java.lang.Object
+        
+        
+            control
+            true
+            true
+            java.lang.Object
+        
+    
+    
+        checkLiteral
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.CheckLiteralTag
+        JSP 
+        
+            name
+            false
+        
+        
+            object
+            true
+            true
+            java.lang.Object
+        
+        
+            control
+            true
+            true
+            java.lang.Object
+        
+        
+            display
+            false
+        
+    
+    
+        checkEcma
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.CheckECMATag
+        JSP 
+        
+            name
+            false
+        
+        
+            object
+            true
+            true
+            java.lang.Object
+        
+        
+            control
+            true
+            true
+            java.lang.Object
+        
+        
+            display
+            false
+        
+    
+    
+        checkOperator
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.CheckOperatorTag
+        JSP 
+        
+            name
+            false
+        
+        
+            object
+            true
+            true
+            java.lang.Object
+        
+        
+            control
+            true
+            true
+            java.lang.Object
+        
+        
+            display
+            false
+        
+    
+    
+        checkCoercion
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.CheckCoercionTag
+        JSP 
+        
+            name
+            false
+        
+        
+            object
+            true
+            java.lang.Object
+        
+        
+            control
+            true
+            true
+            java.lang.Object
+        
+        
+            byte
+            true
+            java.lang.Byte
+        
+        
+            char
+            true
+            java.lang.Character
+        
+        
+            short
+            true
+            java.lang.Short
+        
+        
+            int
+            true
+            java.lang.Integer
+        
+        
+            long
+            true
+            java.lang.Long
+        
+        
+            float
+            true
+            java.lang.Float
+        
+        
+            double
+            true
+            java.lang.Double
+        
+        
+            bigInteger
+            true
+            java.math.BigInteger
+        
+        
+            bigDecimal
+            true
+            java.math.BigDecimal
+        
+        
+            string
+            true
+        
+        
+            boolean
+            true
+            java.lang.Boolean
+        
+        
+            typeBean
+            true
+            com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.TypeBean
+        
+        
+            display
+            false
+        
+    
+    
+        echo
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.EchoTag
+        JSP 
+        
+            echo
+            false
+            true
+        
+    
+    
+        dependent
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.EchoTag
+        tagdependent
+    
+    
+        static
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.EchoTag
+        JSP 
+        
+            static
+            false
+        
+    
+    
+        substring
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.ElFunctions
+        java.lang.String substring(int, int, java.lang.String)
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/nonstatic.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/nonstatic.tld
new file mode 100644
index 0000000000..8af2935464
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/WEB-INF/nonstatic.tld
@@ -0,0 +1,31 @@
+
+
+
+
+    1.0
+    nonstatic
+    
+        toString
+        com.sun.ts.tests.jsp.spec.core_syntax.scripting.el.ElFunctions
+        java.lang.String toString()
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/elBinaryOperatorParenthesesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/elBinaryOperatorParenthesesTest.jsp
new file mode 100644
index 0000000000..4c233fa9f7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/elBinaryOperatorParenthesesTest.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+${true and (true && true)}
+${true or (true && false)}
+${7 ne (3 + 2)}
+${7 eq (3 + 4)}
+${7 mod (3 + 2)}
+${7 div (3 + 2)}
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/jsp_coresyntx_script_el_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/jsp_coresyntx_script_el_web.xml
new file mode 100644
index 0000000000..22536921f4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/el/jsp_coresyntx_script_el_web.xml
@@ -0,0 +1,35 @@
+
+
+
+
+  JspCorSynScrptEl
+  
+    5
+  
+  
+    
+        http://java.sun.com/tck/jsp/el
+        /WEB-INF/el.tld
+    
+    
+        http://java.sun.com/tck/jsp/el/nonstatic
+        /WEB-INF/nonstatic.tld
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/jsp_coresyntx_script_escape_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/jsp_coresyntx_script_escape_web.xml
new file mode 100644
index 0000000000..fd81ca1e54
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/jsp_coresyntx_script_escape_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynScrptEscape
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.gf
new file mode 100644
index 0000000000..6b2f14fbe0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.gf
@@ -0,0 +1,23 @@
+
+
+
+
+
+positiveEscapingTest
+
+
+
+Joe said %>
+
+
+
+Joe said "hi!"
+
+
+Joe said <%
+
+
+"Joe said \"hello\""
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.jsp
new file mode 100644
index 0000000000..287c297f24
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/escaping/positiveEscapingTest.jsp
@@ -0,0 +1,39 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%-- Validate recoginition and handling of JSP escape sequences --%>
+
+
+positiveEscapingTest
+
+
+
+<%= "Joe said %\>" %>
+
+
+<% String joes_statement = "hi!"; %>
+<%= "Joe said \"" + joes_statement + "\"" %>
+
+
+Joe said <\%
+
+
+<%= "\"Joe said \\\"hello\\\"\"" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/jsp_coresyntx_script_expressions_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/jsp_coresyntx_script_expressions_web.xml
new file mode 100644
index 0000000000..ed7eeedd76
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/jsp_coresyntx_script_expressions_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynScrptExpress
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.gf
new file mode 100644
index 0000000000..6217d14126
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.gf
@@ -0,0 +1,10 @@
+
+positiveExpr
+
+
+
+
+
+50
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.jsp
new file mode 100644
index 0000000000..a01d66baa6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExpr.jsp
@@ -0,0 +1,72 @@
+<%--
+
+  The Apache Software License, Version 1.1
+
+  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
+  reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer. 
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The end-user documentation included with the redistribution, if
+     any, must include the following acknowlegement:  
+        "This product includes software developed by the 
+         Apache Software Foundation (http://www.apache.org/)."
+     Alternately, this acknowlegement may appear in the software itself,
+     if and wherever such third-party acknowlegements normally appear.
+  
+  4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+     Foundation" must not be used to endorse or promote products derived
+     from this software without prior written permission. For written 
+     permission, please contact apache@apache.org.
+
+  5. Products derived from this software may not be called "Apache"
+     nor may "Apache" appear in their names without prior written
+     permission of the Apache Group.
+
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+  ====================================================================
+
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the Apache Software Foundation.  For more
+  information on the Apache Software Foundation, please see
+  .
+
+--%>
+
+
+positiveExpr
+
+<% /** Name: positiveExpr
+	   Description:Create a valid JSP expression.
+	   Result: The JSP page output with the evaluated
+	   		 value of expression duly inserted in the
+	   		 page.
+**/ %>
+
+<%! int i=10,j=5; %>
+
+<%= i*j %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.gf
new file mode 100644
index 0000000000..9c61289670
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.gf
@@ -0,0 +1,9 @@
+
+positiveExprComment 
+
+
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.jsp
new file mode 100644
index 0000000000..22dc5af7d8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprComment.jsp
@@ -0,0 +1,71 @@
+<%--
+
+  The Apache Software License, Version 1.1
+
+  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
+  reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer. 
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The end-user documentation included with the redistribution, if
+     any, must include the following acknowlegement:  
+        "This product includes software developed by the 
+         Apache Software Foundation (http://www.apache.org/)."
+     Alternately, this acknowlegement may appear in the software itself,
+     if and wherever such third-party acknowlegements normally appear.
+  
+  4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+     Foundation" must not be used to endorse or promote products derived
+     from this software without prior written permission. For written 
+     permission, please contact apache@apache.org.
+
+  5. Products derived from this software may not be called "Apache"
+     nor may "Apache" appear in their names without prior written
+     permission of the Apache Group.
+
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+  ====================================================================
+
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the Apache Software Foundation.  For more
+  information on the Apache Software Foundation, please see
+  .
+
+--%>
+
+
+positiveExprComment 
+
+<% /**	Name:positiveExprComment
+		Description: Create a JSP page with a JSP 
+			  expression inserted into a HTML comment
+		Result: The HTML should contain the value of the
+			  expression inserted into the comment
+**/ %>
+<%! int i=10,j=5; %>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.gf
new file mode 100644
index 0000000000..73fcc34ec9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.gf
@@ -0,0 +1,11 @@
+
+positiveExprWhiteSpace
+
+
+
+100
+100
+100
+100
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.jsp
new file mode 100644
index 0000000000..a14cf98d31
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/expressions/positiveExprWhiteSpace.jsp
@@ -0,0 +1,72 @@
+<%--
+
+  The Apache Software License, Version 1.1
+
+  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
+  reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer. 
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The end-user documentation included with the redistribution, if
+     any, must include the following acknowlegement:  
+        "This product includes software developed by the 
+         Apache Software Foundation (http://www.apache.org/)."
+     Alternately, this acknowlegement may appear in the software itself,
+     if and wherever such third-party acknowlegements normally appear.
+  
+  4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+     Foundation" must not be used to endorse or promote products derived
+     from this software without prior written permission. For written 
+     permission, please contact apache@apache.org.
+
+  5. Products derived from this software may not be called "Apache"
+     nor may "Apache" appear in their names without prior written
+     permission of the Apache Group.
+
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+  ====================================================================
+
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the Apache Software Foundation.  For more
+  information on the Apache Software Foundation, please see
+  .
+
+--%>
+
+
+positiveExprWhiteSpace
+
+<% /**	Name:positiveExprWhiteSpace
+		Description: Create different expressions, varying the whitespace.
+		Result: Should return the HTML of the page with the evaluated
+			    value of the expression
+**/ %>
+<%! int i=10; %>
+<%=i*i%>
+<%= i*i%>
+<%=i*i %>
+<%= i*i %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/jsp_coresyntx_script_scriptlet_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/jsp_coresyntx_script_scriptlet_web.xml
new file mode 100644
index 0000000000..47cdaa3296
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/jsp_coresyntx_script_scriptlet_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspCorSynScrptScrptlet
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.gf
new file mode 100644
index 0000000000..d25815682c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.gf
@@ -0,0 +1,27 @@
+
+positiveScriptlet
+
+
+
+
+
+
+
+ 10 
+
+
+
+
+10 
+
+
+
+10
+
+
+
+ArithmeticException caught!
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.jsp
new file mode 100644
index 0000000000..b244fd9ddd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/scripting/scriptlet/positiveScriptlet.jsp
@@ -0,0 +1,108 @@
+<%--
+
+  The Apache Software License, Version 1.1
+
+  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
+  reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer. 
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+  3. The end-user documentation included with the redistribution, if
+     any, must include the following acknowlegement:  
+        "This product includes software developed by the 
+         Apache Software Foundation (http://www.apache.org/)."
+     Alternately, this acknowlegement may appear in the software itself,
+     if and wherever such third-party acknowlegements normally appear.
+  
+  4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+     Foundation" must not be used to endorse or promote products derived
+     from this software without prior written permission. For written 
+     permission, please contact apache@apache.org.
+
+  5. Products derived from this software may not be called "Apache"
+     nor may "Apache" appear in their names without prior written
+     permission of the Apache Group.
+
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+  ====================================================================
+
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the Apache Software Foundation.  For more
+  information on the Apache Software Foundation, please see
+  .
+
+--%>
+
+
+positiveScriptlet
+
+<%  /**  Name:positiveScriptlet
+         Description: Test a series of scriplets.
+         Result: Output of all the scriplets in the order
+                 they appear.
+**/ %>
+
+
+<%
+// simple java comments
+/* multiline java comments
+*/
+%>
+
+
+<%  int i=5;
+    int j=10;
+    if(j>i){
+    %> 10 <% }
+    else {
+    %> 5 <% } %>
+
+
+<%! int k=5; %>
+<%! int l=10; %>
+<% if(l>k){ %>10 <%} else { %>
+5 <% } %>
+
+
+
+<%
+    counter.setCounter(10);
+    out.println(counter.getCounterValue());
+%>
+
+
+<%
+    int q = 0;
+    try {
+        q = ( 9 / 0 );
+    } catch ( ArithmeticException ae ) {
+        out.println( "ArithmeticException caught!" );
+    } finally {
+        q = 0;
+    }
+%>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypes.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypes.jsp
new file mode 100644
index 0000000000..7ded267f9f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/AllowedDynamicAttributeValueTypes.jsp
@@ -0,0 +1,35 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+
+
+begin 

+<%
+   pageContext.setAttribute("dexp", "dollar", PageContext.PAGE_SCOPE);
+   pageContext.setAttribute("vexp", "value", PageContext.PAGE_SCOPE);
+ %>
+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethod.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethod.jsp
new file mode 100644
index 0000000000..83a45372ad
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/DynamicAttributeSetterMethod.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteral.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteral.jsp
new file mode 100644
index 0000000000..0118a0eeea
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteral.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+begin
+  
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError1.jsp
new file mode 100644
index 0000000000..57d8f3e391
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError1.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+begin
+  
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError2.jsp
new file mode 100644
index 0000000000..aa5540c67d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredMethodStringLiteralError2.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+begin
+  
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercion.jsp
new file mode 100644
index 0000000000..0007100c59
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ELDeferredValueCoercion.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+<%@ page language="java" import="com.sun.ts.tests.common.el.spec.Book" %>
+
+begin 

+<% 
+   Book novel = new Book("Moby Dick", "Herman Melville", "Random House", 1849); 
+   pageContext.setAttribute("book", novel, PageContext.PAGE_SCOPE);
+ %>
+
+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp
new file mode 100644
index 0000000000..00a387d73e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%-- jakarta.servlet.* --%>
+${AsyncContext.ASYNC_CONTEXT_PATH}
+
+<%-- jakarta.servlet.jsp.* --%>
+${PageContext.PAGE}
+
+<%-- jakarta.servlet.http.* --%>
+${HttpServletRequest.BASIC_AUTH}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TagLibraryPoundTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TagLibraryPoundTranslationError.jsp
new file mode 100644
index 0000000000..3a133bd679
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TagLibraryPoundTranslationError.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TemplateTextPoundTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TemplateTextPoundTranslationError.jsp
new file mode 100644
index 0000000000..27b9d461fc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/TemplateTextPoundTranslationError.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+
+
+begin 

+    foo is #{foo}
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/WEB-INF/el_jsp.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/WEB-INF/el_jsp.tld
new file mode 100644
index 0000000000..af2d18eeed
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/WEB-INF/el_jsp.tld
@@ -0,0 +1,227 @@
+
+
+
+
+
+    1.0
+    el
+  
+    ELDeferredValueValue test
+    ELDeferredValueValueTag
+    com.sun.ts.tests.jsp.spec.el.jsp.ELDeferredValueValueTag
+    empty
+    
+      litExpr
+      true
+      
+        java.lang.String
+      
+    
+    
+      poundExpr
+      true
+      
+        java.lang.String
+      
+    
+  
+  
+    ELDeferredValueCoercion test
+    ELDeferredValueCoercionTag
+    com.sun.ts.tests.jsp.spec.el.jsp.ELDeferredValueCoercionTag
+    empty
+    
+      intExpr
+      true
+      
+        int
+      
+    
+    
+      bookExpr
+      true
+      
+        java.lang.String
+      
+    
+  
+  
+    ELDeferredMethodValue test
+    ELDeferredMethodValueTag
+    com.sun.ts.tests.jsp.spec.el.jsp.ELDeferredMethodValueTag
+    empty
+    
+      litExpr
+      true
+      
+        java.lang.String name()
+      
+    
+    
+      poundExpr
+      true
+      
+        boolean add(Object)
+      
+    
+  
+  
+    ELDeferredMethodStringLiteral test
+    ELDeferredMethodStringLiteralTag
+    com.sun.ts.tests.jsp.spec.el.jsp.ELDeferredMethodStringLiteralTag
+    empty
+    
+      strExpr
+      true
+      
+        java.lang.String name()
+      
+    
+    
+      dblExpr
+      true
+      
+        double name()
+      
+    
+  
+  
+    ELDeferredMethodStringLiteralError test - void return value
+    ELDeferredMethodStringLiteralError1
+    com.sun.ts.tests.jsp.spec.el.jsp.ELDeferredMethodStringLiteralTag
+    empty
+    
+      strExpr
+      true
+      
+        void name()
+      
+    
+    
+      dblExpr
+      true
+      
+        double name()
+      
+    
+  
+  
+    ELDeferredMethodStringLiteralError test - non-coerceable return value
+    ELDeferredMethodStringLiteralError2
+    com.sun.ts.tests.jsp.spec.el.jsp.ELDeferredMethodStringLiteralTag
+    empty
+    
+      strExpr
+      true
+      
+        int name()
+      
+    
+    
+      dblExpr
+      true
+      
+        double name()
+      
+    
+  
+  
+    TagLibraryPoundTranslationError test
+    TagLibraryPoundTranslationError
+    com.sun.ts.tests.jsp.spec.el.jsp.ELDeferredValueValueTag
+    empty
+    
+      litExpr
+      true
+      
+        java.lang.String
+      
+    
+    
+      poundExpr
+      true
+    
+  
+  
+    AllowedDynamicAttributeValueTypes
+    AllowedDynamicAttributeValueTypes
+    com.sun.ts.tests.jsp.spec.el.jsp.AllowedDynamicAttributeValueTypesTag
+    JSP
+    
+      litExpr
+      true
+      true
+    
+    
+      scriptExpr
+      true
+      true
+    
+    
+      dollarExpr
+      true
+      true
+    
+    
+      valueExpr
+      true
+      true
+      
+        java.lang.Object
+      
+    
+    
+      methodExpr
+      true
+      true
+      
+        boolean add(Object)
+      
+    
+  
+  
+    DynamicAttributeSetterMethod
+    DynamicAttributeSetterMethod
+    com.sun.ts.tests.jsp.spec.el.jsp.DynamicAttributeSetterMethodTag
+    empty
+    
+      num
+      true
+      true
+    
+  
+  
+    Substitute tag for jstl c:set
+    set
+    com.sun.ts.tests.jsp.common.tags.tck.SetTag
+    empty
+    
+      var
+      true
+    
+    
+      value
+      true
+      true
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/jsp_el_jsp_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/jsp_el_jsp_web.xml
new file mode 100644
index 0000000000..62ffd0d28f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/jsp_el_jsp_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspElJsp
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredMethodValue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredMethodValue.jsp
new file mode 100644
index 0000000000..550f4c6277
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredMethodValue.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredValueValue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredValueValue.jsp
new file mode 100644
index 0000000000..23405440c1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/negativeELDeferredValueValue.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredMethodValue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredMethodValue.jsp
new file mode 100644
index 0000000000..47016713bb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredMethodValue.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredValueValue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredValueValue.jsp
new file mode 100644
index 0000000000..edc43151d2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/positiveELDeferredValueValue.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_jsp.tld" %>
+
+
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval1.jsp
new file mode 100644
index 0000000000..1d7015d969
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval1.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_language.tld" %>
+
+begin
+    
+    
+    
+    
+    
+    result is ${result}
+end 
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval2.jsp
new file mode 100644
index 0000000000..17441d931c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/CompositeExprEval2.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_language.tld" %> 
+begin
+    
+    
+    num is ${num} 
+    
+    ${result}
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/DotAndIndexOperatorsSame.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/DotAndIndexOperatorsSame.jsp
new file mode 100644
index 0000000000..c8bdf87bf4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/DotAndIndexOperatorsSame.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_language.tld" %>
+
+begin
+    
+    
+    indexExpr is ${indexExpr}
+    dotExpr is ${dotExpr}
+
+    
+    ${result}
+end 
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ELSyntaxEscape.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ELSyntaxEscape.jsp
new file mode 100644
index 0000000000..0090e248f3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ELSyntaxEscape.jsp
@@ -0,0 +1,94 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             jakarta.el.ValueExpression,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String ESCAPE_DOLLAR_EXPR = "\\${exprA}";
+private static final String ESCAPE_POUND_EXPR = "\\#{exprB}";
+private static final String EXPECTED_DOLLAR_VALUE = "${exprA}";
+private static final String EXPECTED_POUND_VALUE = "#{exprB}";
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+
+                    // parse the value expressions
+                    ValueExpression vexpDollar = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, ESCAPE_DOLLAR_EXPR, ESCAPE_DOLLAR_EXPR.getClass());
+                    ValueExpression vexpPound = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, ESCAPE_POUND_EXPR, ESCAPE_POUND_EXPR.getClass());
+
+                    if (vexpDollar != null && vexpPound != null) {
+                
+                        Class expectedDollarClass = vexpDollar.getExpectedType();
+                        Class expectedPoundClass = vexpPound.getExpectedType();
+
+                        if (expectedDollarClass != String.class) {
+                            out.print("Test FAILED. Got type = " + expectedDollarClass.getName() + " ");
+                            out.println("for " + ESCAPE_DOLLAR_EXPR);
+                            return;
+                        }
+                        if (expectedPoundClass != String.class) {
+                            out.print("Test FAILED. Got type = " + expectedPoundClass.getName() + " ");
+                            out.println("for " + ESCAPE_POUND_EXPR);
+                            return;
+                        }
+
+                        String literalDollarVal = (String) vexpDollar.getValue(elContext);
+                        if (!literalDollarVal.equals(EXPECTED_DOLLAR_VALUE)) {
+                            out.println("Test FAILED. Got literalDollarValue = " + literalDollarVal);
+                            return;
+                        }
+
+                        String literalPoundVal = (String) vexpPound.getValue(elContext);
+                        if (!literalPoundVal.equals(EXPECTED_POUND_VALUE)) {
+                            out.println("Test FAILED. Got literalPoundValue = " + literalPoundVal);
+                            return;
+                        }
+                        out.println("Test PASSED");
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateValueExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr1.jsp
new file mode 100644
index 0000000000..51e090ef41
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr1.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_language.tld" %>
+
+begin
+  
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr2.jsp
new file mode 100644
index 0000000000..94253bb81a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprAsMethodExpr2.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_language.tld" %>
+
+begin
+  
+end
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval1.jsp
new file mode 100644
index 0000000000..c4e287d890
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval1.jsp
@@ -0,0 +1,74 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             jakarta.el.ValueExpression,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String LITERAL_EXPR = "foo";
+private static final String EXPECTED_VALUE = LITERAL_EXPR;
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+
+                    // parse the value expression
+                    ValueExpression vexp = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, LITERAL_EXPR, LITERAL_EXPR.getClass());
+
+                    if (vexp != null) {
+                
+                        Class expectedClass = vexp.getExpectedType();
+                        if (expectedClass != String.class) {
+                            out.println("Test FAILED. Got type = " + expectedClass.getName());
+                            return;
+                        }
+                        String literalVal = (String) vexp.getValue(elContext);
+                        if (!literalVal.equals(EXPECTED_VALUE)) {
+                            out.println("Test FAILED. Got literalValue = " + literalVal);
+                            return;
+                        }
+                        out.println("Test PASSED");
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateValueExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval2.jsp
new file mode 100644
index 0000000000..4f30702715
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/LiteralExprEval2.jsp
@@ -0,0 +1,74 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             jakarta.el.ValueExpression,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String LITERAL_EXPR = "true";
+private static final Boolean EXPECTED_VALUE = Boolean.TRUE;
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+
+                    // parse the value expression
+                    ValueExpression vexp = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, LITERAL_EXPR, EXPECTED_VALUE.getClass());
+
+                    if (vexp != null) {
+                
+                        Class expectedClass = vexp.getExpectedType();
+                        if (expectedClass != Boolean.class) {
+                            out.println("Test FAILED. Got type = " + expectedClass.getName());
+                            return;
+                        }
+                        Boolean literalVal = (Boolean) vexp.getValue(elContext);
+                        if (!literalVal.equals(EXPECTED_VALUE)) {
+                            out.println("Test FAILED. Got literalValue = " + literalVal);
+                            return;
+                        }
+                        out.println("Test PASSED");
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateValueExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ParseOnceEvalMany.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ParseOnceEvalMany.jsp
new file mode 100644
index 0000000000..cb1f98dedb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/ParseOnceEvalMany.jsp
@@ -0,0 +1,79 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             jakarta.el.ValueExpression,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String VARIABLE_EXPR = "${foo}";
+private static final String EXPECTED_VALUE = "bar";
+private static final int ITERATIONS = 5; 
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+
+                    // parse the value expression
+                    ValueExpression vexp = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, VARIABLE_EXPR, VARIABLE_EXPR.getClass());
+
+                    if (vexp != null) {
+                
+                        // set a value for it and do a sanity check
+                        out.println("Setting value for value expression");
+                        vexp.setValue(elContext, EXPECTED_VALUE);
+			for (int i = 1; i <= ITERATIONS; ++i) {
+                            String name = (String) vexp.getValue(elContext);
+                            if (!name.equals(EXPECTED_VALUE)) {
+                                out.println("Test FAILED on iteration " + i);
+                                out.println("Set value = " + EXPECTED_VALUE);
+                                out.println("Got value = " + name); 
+			        return;
+                            }
+                        }
+
+                        out.println("Test PASSED");
+
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateValueExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaning.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaning.jsp
new file mode 100644
index 0000000000..61242bfa60
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/PoundDollarSameMeaning.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/el_language.tld" %>
+
+
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion1.jsp
new file mode 100644
index 0000000000..ae787e2406
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion1.jsp
@@ -0,0 +1,76 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             jakarta.el.ValueExpression,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String VARIABLE_EXPR = "${foo}";
+private static final String EXPECTED_VALUE = "bar";
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+
+                    // parse the value expression
+                    ValueExpression vexp = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, VARIABLE_EXPR, VARIABLE_EXPR.getClass());
+
+                    if (vexp != null) {
+                
+                        // set a value for it 
+                        out.println("Setting value for value expression");
+                        vexp.setValue(elContext, EXPECTED_VALUE);
+
+                        Class expectedClass = vexp.getExpectedType();
+                        Object obj = vexp.getValue(elContext);
+                        
+                        if (!(expectedClass.isInstance(obj))) {
+                            out.println("Test FAILED. Expected type = " + expectedClass.getName());
+                            out.println("Got type = " + obj.getClass().getName()); 
+                        }
+
+                        out.println("Test PASSED");
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateValueExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion2.jsp
new file mode 100644
index 0000000000..e82d22b737
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/RValueCoercion2.jsp
@@ -0,0 +1,79 @@
+<%--
+
+    Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page import="com.sun.ts.tests.jsp.common.util.JspTestUtil,
+             com.sun.ts.tests.common.el.spec.Book,
+             jakarta.el.ValueExpression,
+             jakarta.el.ELContext"%>
+<%@ page contentType="text/plain" %>
+
+<%!
+private static final String VARIABLE_EXPR = "${javabook}";
+private static final String EXPECTED_VALUE = "The Java Programming Language";
+%>
+
+<% 
+    if (pageContext != null) {
+        ELContext elContext = pageContext.getELContext();
+
+        if (elContext != null) {
+            JspApplicationContext jaContext = 
+                    JspFactory.getDefaultFactory().getJspApplicationContext(
+                    pageContext.getServletContext());
+            if (jaContext != null) {
+                
+                try {
+
+                    // parse the value expression
+                    ValueExpression vexp = 
+                            jaContext.getExpressionFactory().createValueExpression(
+                            elContext, VARIABLE_EXPR, VARIABLE_EXPR.getClass());
+
+                    if (vexp != null) {
+                
+                        // set a value for it 
+                        out.println("Setting value for value expression");
+                        vexp.setValue(elContext, 
+                            new Book(EXPECTED_VALUE, "Arnold and Gosling", 
+                                     "Addison Wesley", 1996));
+
+                        Class expectedClass = vexp.getExpectedType();
+                        Object obj = vexp.getValue(elContext);
+                        
+                        if (!(expectedClass.isInstance(obj))) {
+                            out.println("Test FAILED. Expected type = " + expectedClass.getName());
+                            out.println("Got type = " + obj.getClass().getName()); 
+                        }
+
+                        out.println("Test PASSED");
+                    } 
+                    else 
+                        out.println("Test FAILED. Null value returned for expression.");
+                 } catch (Throwable t) {
+                    JspTestUtil.handleThrowable(t, out, "CreateValueExpressionTest");
+                 }
+            }
+            else
+                out.println("Test FAILED. Unable to obtain JspApplicationContext");
+        }
+        else
+            out.println("Test FAILED. Unable to obtain ELContext");
+    } 
+    else 
+        out.println("Test FAILED.  Unable to obtain PageContext.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/WEB-INF/el_language.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/WEB-INF/el_language.tld
new file mode 100644
index 0000000000..ba4ef8600a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/WEB-INF/el_language.tld
@@ -0,0 +1,92 @@
+
+
+
+
+
+  1.0
+  Language
+  
+    PoundDollarSameMeaning test
+    PoundDollarSameMeaningTag
+    com.sun.ts.tests.jsp.spec.el.language.PoundDollarSameMeaningTag
+    empty
+    
+      dollarExpr
+      true
+      true
+      java.lang.String
+    
+    
+      poundExpr
+      true
+      
+        java.lang.String
+      
+    
+  
+  
+    LiteralExprAsMethodExpr1 test
+    MethodStringLiteralTag
+    com.sun.ts.tests.jsp.spec.el.language.MethodStringLiteralTag
+    empty
+    
+      literalMethExpr
+      true
+      
+        java.lang.String name()
+      
+    
+  
+  
+    LiteralExprAsMethodExpr2 test
+    MethodIntegerLiteralTag
+    com.sun.ts.tests.jsp.spec.el.language.MethodIntegerLiteralTag
+    empty
+    
+      literalMethExpr
+      true
+      
+        java.lang.Integer name()
+      
+    
+  
+  
+    Substitute tag for jstl c:set
+    set
+    com.sun.ts.tests.jsp.common.tags.tck.SetTag
+    empty
+    
+      var
+      true
+    
+    
+      value
+      true
+      true
+    
+  
+  
+    count
+    com.sun.ts.tests.jsp.spec.el.language.Count
+    int count()
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/jsp_el_language_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/jsp_el_language_web.xml
new file mode 100644
index 0000000000..b8bdf93401
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/language/jsp_el_language_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspElLanguage
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NBadTagPageEncoding.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NBadTagPageEncoding.jsp
new file mode 100644
index 0000000000..3fa628b199
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NBadTagPageEncoding.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NContTypeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NContTypeTest.jsp
new file mode 100644
index 0000000000..c565e20dde
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NContTypeTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain; charset=ISO-8859-15" %>
+
+${'Test PASSED'}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NIncludedContentTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NIncludedContentTest.jsp
new file mode 100644
index 0000000000..9d81588493
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NIncludedContentTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page pageEncoding="ISO-8859-1" %>
+<% pageContext.setAttribute("testPassed", "Test PASSED"); %>
+<%@ page contentType="text/plain" %>
+<%@ include file="inclusion_iso.txt" %>
+${testPassed}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NIncludedContentTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NIncludedContentTest.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..29cee83bd1729f833bb0876297aa15774be097c6
GIT binary patch
literal 1036
zcmaKrUvCmY6vfZ8pJGaU(8NM(Vxx#{YKzGlrKG@vX^f%JRtzkJ-8MAF@9yv1EkbP4
zOqdz&-*e8~RZB-&X{M=??sTQ43QaUut`DkdUv=$qCOo-D*vEKt-Gq0bzCLM}r~`de
zo46w#>X};F!Me*W#X2Exp?hji$o#1i>uc)nu_yI(OU0zGct^y{L2%Enr00zD6}~LG
z*SRGfgVks^)r$CcMXd3g#TeY{?mZ3EA)>2uoyDGkwNIUMeN#gxSUd2@bc(%$C&TxJ
z3hp+DstIiFQh@bRzvwUu7Sq6NZQMHr=4GIEe``?bVOI0VsI+!`lR5>uSZ8Zea&LmC
zfqe*zAqd^33-!o`MQ~uLarDsIeWl
ziQmx$?{SL$exHkfm_0!iVxzMz#&OKAjJlWTWb7{FmPx4epH
+
+${'Test PASSED'}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncContTypeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncContTypeTest.jsp
new file mode 100644
index 0000000000..0382bfd11b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncContTypeTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page pageEncoding="ISO-8859-15" contentType="text/plain; charset=ISO-8859-1" %>
+
+${'Test PASSED'}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncTest.jsp
new file mode 100644
index 0000000000..1c9270aa22
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NPageEncTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page pageEncoding="ISO-8859-15" %>
+
+${'Test PASSED'}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jsp
new file mode 100644
index 0000000000..83ff6d4192
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jsp
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain"  pageEncoding="UTF-3.14"%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jspx
new file mode 100644
index 0000000000..d08e201866
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NUnsupportedEncodingTest.jspx
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingDirectiveTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingDirectiveTest.jspx
new file mode 100644
index 0000000000..eedc9bca0c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingDirectiveTest.jspx
@@ -0,0 +1,23 @@
+
+
+
+
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingPropertyGroupTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingPropertyGroupTest.jspx
new file mode 100644
index 0000000000..d77ba2a2a5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/I18NXmlPrologNonMatchingPropertyGroupTest.jspx
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/WEB-INF/tags/BadTagPageEncoding.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/WEB-INF/tags/BadTagPageEncoding.tag
new file mode 100644
index 0000000000000000000000000000000000000000..ef8f438c4bc6cac87f084eee5cd50323abddf045
GIT binary patch
literal 1752
zcmbu9TW`}q5QXQtzhXf`0;x&bKA;K#0!p|@?#!Gyb7pRS*kik69iAheuzfD9w54sVvchI|WexlHEw=}J&+Nob?VQyI&NFuB
zHsN1p3maPx%Zh&mHns0gZOXqnzl^;JyIuC5voq)0M$qlb&nJA>tj65jMKuIT;a->A
zC_$$9-#m(92mD`cvE<+?Ia@le4R#Ce2X-O~#mztvF)D668*lB`oCaLjpMgE-c0fG<^4bUf7KbybDW$bfoTT!|B9le#BGxxjbE?b^F2-s#(Sul&-{sUH8U)A~TE
zGkmU4pDH7T)~u#PyWVosBmN;S=~x|=I;l%O4gEMjQ1Jk!UfNeQzOR{%y>*Q)Jgdlf
z<&5{Sxct=usOre=yRuTpmIex<|K!(o2v0?jbZ=n-1bbWQVb
U0T1fJ*w0e3@>1O!ul1JAp9B^oCjbBd

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16BE.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16BE.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..63c1e1ea20915f8421482e3b089f483e30b5fec7
GIT binary patch
literal 1452
zcmbu9TTA3X5QXd6Uy&EV1!qQm5)nb%VHHFd$7Owub2E^ggk&zxpWpR6)zfBXL_wF3
zbf>zz>eM+^{r8`p+OD;Dc6gH2b76&*wzSGJ8{3mjvF};mzA+xzfgRd0vs>0vtho*O
zOKoBU>u|E-FXK$@){%|)%Xw35L#%D==U8&aCW3ZXzCL7}GaImT9o0QZGWS}tqX3!W
z|M4h_o#6jzg{2R!g0<3dEjc$~e}W~TP}~#*0i)uEwZZEAoK>Mt?UAomXP%$1#W)RL
z%B#Y+ycOgdcO=$zell>>?&T+bJ7oV1s|oxS;K=zdKpb@I;Y*52=alHnwTw4e6iebwtTsBtv#QI?{b-*eNza;$
z0?R3t*C-$AcItUaA@xBxqe_z|O^il?uWK&$LM_(JgtR7JM&to{CicT_?3a(qPBkaC
z6Z@#D_ScwFS5^2745*jIl{is0v3p{a3w)>SuDy%Go~}K+@};Ab9{*dX^;V^h@j0XV
zq>L)GW;P<)V#Q5|_}jQt$LgrqNp13((vSI8758B3yFF0jn>Ew2E3eUsXB8N)obfIv
yu3vjXcix@zziIu=`Fp!$F^i(wDJZ3

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16BadPageEncodingAttribute.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16BadPageEncodingAttribute.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..b44cb540360adfc6fb20d627cc6f826f2dd44831
GIT binary patch
literal 1516
zcmbu9TW`}q5QXQtzrsSQ1X7cfK2-=%Q3)5Rf{Fyes~ab-B@Bje`yjQF;PVS-_gQW1NH76>N
zDgO`8qTC7bZ?{+`;HucG9oGiGIp-5B0fq9WAP5+hH|%9w{}sDJo!Slm+Fg2m!WQ#%
ze5tO6*oszBZ#^@GnLK*1O15
zQHMopEy(u*Ee1r;(D=xF6xWq}qwsqfQB&iP;S}
z1FIFQ8$TiYeOOK4uL4KO{~E+Ww-K?VsB})rzS*gGpGC1G-o$FBL-bW&79L0Elu3HF
zR1{cF>AX()(6zz>eM+^{r8`p+OD;Dc6gH2b76&*wzSGJ8{3mjvF};mzA+xzfgRd0vs>0vtho*O
zOKoBU>u|E-FXK$@){%|)%Xw35L#%D==U8&aCW3ZXzCL7}GaImT9o0QZGWS}tqX3!W
z|M4h_o#6jzg{2R!g0<3dEjc$~e}W~TP}~#*0i)uEwZZEAoK>Mt?UAomXP%$1#W)RL
z%B#Y+ycOgdcO=$zell>>?&T+bJ7oV1s|oxS;K=zdKpb@I;Y*52=alHnwTw4e6iebwtTsBtv#QI?{b-*eNza;$
z0?R3t*C-$AcItUaA@xBxqe_z|O^il?uWK&$LM_(JgtR7JM&to{CicT_?3a(qPBkaC
z6Z@#D_ScwFS5^2745*jIl{is0v3p{a3w)>SuDy%Go~}K+@};Ab9{*dX^;V^h@j0XV
zq>L)GW;P<)V#Q5|_}jQt$LgrqNp13((vSI8758B3yFF0jn>Ew2E3eUsXB8N)obfIv
yu3vjXcix@zziIu=`Fp!$F^i(wDJZ3

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16LE.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF16LE.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..044f443ec860737edc91df106cc0643dcf0efca3
GIT binary patch
literal 1452
zcmbu9TTA3X5QXd6Uy&EV1!qQm5)nb%VHHFd$7Owub2E^ggk&zxpWpR6)zfBXL_wF3
zbf>zz>eM+^{qOIo?OKaxhbLJ*7gktlORFriu|3%o`=0gf8{?53*r6RWyJbDan%j`S
z)Fw8t4ks)AGS1X)9odM#oHxZb#M;JwjwNSoB4~Hz>qEvlvjIETQQdk3Xm!O
zACIEg3I3l}So+{9SSuaZl5-RGCs+as#Z5sFFe+|X8?4UHSrzKk9{Fl@=J^R*jMMO?
zyefRlTS2~YM`B&)Cj&?AUVh?79y9ETUHdr1b6A}_H%ELAY@hXoXWZv2Mg!Kj$dplo
zMQTlncY+ojJm_f?TRKG?ZC7c`x^f#k6CGwH|1A_&{P(!;adt+wea}ag5;zmHOK=8O
z3uceLL-x{1LVn6K0e)*{ERC8iG
zv5%^1e~l@1RfW&MfO=V6i4$cLyC+7uz<0{-+Pf(1>Dsd^UphMJ@xOIiZ&m6TpEIgY
z%BVtXW+S34R@`)mzl}?Etd5GE)Fz)P{g`i6aSx`x+XFSeSu-uW@*16ZR)O)#8Sir9
y`n4x?=iNE~o7Uf)zqdci7Ud4azujV)fU9J$a$Fny=9~{$A`0bAKoBu1Z`@0_{wsEcIMWu5>_RUVk`z(qj@g`O~9a>-YW$tlwPMM@<
zLq(D0gwE@fkA1uFx}=ciAo{4&q)C^fQ{euZi@n&34J#pS$d{8jMbBVw?Sp;sx2jXm
ziS1zj>Z;QnrZiPGF(U(-WpO1=R82cQZI&xyC!B74isG4}{czRB+4#X%R3VCuDfqsRAqrf2WHN9SHuWW099
zhj?87nF-x_pPm1G>sS28_Kuyqob^C;$XPpMy4`g5p4bakN2a^@B~f&1W%zZgA*`r}
jQ|i=2T-q_6Ft#^%pW73@f=7``@uq0+3+bv`S9ip3ii-Qs

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8.jsp
new file mode 100644
index 0000000000..27a9669d23
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8.jsp
@@ -0,0 +1,18 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+this is a test
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8ConfigElement.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8ConfigElement.jsp
new file mode 100644
index 0000000000..27a9669d23
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/bom/UTF8ConfigElement.jsp
@@ -0,0 +1,18 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+this is a test
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/inclusion_iso.txt b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/inclusion_iso.txt
new file mode 100644
index 0000000000..81f0945bac
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/inclusion_iso.txt
@@ -0,0 +1 @@
+Included Content
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/inclusion_utf-16LE.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/inclusion_utf-16LE.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..dbf1f2a0d8cab04d7d02d26fb2b035f9dde891e4
GIT binary patch
literal 160
zcmZvVF$%&!6hvRWr&#P0W0Pu43Q0h))Dvui2+0PLRXl!%-`H4uKFqwC3AB8fnecoV
zS=o58kT`STL`kLZ
+
+
+
+    JspInternationalization
+    
+        5
+    
+    
+        
+            /I18NXmlPrologNonMatchingPropertyGroupTest.jspx
+            UTF-16
+            true
+        
+        
+            /bom/UTF16ConfigElement.jsp
+            UTF-16
+        
+        
+            /bom/UTF8ConfigElement.jsp
+            UTF-16
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NContTypeTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NContTypeTest.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..07fb89e893856054849fc1e886b3dbcc78959536
GIT binary patch
literal 2030
zcmbuAYfIcv5QgWozamOMD7c9h3f8WQsPuxgrE6(H`XTPFYh>Lln|N7D|9hWzPGZbz
zg|>twCv(osyz|Z_UE8xeyRxxGc4I@ESz(#wHnAOBu}zC@gZG~8+LCo`**aWHTv2r$
zaCT~Q^fDXSg_X!xt#50*U!uFgbG=$`+7_!%oJ~0~##_W{VgpOCGUF>lzi{cfo%1#3
zPLU0f#>n@P2x;R@r)Rz|?22H($%hC}K$W@GDJODJ%Kw#nk?#om7ZsL1xN`QUj%$wI
zg!2)SfI@y#5Cn|!8}K1Qa98Z63OiN9@fkzherjBn+s#u0m#
zM(iuLku#C7n)2Nt&#IL_aophDJa0i9
z^47zaGO9eMc%MIrxXq$i5^rL)$wRHHx(r>RbMmBo7DNm^Pz4_k4qU+PXrxR
znsU4zQhqpztmVXO5UL%KX&PDIfn^r^Q00j<9)6^(ix|(1O)D-fk;y68taXQXQ+K
z>Q0J@r=%ap3su~MsYCltjkjy2WAD92CmvN`eCCWFp>cfQ6PkHnod34;8~P{qj-AJx
zbwIVqS>0orZkoekCTphUAc(3tuBotXm(IUtc)PPN;X}0=v#;3{6Tc>2VjoO#Cfq3u
z4$+kTdd_z%i`zt;dA0RDYSl*UnU+rE*2IT6Es1W<-q8OglHDOokSG)Cf;X;l!I%C!
z>XaQg>A_crf5n!)ve&FO!4jeOG@b&Vn#-y!&84z+uED=-r|^8pKjeh_^d7TjQ9vwo
z;zc(0xl6Zu22aAi3JSdop5jOqt`1xAT3*3w*i&Ea6GM+Fe#q_`QU2g+qfhSnd>((-
exmK>m_}#S^_VY;;zxX>R3upDmmMqkV{Qm}LkxcCX

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NNoPageEncNoContTypeTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NNoPageEncNoContTypeTest.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..ed80b1c7ebdf9a2b9fe1de0cf4753766d1b27013
GIT binary patch
literal 1888
zcmbuA>rc~Q6voeI{))2r0Tb2&ela*D1QstLN*qQL;)k-0Q8LzL?ZCzOudBc3ysh1a
zm#AslzJ1?wdCqe#{rb&1c3_|E#>N)etqpBvg=Lo8#GYEqb}hCY-Us%~Hjv%4HrEDM
zR9#2NPHll+W+S_@lKm~~+e6-a=-=Qk
zDBQ{^c4RSQKe7{l53w9hZ=IVx&y~2o^N9OA#c05KADJR*uqbmS{`Sd5f(2bMzLlpM
zN99i$OBqs6
z1RYhHa?TVLJsu;awDDy3815e(LCykN>UHVy#j~*ql>+%8V+sV0DSNyNa6x|LeF^
z$LgrMlVaj2>BsR}758B3*gjC>t2NWMmtLb2k18-ebH=-9oc!ns&AhkH|LX30^v~=C
zC-*sPgKC|#y2mu#G>5}X)=bMm5LI(rQ(@n(oqx^n)y}?#57lbSxn@&L{F-=)y)wm_
zaHlXhL{s+bIp3))?xWX-W6gvTrc~X_a*h0^ofFqFGy9DD+^a!$)%#*h@s*B4HV(N<
zw|fCDoo<03O#ad_siIWTEw7yxR`pj<+^1;wxVm_2@#lGBAGwxMb%-l4@+bTqFv#wl
a*c90V`}|WBU-%m)YqI)7YA@si|K9-^tT$@_

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NPageEncContTypeTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NPageEncContTypeTest.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..0c7e0a09da530a74e83a42039225c5a78747b78c
GIT binary patch
literal 2076
zcmbuA>rc~Q6voeI{)$5UAPH*$qe0{n0`nH4#z8b8ekj`*C1YLIaaoN2y83(0yRLKy
ziJGSE+xI<}=RD`qpTBI&cJ0&0<^Sy=yzRfb60*xE8pg
z>9vpS&?e|**0XaPv;WlEw#<7S-Bo*LE7SFwZLs=?Y>Gr5ZxO43bu7Wkh_4L&!gtT?
zjITa-%3hb5-ocyCUcyc^Baks4}-YL?Q>J{9n2k`HrxEKE=`oSI*hc
zaZS)0ARn<4P{?lzf`Cze!&zslf6b{-r*_Iyr&k`Iu$6u)?iAMu+p?AuZz&O3)A`B3
zQMi>)*pbDI{m2ge-NkY^y>@QaJy+uT#v^X?6r%y_ePoKL!lKNL@wZ7X5-jM7@vS_S
zIAYIIk8{P=b0!j2L%thiTeb2K_bqgzVsA>XdVs-+~z-rFw)Frh4H>^hRmxH6v
z^9IBrZ!K&oqsnuN_sN}z>nw^T@g`QQJe0bs%g_~)lPBe~Afmu>O666V4|O~CxRfFF
zM9@*CDJPYWDg*zXbFmj{v0x>n1^zNTcgSaCZ|s8|`&-ee=EQbnk5$#m9j5AYL47T*
z#EGIQyQlQBkL?r$g?CYqX)-AuVj@IQ}B
zb*zpmJ1HifG5y$|tKt?+9oScDyk0X6d*?Me@TdagBWJvc#^J0dH1j??|MlH3=pWfz
zPVRHo0M$HaWshmPX%2^(teKXBAezo`O@&RnaQ-#J>z#c8AF9=ubIqoh_%-nodvA&}
z;Z9+&i>BFt=fn^)6$7%t0uN(S<>o7Avq@6*Wg~W7kov2F7Cwt
zn6nAmU6<6}Eqe(&%9?Dva*cDo^p8?kZNpy+ZX5hpHte~*blb9=Jb=Bxr)Ie7P%~^?
zldED~v=ef2!2jlm`(zf?J`n}PLMIMoV~>06c2D6{*q;)g-UUzbscuj=E_vNAVKtno
z2lt4f#l%10beSl>an+emX52rHf6Mcty!P?CV^8e+A5r|^PoB)l>hG?-P)qp#4e=IL
A(*OVf

literal 0
HcmV?d00001

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NPageEncTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/i18n/noprolog/I18NPageEncTest.jspx
new file mode 100644
index 0000000000000000000000000000000000000000..53841902d875b9bca42e92d645881b477b0b8897
GIT binary patch
literal 1988
zcmbuA?N8HC6voeI{))2r0Tb2&CdS}|AWYE^B@Utq@k80hC>h(b7H~2C@BW^1*Od+-
zQPZ@&z4yF4=Q%I6mhIXPySAZ4c58i`T5g$*ZDen(VVf4)2Jcm*$3`+UGb}#ZBVgGWDr3RQf?nPW@Q7nl!v0CM!)Ky)Eu8^EODW5qJ1(s7PugZL=+rr~ghSU>5
zN0p|WR6eQ<{Cm#DUZ};Km5}E6%kbPIpOL+{Pj>2WMW>n*+mSt0RqOYds?P=WwYU-|
zil*$I(#t-!QxN3dMM0*`j8Wz%j!yab-#X2gDs_O(8>&y4QHAELF7S3Y=O)4bGA`Az
zI;!lXn0N~Makx~)9hf?>Z`63bW}5cFYjosM1;(e&cpHtQMNeqveR2NlyI;{iu|rNC
za@GXZGG}FvX}W0+hncLIHU>d7pW~Ve+jiyrYlhc5`wBi(t1;)AO)>Fn;wARc6lcPn
z!eAdw*)QjOYi@Cyh%>LYu1Brfh&|KNi59Ciwq;q;>O~MuW&D1S)EX8e5_X@x#)VvZS<4w_FaBgT5Y-gOjurcywtgZ0f!2X&&x7F!--8NZ$
zWN*rj9)2TMef%a^8SyXUeD2b7JLg}ICq>pl8YACFqG(EQ+C6f;;!~7ucHT$W1Xbo%
zhwK=DQvR>pi+o4eznEfaIS*GvBwQ2DiI0fg0fqdgAP5-cH|W~a^EYUPI<+(2(q4Of
z!dCbxxl>#tY|Gk!c#9p8)t#RV9JyQhgdJJTkVkgxUu7+5Z=9PA&!@P)^@v-%#c06#
z5Sbz>u_$w6{B4no1Pl7b_*R|@9IXd
zVs-+~!0Le2neUMNZ&;1sZvc)S?^_Uuyfv_;%2u9Jyie{$TxC%#i8rxY=Ak&Nx(uD8
zee$Gy=0p@&PN}>y^Pz6X9+xtto(N}DY063Iqs+j+=UnWCTFhAqX^y`P&u#J<*^zy)
z6aOkY)tuOl?5V0+y~k8_cBrq#l{ir}MfVh54zQhqAonf`d+N*~Wq#=Bl#l!Z?{u!68z8OQXQ+KicX4&XYBK`TEz{RI<&9Uc(rC~_Redx?@HKTX
zS3CO>K2)nQdd;So_y@$C*n3l)2~P@x9Zt%AG3U3Z7Pp8v^J;5()T)ixGp#exY*oj$
zEI)pyM6MTi;(rVi6Ha&h_L1xkS%O4aQ^&l
+
+<%-- use jsp:directive.include  within a jsp page.
+--%>
+
+  
+  ONE
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directiveIncludeLocation.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directiveIncludeLocation.jspx
new file mode 100644
index 0000000000..b18c6729a6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directiveIncludeLocation.jspx
@@ -0,0 +1,33 @@
+
+
+
+
+
+  
+    
+    

+      
+        ONE
+        
+        TWO
+      
+    

+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directivePageInJspPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directivePageInJspPage.jsp
new file mode 100644
index 0000000000..12d857ec64
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/directivePageInJspPage.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%-- use jsp:directive.page  within a jsp page.
+--%>
+
+  
+  
+  <%
+    List list = new ArrayList();
+    list.add("a");
+    list.add("b");
+    out.println("listSize" + list.size());
+  %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jsp
new file mode 100644
index 0000000000..2b9060cb8d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%-- included by directiveIncludeInJspPage.jsp
+--%>
+HELLO
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jspx
new file mode 100644
index 0000000000..886fc3b526
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/included.jspx
@@ -0,0 +1,21 @@
+
+
+
+HELLO
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jspRootPrefix.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jspRootPrefix.jspx
new file mode 100644
index 0000000000..d8311fce7e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jspRootPrefix.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+
+    
+    
+      Test PASSED.
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jsp_jspdocument_elements_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jsp_jspdocument_elements_web.xml
new file mode 100644
index 0000000000..ccbb8ea147
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/jsp_jspdocument_elements_web.xml
@@ -0,0 +1,32 @@
+
+
+
+
+  jsp_jspdocument_elements
+  
+    5
+  
+  
+    
+      identify a jsp as not a jsp document
+      /notJspDocument.jspx
+      false
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/negativeJspRoot.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/negativeJspRoot.jspx
new file mode 100644
index 0000000000..7e92e522aa
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/negativeJspRoot.jspx
@@ -0,0 +1,28 @@
+
+
+
+
+
+    
+      
+        this is body content
+      
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/notJspDocument.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/notJspDocument.jspx
new file mode 100644
index 0000000000..04ae124fc6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/notJspDocument.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+
+  
+    this is body content
+  
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scripting.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scripting.jspx
new file mode 100644
index 0000000000..09ec2dbe49
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scripting.jspx
@@ -0,0 +1,36 @@
+
+
+
+
+
+  
+     
+    
+    
+    
+    sectionNumber is 
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scriptingInJspPage.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scriptingInJspPage.jsp
new file mode 100644
index 0000000000..5ffbe5ccb0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/elements/scriptingInJspPage.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%-- use jsp:declaration, jsp:scriptlet, and jsp:expression in a jsp page
+--%>
+
+  
+    public String getSectionTitle() { return "JSP637"; }
+  
+  
+    out.println(getSectionTitle());
+  
+  sectionNumber is 100 - 1
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/WEB-INF/tagdep.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/WEB-INF/tagdep.tld
new file mode 100644
index 0000000000..465d97ce52
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/WEB-INF/tagdep.tld
@@ -0,0 +1,41 @@
+
+
+
+
+    1.0
+    tagdep
+    
+        echo
+        com.sun.ts.tests.jsp.spec.jspdocument.general.EchoTag
+        tagdependent 
+        
+            echo
+            false
+            true
+        
+        
+            static
+            false
+            false
+        
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByConfig.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByConfig.jsp
new file mode 100644
index 0000000000..c9c4f4ab79
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByConfig.jsp
@@ -0,0 +1,26 @@
+
+
+
+
+    
+    
+      Test PASSED.
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByExtension.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByExtension.jspx
new file mode 100644
index 0000000000..6515bb5f5d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByExtension.jspx
@@ -0,0 +1,27 @@
+
+
+
+
+
+    
+    
+      Test PASSED.
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByJspRoot.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByJspRoot.jsp
new file mode 100644
index 0000000000..9a7a399208
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/identifyByJspRoot.jsp
@@ -0,0 +1,31 @@
+
+
+
+
+
+  
+  
+    Test PASSED.
+  
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/invalidPlainURI.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/invalidPlainURI.jsp
new file mode 100644
index 0000000000..4bf7c5abb8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/invalidPlainURI.jsp
@@ -0,0 +1,30 @@
+
+
+
+
+  
+  
+    
+    
+  
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/jsp_jspdocument_general_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/jsp_jspdocument_general_web.xml
new file mode 100644
index 0000000000..8435301540
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/jsp_jspdocument_general_web.xml
@@ -0,0 +1,45 @@
+
+
+
+
+  jsp_jspdocument_general
+  
+    identifyByJspRoot
+    /identifyByJspRoot.jsp
+  
+  
+    5
+  
+  
+    
+        http://java.sun.com/tck/jsp/tagdep
+        /WEB-INF/tagdep.tld
+    
+    
+      identify a jsp as jsp document
+      /identifyByConfig.jsp
+      true
+    
+    
+      group for identifyByExtension.jspx
+      /identifyByExtension.jspx
+      UTF-8
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeDTDValidation.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeDTDValidation.jspx
new file mode 100644
index 0000000000..9b6dfe856c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeDTDValidation.jspx
@@ -0,0 +1,31 @@
+
+
+
+		
+
+   
+   
+] >
+
+
+ This document is invalid because c is missing
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeWellFormedness.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeWellFormedness.jspx
new file mode 100644
index 0000000000..a33c213937
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/negativeWellFormedness.jspx
@@ -0,0 +1,28 @@
+
+
+
+		
+
+
+  negativeWellFormedness
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/tagDependentTest.jspx b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/tagDependentTest.jspx
new file mode 100644
index 0000000000..e968b6f3e4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/jspdocument/general/tagDependentTest.jspx
@@ -0,0 +1,47 @@
+
+
+
+
+    
+
+    
+        pageContext.setAttribute("eval", "evaluated", PageContext.PAGE_SCOPE);
+    
+    
+        
+            START ${pageScope.eval}
+            out.println("scriptlet");
+            
+            
+        
+        use jsp:body       
+        
+            ${3 * 6}
+            ATT2
+            
+                START ${pageScope.eval}
+                out.println("scriptlet");
+                
+                
+            
+        
+    END ${9 * 8}
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/jsp_misc_precompilation_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/jsp_misc_precompilation_web.xml
new file mode 100644
index 0000000000..dbc493daa0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/jsp_misc_precompilation_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspMiscPrecompile
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/precompile.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/precompile.jsp
new file mode 100644
index 0000000000..2adac08181
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/misc/precompilation/precompile.jsp
@@ -0,0 +1,44 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+Precompilation Test
+
+<%  /**  Name:Precompilation 
+         Description: Checks if the request is actually delivered
+                      to this page or not if the request
+                      parameter jsp_precompile is either not set
+	                  or set to "true".
+              
+         Result: Will send the message "Got The request"  
+                 if the jsp_precompile="false"
+                 
+                
+**/ %>
+
+Got the request....The test parameter is
+<%! String test; %>
+
+<%
+  test=request.getParameter("test"); 
+  if(test==null) //just to remove the dependency on Java 
+  test="null" ;
+%>
+<%=test %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/WEB-INF/tagext_resource_httplistener.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/WEB-INF/tagext_resource_httplistener.tld
new file mode 100644
index 0000000000..a069cbbbb3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/WEB-INF/tagext_resource_httplistener.tld
@@ -0,0 +1,37 @@
+
+
+
+
+
+  1.0
+  SessionListener
+  
+    SessionListener
+    SessionListener
+    com.sun.ts.tests.jsp.spec.tagext.resource.httplistener.SessionListener
+  
+  
+    SessionAttributeListener
+    SessionAttributeListener
+    com.sun.ts.tests.jsp.spec.tagext.resource.httplistener.SessionAttributeListener
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/listener/WEB-INF/tagext_resource_listener.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/listener/WEB-INF/tagext_resource_listener.tld
new file mode 100644
index 0000000000..f8ffe491bf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/listener/WEB-INF/tagext_resource_listener.tld
@@ -0,0 +1,47 @@
+
+
+
+
+
+  1.0
+  Listener
+  
+    ContextListener
+    ContextListener
+    com.sun.ts.tests.jsp.spec.tagext.resource.listener.ContextListener
+  
+  
+    ContextAttributeListener
+    ContextAttributeListener
+    com.sun.ts.tests.jsp.spec.tagext.resource.listener.ContextAttributeListener
+  
+  
+    RequestListener
+    RequestListener
+    com.sun.ts.tests.jsp.spec.tagext.resource.listener.RequestListener
+  
+  
+    RequestAttributeListener
+    RequestAttributeListener
+    com.sun.ts.tests.jsp.spec.tagext.resource.listener.RequestAttributeListener
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTest.jsp
new file mode 100644
index 0000000000..f7f86f05e4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/tagext_resource_taghandler.tld" %>
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTimingTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTimingTest.jsp
new file mode 100644
index 0000000000..44ea5f04cf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceSimpleTagHandlerTimingTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/tagext_resource_taghandler.tld" %>
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTest.jsp
new file mode 100644
index 0000000000..a3bc7aa2a8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/tagext_resource_taghandler.tld" %>
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTimingTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTimingTest.jsp
new file mode 100644
index 0000000000..5c4e7afb8a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/ResourceTagHandlerTimingTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="test" uri="/WEB-INF/tagext_resource_taghandler.tld" %>
+
+begin 

+
+end 

diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/WEB-INF/tagext_resource_taghandler.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/WEB-INF/tagext_resource_taghandler.tld
new file mode 100644
index 0000000000..80d3b7084d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagext/resource/taghandler/WEB-INF/tagext_resource_taghandler.tld
@@ -0,0 +1,59 @@
+
+
+
+
+
+  1.0
+  ResourceTagHandler
+  
+    ResourceTag test
+    ResourceTag
+    com.sun.ts.tests.jsp.spec.tagext.resource.taghandler.ResourceTag
+    empty
+  
+  
+    ResourceSimpleTag test
+    ResourceSimpleTag
+    com.sun.ts.tests.jsp.spec.tagext.resource.taghandler.ResourceSimpleTag
+    empty
+  
+  
+    ResourceTimingTag test
+    ResourceTimingTag
+    com.sun.ts.tests.jsp.spec.tagext.resource.taghandler.ResourceTimingTag
+    empty
+    
+      queueName
+      true
+    
+  
+  
+    ResourceTimingSimpleTag test
+    ResourceTimingSimpleTag
+    com.sun.ts.tests.jsp.spec.tagext.resource.taghandler.ResourceTimingSimpleTag
+    empty
+    
+      queueName
+      true
+    
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag
new file mode 100644
index 0000000000..8340110dec
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultFragment.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" required="true" %>
+<%
+    Object o = jspContext.getAttribute("x", PageContext.PAGE_SCOPE);
+    if(o instanceof jakarta.servlet.jsp.tagext.JspFragment) {
+        out.println("Test FAILED. attr x is a fragment type.");
+    } else if(o instanceof java.lang.String) {
+        out.println("Test PASSED. attr x is of type java.lang.String.");
+    } else {
+        out.println("Test FAILED. attr x is " + o);
+    }
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRequired.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRequired.tag
new file mode 100644
index 0000000000..f2e332373e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRequired.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" %>
+Test PASSED.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRtexprvalue.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRtexprvalue.tag
new file mode 100644
index 0000000000..15c119402e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultRtexprvalue.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" %>
+${x}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultType.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultType.tag
new file mode 100644
index 0000000000..e665058731
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/defaultType.tag
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" %>
+<%@ attribute name="y" type="java.lang.Float" %>
+<%
+    Object ox = jspContext.getAttribute("x");
+    Object oy = jspContext.getAttribute("y");
+    if(ox instanceof java.lang.String) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED. x is not of type java.lang.String");
+    }
+    if(oy instanceof java.lang.Float) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED. y is not of type java.lang.Float");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodMinimumJspVersion.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodMinimumJspVersion.tag
new file mode 100644
index 0000000000..4cc85df482
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodMinimumJspVersion.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" deferredMethod="true" %>
+<% out.println("Test FAILED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodSignatureMinimumJspVersion.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodSignatureMinimumJspVersion.tag
new file mode 100644
index 0000000000..8a268d7cd9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredMethodSignatureMinimumJspVersion.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" deferredMethodSignature="void noop()" %>
+<% out.println("Test FAILED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueMinimumJspVersion.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueMinimumJspVersion.tag
new file mode 100644
index 0000000000..89a1628603
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueMinimumJspVersion.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" deferredValue="true" %>
+<% out.println("Test FAILED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueTypeMinimumJspVersion.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueTypeMinimumJspVersion.tag
new file mode 100644
index 0000000000..7589691dfc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/deferredValueTypeMinimumJspVersion.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" deferredValueType="java.lang.String" %>
+<% out.println("Test FAILED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentRtexprvalue.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentRtexprvalue.tag
new file mode 100644
index 0000000000..2d868b1735
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentRtexprvalue.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" 
+              rtexprvalue="false"
+              fragment="true" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentType.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentType.tag
new file mode 100644
index 0000000000..7324c7da8a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeFragmentType.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" 
+              type="java.lang.Integer" 
+              fragment="true" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1.tag
new file mode 100644
index 0000000000..de4173eb74
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" %>
+<%@ attribute name="x" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tag
new file mode 100644
index 0000000000..d5ddc8da32
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="negativeName1Include.tagf" %>
+<%@ attribute name="x" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tagf
new file mode 100644
index 0000000000..42da2e547e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName1Include.tagf
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2.tag
new file mode 100644
index 0000000000..2bae34e279
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" %>
+<%@ variable name-given="x" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tag
new file mode 100644
index 0000000000..0a2f159ebf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="negativeName2Include.tagf" %>
+<%@ attribute name="x" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tagf
new file mode 100644
index 0000000000..ba1dec99fd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName2Include.tagf
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3.tag
new file mode 100644
index 0000000000..e7dd57a178
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" %>
+<%@ tag dynamic-attributes="x" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tag
new file mode 100644
index 0000000000..075816420d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="negativeName3Include.tagf" %>
+<%@ attribute name="x" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tagf
new file mode 100644
index 0000000000..65d8734b43
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeName3Include.tagf
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag dynamic-attributes="x" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeType.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeType.tag
new file mode 100644
index 0000000000..a1a530b956
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/WEB-INF/tags/negativeType.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" type="double" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultFragment.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultFragment.jsp
new file mode 100644
index 0000000000..c5a486612f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultFragment.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+fragment defaults to fasle.
+--%>
+
+  
+    xvalue
+  
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRequired.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRequired.jsp
new file mode 100644
index 0000000000..e47a4ad607
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRequired.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+whether this attribute is required or not.  Defaults to false
+x attribute is not specified.
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRtexprvalue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRtexprvalue.jsp
new file mode 100644
index 0000000000..a6ac304c21
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultRtexprvalue.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%! String msg = "Test PASSED."; %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultType.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultType.jsp
new file mode 100644
index 0000000000..4850051baf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/defaultType.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+type defaults to java.lang.String. y is declared to be java.lang.Float
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodMinimumJspVersion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodMinimumJspVersion.jsp
new file mode 100644
index 0000000000..4755687908
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodMinimumJspVersion.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodSignatureMinimumJspVersion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodSignatureMinimumJspVersion.jsp
new file mode 100644
index 0000000000..59c573f2cf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredMethodSignatureMinimumJspVersion.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueMinimumJspVersion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueMinimumJspVersion.jsp
new file mode 100644
index 0000000000..a2523e4a84
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueMinimumJspVersion.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueTypeMinimumJspVersion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueTypeMinimumJspVersion.jsp
new file mode 100644
index 0000000000..de52b7c3f2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/deferredValueTypeMinimumJspVersion.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/jsp_tagfile_directives_attribute20_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/jsp_tagfile_directives_attribute20_web.xml
new file mode 100644
index 0000000000..6ad0aa4c98
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/jsp_tagfile_directives_attribute20_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfileDirectivesAttribute20
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentRtexprvalue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentRtexprvalue.jsp
new file mode 100644
index 0000000000..76a3e9ce9d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentRtexprvalue.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+ translation error must result if fragment is true and
+ rtexprvalue is specified.
+--%>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentType.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentType.jsp
new file mode 100644
index 0000000000..fd417b6e00
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeFragmentType.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+A translation error must result if fragment is true and type is
+specified.
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1.jsp
new file mode 100644
index 0000000000..3486595686
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+ A translation error must result if more than one attribute
+directive appears in the same translation unit with the same
+name
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1Include.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1Include.jsp
new file mode 100644
index 0000000000..1160c1b621
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName1Include.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+ A translation error must result if more than one attribute
+directive appears in the same translation unit with the same
+name
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2.jsp
new file mode 100644
index 0000000000..4cbbf2fa0f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+ A translation error must result if more than one attribute
+directive appears in the same translation unit with the same
+name
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2Include.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2Include.jsp
new file mode 100644
index 0000000000..bd1c54c450
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName2Include.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3.jsp
new file mode 100644
index 0000000000..3faf895166
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3Include.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3Include.jsp
new file mode 100644
index 0000000000..24f501d572
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeName3Include.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeType.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeType.jsp
new file mode 100644
index 0000000000..97fb98cea8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute20/negativeType.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+It is a translation error to specify a primitive type.
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredMethodAndSignature.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredMethodAndSignature.tag
new file mode 100644
index 0000000000..7978371b87
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredMethodAndSignature.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" deferredMethod="false" deferredMethodSignature="boolean add(Object)" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredValueTypeAndDeferredValue.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredValueTypeAndDeferredValue.tag
new file mode 100644
index 0000000000..a19a7bd204
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/bothDeferredValueTypeAndDeferredValue.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" deferredValue="false" deferredValueType="java.lang.String" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod1.tag
new file mode 100644
index 0000000000..ac9d616f18
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod1.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="jakarta.el.MethodExpression" %>
+<%@ attribute name="x" deferredMethodSignature="boolean add(Object)" %>
+<%
+    Object o = jspContext.getAttribute("x");
+    if (o instanceof MethodExpression)
+	out.println("Test PASSED.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod2.tag
new file mode 100644
index 0000000000..0c261e3073
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethod2.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="jakarta.el.MethodExpression" %>
+<%@ attribute name="x" %>
+<%
+    Object o = jspContext.getAttribute("x");
+    if (o instanceof MethodExpression)
+	out.println("Test FAILED.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethodSignature.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethodSignature.tag
new file mode 100644
index 0000000000..1f94e5235d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredMethodSignature.tag
@@ -0,0 +1,54 @@
+<%--
+
+    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="jakarta.el.ELContext" %>
+<%@ tag import="jakarta.el.MethodExpression" %>
+<%@ tag import="jakarta.el.MethodInfo" %>
+
+<%@ attribute name="x" deferredMethod="true" %>
+<%
+    Object o = jspContext.getAttribute("x");
+    if (!(o instanceof MethodExpression))
+        out.println("Test FAILED. MethodExpression not found.");
+    else {
+        ELContext elContext = jspContext.getELContext();
+        MethodInfo minfo = ((MethodExpression) o).getMethodInfo(elContext);
+
+	String methodName = minfo.getName();
+        if (!"clear".equals(methodName)) {
+            out.println("Test FAILED. Method name should be clear, ");
+	    out.println("instead found " + methodName);
+        } else {
+            String returnType = minfo.getReturnType().getName();
+            if (!"void".equals(returnType)) {
+                out.println("Test FAILED. Return type should be void, ");
+    	        out.println("instead found " + returnType);
+        
+            } else {       
+                Class[] paramTypes = minfo.getParamTypes();
+                int numParams = paramTypes.length;
+                if (numParams != 0) {
+                    out.println("Test FAILED. Number of parameters should be 0, ");
+    	            out.println("instead found " + returnType);
+                } else {
+                    out.println("Test PASSED.");
+                }
+            }
+        }
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue1.tag
new file mode 100644
index 0000000000..093d07f546
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue1.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="jakarta.el.ValueExpression" %>
+<%@ attribute name="x" deferredValueType="java.lang.String" %>
+<%
+    Object o = jspContext.getAttribute("x");
+    if (o instanceof ValueExpression)
+	out.println("Test PASSED.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue2.tag
new file mode 100644
index 0000000000..a6c2e2c148
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/defaultDeferredValue2.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="jakarta.el.ValueExpression" %>
+<%@ attribute name="x" %>
+<%
+    Object o = jspContext.getAttribute("x");
+    if (o instanceof ValueExpression)
+	out.println("Test FAILED.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/deferredValueTypeNotSpecified.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/deferredValueTypeNotSpecified.tag
new file mode 100644
index 0000000000..24b1e799f8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/deferredValueTypeNotSpecified.tag
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="jakarta.el.ELContext" %>
+<%@ tag import="jakarta.el.ValueExpression" %>
+
+<%@ attribute name="x" deferredValue="true" %>
+<%
+    ELContext elContext = jspContext.getELContext();
+    ValueExpression vexp =
+        elContext.getVariableMapper().resolveVariable("x");
+    Object o = vexp.getValue(elContext);
+    out.println("Test PASSED.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/implicit.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/implicit.tld
new file mode 100644
index 0000000000..22981b008e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/implicit.tld
@@ -0,0 +1,27 @@
+
+
+
+
+
+    1.0
+    implicit
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/onlyOneOfDeferredValueOrDeferredMethod.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/onlyOneOfDeferredValueOrDeferredMethod.tag
new file mode 100644
index 0000000000..b7d9dbd0ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/WEB-INF/tags/onlyOneOfDeferredValueOrDeferredMethod.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" deferredValue="true" deferredMethod="true" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredMethodAndSignature.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredMethodAndSignature.jsp
new file mode 100644
index 0000000000..056fcfeaf6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredMethodAndSignature.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+If the deferredMethodSignature and the deferredMethod attributes 
+are both present in the same tag, deferredMethod must be true.
+--%>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredValueTypeAndDeferredValue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredValueTypeAndDeferredValue.jsp
new file mode 100644
index 0000000000..a25cd18316
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/bothDeferredValueTypeAndDeferredValue.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+If the deferredValueType and the deferredValue attributes 
+are both present in the same tag, deferredValue must be true.
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod1.jsp
new file mode 100644
index 0000000000..57ee8d4cb4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod1.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod2.jsp
new file mode 100644
index 0000000000..dd489fa531
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethod2.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethodSignature.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethodSignature.jsp
new file mode 100644
index 0000000000..e8bbe54247
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredMethodSignature.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%
+    java.util.Vector vect = new java.util.Vector();
+    pageContext.setAttribute("vect", vect, pageContext.APPLICATION_SCOPE);
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue1.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue1.jsp
new file mode 100644
index 0000000000..0f722705a0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue1.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue2.jsp
new file mode 100644
index 0000000000..ee9879e9ec
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/defaultDeferredValue2.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/deferredValueTypeNotSpecified.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/deferredValueTypeNotSpecified.jsp
new file mode 100644
index 0000000000..5af3a9ac52
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/deferredValueTypeNotSpecified.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<% pageContext.setAttribute("foo", "bar", PageContext.APPLICATION_SCOPE); %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/jsp_tagfile_directives_attribute21_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/jsp_tagfile_directives_attribute21_web.xml
new file mode 100644
index 0000000000..b33abc842d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/jsp_tagfile_directives_attribute21_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfileDirectivesAttribute
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/onlyOneOfDeferredValueOrDeferredMethod.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/onlyOneOfDeferredValueOrDeferredMethod.jsp
new file mode 100644
index 0000000000..621462e36a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/attribute21/onlyOneOfDeferredValueOrDeferredMethod.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+Only one of the deferredValue or the deferredMethod attributes 
+may be true.
+--%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundFalse.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundFalse.jsp
new file mode 100644
index 0000000000..816f5fc3a1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundFalse.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Set the ErrorOnELNotFound tag directive attribute to false. Verify that
+referencing an unknown identifier does not trigger a
+PropertyNotFoundException
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundTrue.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundTrue.jsp
new file mode 100644
index 0000000000..905fc6f99a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/ErrorOnELNotFoundTrue.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Set the ErrorOnELNotFound tag directive attribute to true. Verify that
+referencing an unknown identifier triggers a PropertyNotFoundException
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundFalse.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundFalse.tag
new file mode 100644
index 0000000000..d939d5a4a2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundFalse.tag
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : ErrorOnELNotFOundFalse
+        Description : Verify that when the ErrorOnELNotFound tag directive
+                      attribute is set to false, referencing an unknown
+                      identifier does not trigger a
+                      ProeprtyNotFoundException
+**/ %>
+
+<%@ tag errorOnELNotFound="false" %>
+
+${notfound}
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundTrue.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundTrue.tag
new file mode 100644
index 0000000000..7197bffc02
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/ErrorOnELNotFoundTrue.tag
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : ErrorOnELNotFOundFalse
+        Description : Verify that when the ErrorOnELNotFound tag directive
+                      attribute is set to true, referencing an unknown
+                      identifier triggers a ProeprtyNotFoundException
+**/ %>
+
+<%@ tag errorOnELNotFound="true" %>
+
+${notfound}
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/negativeInclude.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/negativeInclude.tagf
new file mode 100644
index 0000000000..d2e9ffd3ba
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/negativeInclude.tagf
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" required="false" %>
+<%@ variable name-given="y" %>
+<%@ page language="java" %>
+This tag fragment file contains a invalid page directive.
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/positiveIncludePageRelative.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/positiveIncludePageRelative.tagf
new file mode 100644
index 0000000000..32918a65c3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/include/positiveIncludePageRelative.tagf
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" required="false" %>
+<%@ variable name-given="y" %>
+Test PASSED.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/invoke/positiveTaglibInvokee.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/invoke/positiveTaglibInvokee.tag
new file mode 100644
index 0000000000..a8538c4ff4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/invoke/positiveTaglibInvokee.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" required="true" %>
+<%@ variable name-given="y" %>
+${x} from invokee
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativeInclude.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativeInclude.tag
new file mode 100644
index 0000000000..32a9902b8c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativeInclude.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="include/negativeInclude.tagf" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativePageDirective.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativePageDirective.tag
new file mode 100644
index 0000000000..675c4b1742
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/negativePageDirective.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page language="java" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludeContextRelative.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludeContextRelative.tag
new file mode 100644
index 0000000000..1e5eaead90
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludeContextRelative.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="/include/positiveIncludeContextRelative.tagf" %>
+included a tagf file using context relative path.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludePageRelative.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludePageRelative.tag
new file mode 100644
index 0000000000..bbca5ee8ee
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveIncludePageRelative.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="include/positiveIncludePageRelative.tagf" %>
+included a tagf file using page relative path.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveTaglib.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveTaglib.tag
new file mode 100644
index 0000000000..72b1d2aa80
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/WEB-INF/tags/positiveTaglib.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags/invoke" %>
+<%@ attribute name="x" required="true" %>
+<%@ variable name-given="y" %>
+
+
+invoked another tag file from this tag file
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/include/positiveIncludeContextRelative.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/include/positiveIncludeContextRelative.tagf
new file mode 100644
index 0000000000..6e80d2cb5c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/include/positiveIncludeContextRelative.tagf
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="x" required="false" %>
+<%@ variable name-given="y" %>
+Test PASSED.
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/jsp_tagfile_directives_general_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/jsp_tagfile_directives_general_web.xml
new file mode 100644
index 0000000000..84142c3db3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/jsp_tagfile_directives_general_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfileDirectivesGeneral
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeAttributeDirective.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeAttributeDirective.jsp
new file mode 100644
index 0000000000..6ac986f289
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeAttributeDirective.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="op1"
+              type="java.lang.Integer" %>
+<%--
+If a attribute directive is used in a jsp page, a translation error 
+will result.
+--%>
+page executed.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeInclude.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeInclude.jsp
new file mode 100644
index 0000000000..7c114dbf0c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeInclude.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativePageDirective.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativePageDirective.jsp
new file mode 100644
index 0000000000..263a136c8c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativePageDirective.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+If a page directive is used in a tag file, a translation error 
+will result.
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeTagDirective.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeTagDirective.jsp
new file mode 100644
index 0000000000..15f09bef58
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeTagDirective.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%--
+If a tag directive is used in a jsp page, a translation error 
+will result.
+--%>
+page executed.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeVariableDirective.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeVariableDirective.jsp
new file mode 100644
index 0000000000..f01d4abc1b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/negativeVariableDirective.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="op1"
+             variable-class="java.lang.Integer"
+             description="op1" %>
+<%--
+If a variable directive is used in a jsp page, a translation error 
+will result.
+--%>
+page executed.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludeContextRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludeContextRelative.jsp
new file mode 100644
index 0000000000..241e3463ce
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludeContextRelative.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludePageRelative.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludePageRelative.jsp
new file mode 100644
index 0000000000..73b86f4fff
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveIncludePageRelative.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveTaglib.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveTaglib.jsp
new file mode 100644
index 0000000000..dc506a0e09
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/general/positiveTaglib.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/deferredValueMinimumJspVersion.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/deferredValueMinimumJspVersion.tag
new file mode 100644
index 0000000000..159fe8903b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/deferredValueMinimumJspVersion.tag
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : deferredValueMinimumJspVersion
+	Description : Verify that when the deferredValue attribute is
+                      used in a 2.0 tag, a translation error results.
+**/ %>
+
+<%@ tag deferredValue="true" %>
+
+template text
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/dynamicAttributesNoUri.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/dynamicAttributesNoUri.tag
new file mode 100644
index 0000000000..272005543f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/dynamicAttributesNoUri.tag
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="java.util.Map" %>
+<%@ tag dynamic-attributes="ds" %>
+<%
+    Map map = (Map) jspContext.getAttribute("ds");
+    out.println(map.get("d1"));
+    if(map.containsKey("d2") || map.containsKey("my:d2")) {
+        out.println("Test FAILED. dynamic attributes with uri should not be placed into map.");
+    } else {
+        out.println("Dynamic attributes with uri are not placed into map.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag
new file mode 100644
index 0000000000..df403f5c4e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportHttp.tag
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates and others.
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%
+    Cookie ex = new Cookie("name","value");
+    if(ex instanceof jakarta.servlet.http.Cookie) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED. Cookie instance is not instance of jakarta.servlet.http.Cookie");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag
new file mode 100644
index 0000000000..9480ed4376
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportJsp.tag
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%
+    JspFactory jfac=JspFactory.getDefaultFactory();
+    if(jfac instanceof jakarta.servlet.jsp.JspFactory) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportLang.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportLang.tag
new file mode 100644
index 0000000000..92700df1b8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportLang.tag
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%
+    Integer num = new Integer(1);
+    if(num instanceof java.lang.Integer) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED. Integer instance is not of type java.lang.Integer");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag
new file mode 100644
index 0000000000..4ddf758f70
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/implicitImportServlet.tag
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%
+    ServletException ex = new ServletException();
+    if(ex instanceof jakarta.servlet.ServletException) {
+        out.println("Test PASSED.");
+    } else {
+        out.println("Test FAILED. ServletException instance is not of type jakarta.servlet.ServletException");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeBodyContent.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeBodyContent.tag
new file mode 100644
index 0000000000..b7910f9aaf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeBodyContent.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="JSP" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateBodyContent.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateBodyContent.tag
new file mode 100644
index 0000000000..5f555e7ef9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateBodyContent.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="tagdependent" %>
+<%@ tag body-content="empty" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDescription.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDescription.tag
new file mode 100644
index 0000000000..e9495befa7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDescription.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag description="a test, too" %>
+<%@ tag description="a test" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDisplayName.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDisplayName.tag
new file mode 100644
index 0000000000..cf4323db9d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDisplayName.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag display-name="a test" %>
+<%@ tag display-name="test" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDynamicAttributes.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDynamicAttributes.tag
new file mode 100644
index 0000000000..239d641ce7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateDynamicAttributes.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag dynamic-attributes="dmap2" %>
+<%@ tag dynamic-attributes="dmap" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateExample.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateExample.tag
new file mode 100644
index 0000000000..7f450e9f6f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateExample.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag example="a test, too" %>
+<%@ tag example="a test" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateIsELIgnoredFatalTranslationError.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateIsELIgnoredFatalTranslationError.tag
new file mode 100644
index 0000000000..0ed999afa1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateIsELIgnoredFatalTranslationError.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag isELIgnored="false" isELIgnored="true" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLanguageFatalTranslationError.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLanguageFatalTranslationError.tag
new file mode 100644
index 0000000000..fe2e6ff88a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLanguageFatalTranslationError.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="perl" language="c" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLargeIcon.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLargeIcon.tag
new file mode 100644
index 0000000000..90a6abbd0a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateLargeIcon.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag large-icon="/images/32/icon.jpg" %>
+<%@ tag large-icon="/images/16/icon.jpg" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateSmallIcon.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateSmallIcon.tag
new file mode 100644
index 0000000000..f016041f88
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeDuplicateSmallIcon.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag small-icon="/images/32/icon.jpg" %>
+<%@ tag small-icon="/images/16/icon.jpg" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeMultiplePageEncoding.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeMultiplePageEncoding.tag
new file mode 100644
index 0000000000..86c58dfaea
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeMultiplePageEncoding.tag
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag pageEncoding="UTF-8" pageEncoding="ISO-8859-15" %>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeUnrecognizedAttribute.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeUnrecognizedAttribute.tag
new file mode 100644
index 0000000000..9144f3ac4f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/negativeUnrecognizedAttribute.tag
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag id = "test"
+        short-name="short-name"
+        lang="java"
+        body="empty"
+%>
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tag
new file mode 100644
index 0000000000..9771e374ea
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tag
@@ -0,0 +1,65 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="positiveDuplicateAttributes.tagf" %>
+<%@ tag 
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+%>
+<%@ tag 
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+%>
+
+tag invoked
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tagf
new file mode 100644
index 0000000000..1f5b6bb394
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveDuplicateAttributes.tagf
@@ -0,0 +1,64 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+%>
+
+<%@ tag 
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+  display-name="positiveDuplicateAttributes" 
+  body-content="empty" 
+  dynamic-attributes="extra"
+  small-icon="/images/16/icon.jpg"
+  large-icon="/images/32/icon.jpg"
+  description="description"
+  example="example"
+  language="java"
+  import="java.util.Date"
+  isELIgnored="false"
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveImport.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveImport.tag
new file mode 100644
index 0000000000..3778fa45ac
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveImport.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%@ tag import="java.util.ArrayList"%>
+<%
+    ArrayList list = new ArrayList();
+    list.add("Test PASSED.");
+    out.println((String) list.get(0));
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveLang.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveLang.tag
new file mode 100644
index 0000000000..569f05d8fe
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveLang.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%
+    out.println("Test PASSED.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveMultipleImport.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveMultipleImport.tag
new file mode 100644
index 0000000000..9a516d9f57
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/WEB-INF/tags/positiveMultipleImport.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag language="java" %>
+<%@ tag import="java.util.ArrayList" import="java.util.Date" %>
+<%
+    ArrayList list = new ArrayList();
+    Date date = new Date();
+    out.println("Test PASSED.");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/deferredValueMinimumJspVersion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/deferredValueMinimumJspVersion.jsp
new file mode 100644
index 0000000000..340f529cda
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/deferredValueMinimumJspVersion.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/dynamicAttributesNoUri.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/dynamicAttributesNoUri.jsp
new file mode 100644
index 0000000000..0e10798b5f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/dynamicAttributesNoUri.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/images/16/icon.jpg b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/images/16/icon.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..02d864db473cd44ce11067a1b67548391b9cf906
GIT binary patch
literal 11231
zcmeHtc{J4j|L+LdBatns>`js_6`9JO5JC}C2_Yt1V;M6ovP*UmQ`xh9F!p7#i%N_o
z>nxJ&Gs<`~i~H{0@9%fdx!bwRx##|KU*=`zoO!=q^L#w_=kxX2`@Tnlh+H)>H-T_)
za6s;We~`Uth#_Pj2gl#nzXm5a=ijlPi;I(+XFm_m-^t4-z{ktW&&$KZFT~F;AP5c~
zz5~KSf(QP7{=3QF<$qU!FF{@&-oH=$uZ_Krkb}GsBu6(V#|g;3gB+X(Irh3Cau5gy
zH%RSYg8wx*_HlA??*~cZ7XTlq69LKR|u
zi)lVhe#a|+rMg4hc9^Q5buZuxL}FL8_6
z{M*cisJxH+*G%}vVJvq2znC6R_*LHj4`%+kxBKE${@b%%d=K(0aSzhb1FQ999@3*g
zL)3ew8e;Wb=5rk58HQc#gM|6E<`G*XPshd-ue%LbF2QH{u6;C@k?cI<&G>*%w~oZt
z?E^Ou!;r}8ajxfC?+s*pTouE=I6F5!3n9n(FpTicUKLy6!usU_8wuLCL`@^}Y#KGQ
zzCJ<$S=R#=Y;BRh6U$q|CuY~$b1IJbUa_}rv4n=|&2Enn$A`8Z*?gIM5bi%LEQa&}
zt=2}xKS3}p$wcW}eQF~>V2^Zw6WrCQSAN!CpzGB5`rA*5&*0h*A8SN%Bu%}&<2V4X
z5$@TTRA=+UXnqs(eVx#aeLxpQIciOjP&~f+HUidt_%T5kI@tDf9QynqI2scw#S=`q
zQs-gR>u>-n(YFT?W{+K1{HQ*uM-OcVDrhpD^^Y^z$7sSa3Jkd@oO@%UXPoGlQ+x_3
zSDd}VOVIAe9bC#Ku6{A@)vqxBL-c7!SUI1a%N)LFtC1h7YVkUtD!twTjruw`FtLn|
zt&cf2BU>^_%SfmX=^=vdllRZJ?W-5~8#6xK
z2Aa7gmX(|u2PHKmZo&7
zE5zB?-VGMyXFH+Vz0b^qo};9dx8<~_%f$KE2UU*eri_*p?TqD;(y~`PMl6wSe_-~!
zvzN~404|Ihn2tVp{o?AaQb3oY+r2Sq-O(-x$j`65+Eq*3Vs84Rbp0sDdS-9xML9dC
z6f`==^L~HvNM7*>s9aOR>;vko3Ihcc=eU6Z`YXQnK#uS#k=!=y0_68SnemobO^8+N
zew@+pt$Dgn9`}$YkkyemX!b(ENXO=9rl}VOiHNVSoLzTRo3e04L^GzD7wHdKHJ|n%
zClXSils(AzBsM?Ii-E*+sG{r`h9Sr<|6dn2UIbO#t-{H)qy}?W=HK-r@G{4EM~qe$
z3@$lzzX(g1SX^9n--Ga+WshPT`Z`NnWvEH?Fe<*=dP-o;Ztk|FN6J#W=r`?x&DP>Z
zU5S>wP~OJt(m%PldT{;I`Nb-YIxH2k4%|!iMe%{lYe3&XS=xh8Eo3kP0JPIpB!>d;
z9g2zR>Y9^HoH2b^-Ye;+Y&KSycCq*1u_T{sw#K3+my~~CV!<^o8`JY_z6s?hrWeD3
zJ!rs5Kp$Fh^eO%lOm<$&q+TUyrk+@qD3#$lU}R@1mvy5gnODKxs^ET8)dOP2hVhrW
z)T!;7t;cipxx(`%gGirA@3pzvimIX(9nAFA9XMM+2&C|0ElA>3cE2(uedxI#6REvB
zRvGJ6&{Kl(EJ(Sg5U_bW)ON?ay5~60pzoLJklExv5*?WMW{JLyNLMLZU)1ULSu#<=
z>+x=H&Uu$2=g|3E@(PdjZr*=JmSW1#IGXuAY5O^^>5;Z+0x8wx9Zk(ts(^a
zvUTabv1dXpc2b-Xma9=`uCL2D^Srs2FFRx$@M*J7rMNg$VPXiOHqfzYj~bk_QmbNe
z}zJG{QhMnzvfE&3=bjd(kV%$J_1Q+^{sc|2J`%;xI
zUJzJT5YFdYrn2)g@FjF%=oyykk66Pp5bQyoZXyKl0TTckZc)Vx8ek%*%V9Nr@A({u
zUO9PXcIwa!@?dheIwev=ytK!8vdw|+7)GqAuh
zkK33?)$v^;C{zodiD`}XG#>0V9@HyW{*EWTf>9sw^vF$N=v12W>L9}mr9s_;bZx|C
zyScJbTm-&GO}f_^hpH(?c@+;zcGnbk2TIOfdD3|Nd!p2Zye|k(Mb?i7pSI?mCE5eg
zQpv8Vi!dZe)~C$RIn=tk_bmhP%}Yeo);*y
zu+(I9>7K4$+6X+PgU>4ZxehJ)`KnJcMT#)sOHS{<^P0Q|iBOb8sL4m1Z}uWqv`kwp
zML^lhr){THb$vtaYFpOwT{A~naqsau7*aKidV5F;-HXL7KHGzM!k=ISSJ^745ZbE9
zZKs~nft8}A_g?j#Nz&TBS{F?9w4_L8;qXjc=c1=>{z6^T%a;1Ryq&W}xbe5IO-7_`aOtx+k!vHFxP}uz0j2dvgGGxA
z{>lf_$)bf}RhR-DQG@o}m=&iInPLdGfbw74$Ys4?a?U5k9~FGYbL6G
z*rGH>KAfcdnWFbVYG5aRF@UBri+=>9_R3M6lK@rI)j_I{B``+wp<4pJ2&%hr+t2q8
z-Lv}~UXG(e!$+5OwI)+;afGh+U%BLNYkdByMp|l^@n%y*4!wQohf1$)L)H6_ayYMiH&diD)_xL3RXCBWZ$_H?Y)tG)7pVv-y*%REE)HYb5GrhU#Z&0u-Zn^Vn6I3JX4~NP5_B|%N|Bf5VMxl@2LeJQ-KjUkJJ0o-{+dUOZt5e=nQB_b`rSS((bq}u`3Fu	lzh0K~b3x
zzJHQ=X0<|+aN}3U**W58*7thiw*5NRd41Y!K3~;xv`kL{PZi%VSHS+(^KN#&pX#}y
zC=TQogJ}d7*RU$gunY0|NNj+8gb6TV)Q!Z$x;5iWRcJcl{hY1Ev(EKRfjSe7on+Hf
z0o@gi(WheOwm_G{gXwt43MiWW~kMh%>HSWju2h=5uBVrlPtbribk
z%;t*#nK8yH0PPyzkP+{LVCc;Pa5|iJZuCG7WwKT8gQfPpDZVRGI+rLPYiEpXlHGPJ
zLhnvyhNDy1<8ul?DrjYsRlQEd9bnG*fDHw5-HTe=kBsPeMV@usc9U^SPpF0zc$QZ`
zyCjoYA)bFSXzZ5q2fx{%_KdmRhhkH?rdQQHef}^QNQsZ|y2VaR99FE(niGIiqPy^-
zArr=0LZ)52@R-#N9SdQ_?!eIT;r@}ng(m*#G~at19hA01g&0L5_1YdJo>;f|95j9~
zgiE3>Q!!-ECro?BC3tDFaI1ggycb@$_MT6daXH-)50
z%(h33KElyN!#=4UZt%r5VP1PRkE~WY(6ruhQyUOQsoO0V5uU@h8SQb*OSEX_;dwT{
z4MUSDO+f3QoLH%78E2-H4I;E8N6MpmEWZwW)OG7Z;%EB(j7zTJnj){HZY0AWF>iuK
zvW(KD3NuAdOwb!gaK4T%--3NY-Vs_22!(Y&no~dfeo3n#k6%nF$oat!m`$d`Unp8!
z5q*PO@X{I6t?>zO%fxyMWoVbf{XXLx#Tc^<999+nf{gLn)HPOrcZ
zwg!?mAiuVe`@RZn99(gjvd0n9Jr15qZHAt|;W2gKQNcW9;)i-?6>ti}6dR%-I$09)
z2I-6wC_S2Khl@MmMqR_OX9ipZzLaRtbJNYm#3CxK%AEW8K3M3&LrN>2EvyW@psmrgFdUt6+McGiLPT}{I5i>TS>E6xHk#e;h>2j@~rf*RSFPurp
zt_`s9TF=YG`wh0@W(dNPW2xp#13$9I^iJn)Tkb&~Z{)+m^yTIwWGHfx+ItX@5R3yM
zc#X%Q-eOS5)T-H{%;MJ(Kl6JTnzlxFE(;bs6W)*4$CFY(f%_jw1?|9=Rofa)jT<7n
z7L(GcdAZ24o8E+#XS6zKczAzBOg3?qCKD=YDYGW5!V{4CQLPWt(FBvkKZJ`hkAvAQ
zF%H9TAO|4mNCNt(vm9?ozExY|mhbhq_0HB8bnvgEUvs2SpB=tavS8gm17ph2z@I#Z
zrFVhiO=W+}JDf^t_y~)ZH)?2WOLd|;Mt;q#Sn+Fq8xzsK_!WaY)Rr4-uXM#ZfzqOA
zY$&&?Yb7r23`1HB);bx$zb-1*w+l~Sl+)3Pm}qNuAxyDOp}Wn8#M~;-DyYk#v%|KZ
zLTP}%l*7CS97Isz7QpMX@#VKee8}u1a>;46Ef*)YUe-66mCU>wH;wjDOf;N514*rYnBW#_6%AGaA$a-1gPpyn6P={7xHaXf?4gYQ-o9IVamD_k0(TW4f*al
zm|mZ5*!TYY`G4xWPudpOSp*O*>Z=AJTt_c
zLk6^)Q07uLEhM>VYqr21=-0UwL72$msQbVt1`NeVb;l6G&&MgureCWO9`-U`UB7M4W0KPkr~b){9>J^_Ahmg_+yX{gFnKhhV2dWqB$c
zwp1G}JN^(1`Gdts#j;r*uLPx?pjwx{K3KW*x2eHXc;Zd!C4ql6I3QoDEsj1B1!%QOp;r~HDmFUG59lw)g-PD-kn7+8Vp|*a_D06zDbGZ9M
z++m#`Zx&<*M$G#*(Yf~RUfa%IQnvz)r{F~m6Zz8v6Pqw4j3?}wG;CE1j7Mf6FfiFA
zP}b~vT%`#5E{LMr=Hi{R`VIk?vdCw@ICI1x0
z8c)iBQH@}e+ibpj3Zn)xfcNemq*uaW%@au(5}9SS+-!>MA6kgAH@kEDjIA0aKCJI3
zYqh0p2-Ku}EY*)^bsprT2GEZeK{*O1pk(Huk&_?1(FaG>R;OL2N|Nh7BSoxb^u2Qo
z-{=2x?(w6N!y`Wu`EAi7XKdSMD`%VFNXeuvOre1XI?352BjP%GiUf$`xUj)>hW{AW>MVH)a)24Wu}BVh;nZD-_qH
zN|frDT3w0Xp_}z-K-{K4%%VAhIq0CAmHgN_OJ1PGyG%=iZavLl^FF8Mu=y`Cte7yM
zV!k4rasXS!Joj==?E=9Fk87xIy6KlV57Y-Ru#N{+R0pr_@FS8Q20m)AM=p>M-0`T_(U4hl@ycR5RY>awj3u*~MFrjs9dNeX0V^
z=Ckc*S*7^Z;}i_b)EBDE7EA-SNo_J+Few9>Ss$keY?4le$&gbu!NcJ8ZerSX{QzyF
zJxKXx)%;=I+{vR
z+yCd*ayH7^uS(%kv$Xp2M&@9_CRSa(GfSQe;Krfq}{hd9-ph*XhKR
zUmg~*^X=7~Q@hC2($FpP%Rj}95wWGL5%T3zO-|J?Mk_kj73faJFfe$`pq(jn#L
z?8h$kgo)rgJ%NrNQU2N0guxzcDWt
zK2R+Tq0F2|2zEAz_HM`6n!UcJwUZ*Mc;)T-40H)Ub%-rg45ZU6NXBE^JqSS6^CilZ
z+B+w?m6MZn*vZB9fkta#PXtU}Wca@z0PKo|-a5t-3Ck`h+8p|^~0W?<5r
zeTK3>R7lY8Wsk6z>yy49r)ikCFsc=7a^8ZK2D^)Rffv?>9d-)&ZAxu_%H4*Iskmph
zwpEfPb@-=_xq^*M^i0cre_T@5R#hyFv@x_}Sd_m9aYHBXLEc%w3yH$|9QjNY>i%dl
zMtJgc&Rf8*Q%Kzs=jiF|^T6#UB|%H{OP#pM%@qF>^PjC4Hop#7g8ZghGsU*)51Ii-
z8s~M|*-SE{;>xrw!|HjUP}^$2$L^x>Y*jn2Ph4X9N6$R+`dOWEyn!eDtLB8MyN+_W
zSGZcHt>$=%vB}l(cqi{l%1GT-9Rr&+A-7p*grO@5vtW*3>DG~-Tu!7Kuc^t}C%0Oc
zmq7)e3C4F+mB872YE;lKkTO>oV1)M#nP!Xk6JRwM9D34+)vypzwHDq=tliOT{i^k2
z9w9lTGY)R12P5URgDL$pclKuo3?GxTBqZksbt`vm3}~LHyxZ8GVi7gN$d-J6?Er*>
zhx5&wY@!&e5EX2;=5#iR%^eZ`AmCfE${i{W-eU<8N9C3^@T3eerA*$zys%T3Z*bd>
z{P_l1V`m22gebEe!`t^D|Fli8-&?}VU{s4C-~>-698ka~F#W4g=O@s|R*-WBQM~GV
z5V8Uu*JO5BBE?uFM(u5{lU?p~`>)>fpTpox5hD34C?;;JOnP%tH|(Gc<=TX%i>yx7
zD!6%{i>QBVAE;?ED$kyST*11l6S5z%zgRo;J
z`j$Eyd7rHHV|iyo#?D3?o8EZ@x)XINDuFFz&B|mSKwSmwC`5r-l*RDY(2EO&^>sp>
zK8HuJ2VF1wA6Zh{gS__c{w;cXFp%pm(%0U@$aq~kGDXBoL1`_
ze+$ob;_l)oqYg9eu80cyGHd?#Hv0f4?V&5E+|OeSj@(3@qisi_xtQ0e*3rKA8-b^k
zS+`Z`BaX30wlm_Pk_BdjL4N`5xKHZ2)vrpr!1lB*XcdeJJn8M4vS
zzY)ilWaWW9JOgpSm*OLPC4AUNerA7$%89z0C*lw%O*J~?uW45P5)UNdsW&lkdyoSL
ze?w}2{jU02?Ay5zBnkd}Rld45$CBV4HE&<-HsC3;q_O#ep--e`!2S4DFUV-pl<`P^dB?k{CnDx*
ziB0aoM^vw8TUptqCf4}}q~e;;gS8FloMnf*;uq50ln2sId{%ZDsXzE;t)GB&Yq-r=%=YhMNDlF?PUvT+Pg|PTuQ!*i`Q;ET
z)P2`(Yg}F0>^V2}b;-+B$;?&5F9&TDmS0sd7CT>Ym;lbTkn(S+LSd^Jag;&@GvUdyt~(I53y<7@BP8
zz|_cf$a0d0y4u81dL*Kt5!I_Xq$zuGb$L_2;B}cuV#C)yWE60$X--C?sLKlSrU1;wVd=(Td&wli`
zqoP1^FrpxY(2bpLKAn3y-ybZQX=OcH9}|dZbKA4Qi|PxsluNK$EY$)7C~S8n0SZZ-
zn1f&~&|Wcr(Z`x*P_7f-#54~@1U{;Xu@xz~^Gu9aoTI}w!1~=M$an81!WpA#>)QS={z6+cMN!V1}Jaz48o5-*hR#*hEryhD0*$u
zU`67Tru*C|-B4JQ*O&ZEbmvaT!b=kqqx&i*)F|}F
zHW5E4#%=!}?_@w5%l9C>fVVI=U~MtH=H#Uolw(#-_A=AdGk~s1@anNtQ
z_V)gVN@WX`*z`wa)qz}IyNo5pZTX#P(8Y)oJKlqs2yk3_#gA`OF0QwMUV#t~|0AjW
zIxz(*aiJc(FTWpIGr7o72B(G#M+HZ+-h!?C2=8Uea#v?X(ehy%qEVD}wTnR3Q4fAz
zy>1UB&SSZ6+@z|$A;1$fp-5IX$ga0U+}UE9UblqYL46rYVhGQ;@QYw)pKxD?NBdas
z&DMP@_YK@oQBsThK69hV17-%Su=x;FQwnkQ7TNlVfj0Fa`V4>|4GKVIPfy!4rz4Ir
z6z-iXa?Wx(@0L|^JWt88W7fYqE|0etZr@o<`?laPKH|!n9m^hZQk%=pZ!R=zwK@U6
zS2z2o)p?<&wmGcAb^O=RX9N(9p)9UBGV~I!g6%vcO|K6tfO0GnXb5i!XBirgmeX2s
zPq%tw=Vby61y$|d9CT$dz`~(J8RKcqhv^ViLvsKt^O-Nu$53ZzFY$_B)92UpuGfyJ
z{Ty9v?)j%Wb4@}7w{lW)O#hR9?}0)yMW5%^fMy@v!D1{8AkGs^7f}KLSoU(U>sYTBsO-|WD76vlu6=v@hp+0|uQSXQZ_VdeLi6HM6`&_UNyE!wNMHiL4;2#BgiEGui2j(keY6-
ze592?3aau3z`Sk$6Z9t-7h7qGtuR^uK%+_H3
zeB#sN!yP>l3yizyu04p*9>fnjS#|@krU_hj-r(`J>8+XLAyuJj4_M9jH3cuKSQ7`D+ZYv=+b3R1lf
zXV0<v(qC#RGEgicfZn
z?N3@7EK4^mES2s!gP^*>6Z8%PUCejG9{3k;YvAG#>(IR8>a@Sa`nrVmc=btC<=LTo
zj(M%3W`90ajqX97f_br#TqF?!9wM}>vP%A3L{hls3}`_OBXeF8NP5bH;X2Y$M5grg
zsjebNt+Se8FI6$5QaP%TbtJgdQCJL+Z~)RPnU_X9s9Z>!o5tiphQ-bG!(=k@Q0O>8
zUp5!pTGo@U*jd$UMx3k%!&(YrTkAKBeSkEHq$gXbXX-1tsr03ZXQLk0{DCnZ+5Na_hwLhG*?dcVf$4ciySbBgl4!xA)ScEaL%kpFzDR~Zrc
zW-_^xK2WP|glYjpV{$y3uc`z+p0CcUA&y?NffTR#!7B41!V@CY{4q!p{=MBuDe1A4E|VwlC%e$-b4oGSj|l
zAq8~LEgyH!!?~V9tq04mPrrSsZPTeD35nn~hyQg-N=z-9dc(4)WC$oy^)^z451sz7A_^F6MAyU+EX-Yd!<(9tJGPUBct#;0~WcO@E{
z>KkJ$gu1N?U1TLi1_sQIJ>yl7{$aq2{)`pEd$^q3?IYv6h@8xe)nkgcHq@9p@0^x2
zT>A69TjTv=WS@`@b3N@rie1O~R=(XD{`23v9(E3&h_3}tmZsoc^k(aB3nw@c$jVM^5jOd}%RB#@x6t@{AV2@B+iU0X
z@p3%+^0dVc2?HtG&nu&)Kl-w^2K2?upTi}(_mH*^O;lG
lnZGj1*PdBiG6_(<&EpX#b}#OZn2j;y|Ih#XJizQt{s%+1B?`js_6`9JO5JC}C2_Yt1V;M6ovP*UmQ`xh9F!p7#i%N_o
z>nxJ&Gs<`~i~H{0@9%fdx!bwRx##|KU*=`zoO!=q^L#w_=kxX2`@Tnlh+H)>H-T_)
za6s;We~`Uth#_Pj2gl#nzXm5a=ijlPi;I(+XFm_m-^t4-z{ktW&&$KZFT~F;AP5c~
zz5~KSf(QP7{=3QF<$qU!FF{@&-oH=$uZ_Krkb}GsBu6(V#|g;3gB+X(Irh3Cau5gy
zH%RSYg8wx*_HlA??*~cZ7XTlq69LKR|u
zi)lVhe#a|+rMg4hc9^Q5buZuxL}FL8_6
z{M*cisJxH+*G%}vVJvq2znC6R_*LHj4`%+kxBKE${@b%%d=K(0aSzhb1FQ999@3*g
zL)3ew8e;Wb=5rk58HQc#gM|6E<`G*XPshd-ue%LbF2QH{u6;C@k?cI<&G>*%w~oZt
z?E^Ou!;r}8ajxfC?+s*pTouE=I6F5!3n9n(FpTicUKLy6!usU_8wuLCL`@^}Y#KGQ
zzCJ<$S=R#=Y;BRh6U$q|CuY~$b1IJbUa_}rv4n=|&2Enn$A`8Z*?gIM5bi%LEQa&}
zt=2}xKS3}p$wcW}eQF~>V2^Zw6WrCQSAN!CpzGB5`rA*5&*0h*A8SN%Bu%}&<2V4X
z5$@TTRA=+UXnqs(eVx#aeLxpQIciOjP&~f+HUidt_%T5kI@tDf9QynqI2scw#S=`q
zQs-gR>u>-n(YFT?W{+K1{HQ*uM-OcVDrhpD^^Y^z$7sSa3Jkd@oO@%UXPoGlQ+x_3
zSDd}VOVIAe9bC#Ku6{A@)vqxBL-c7!SUI1a%N)LFtC1h7YVkUtD!twTjruw`FtLn|
zt&cf2BU>^_%SfmX=^=vdllRZJ?W-5~8#6xK
z2Aa7gmX(|u2PHKmZo&7
zE5zB?-VGMyXFH+Vz0b^qo};9dx8<~_%f$KE2UU*eri_*p?TqD;(y~`PMl6wSe_-~!
zvzN~404|Ihn2tVp{o?AaQb3oY+r2Sq-O(-x$j`65+Eq*3Vs84Rbp0sDdS-9xML9dC
z6f`==^L~HvNM7*>s9aOR>;vko3Ihcc=eU6Z`YXQnK#uS#k=!=y0_68SnemobO^8+N
zew@+pt$Dgn9`}$YkkyemX!b(ENXO=9rl}VOiHNVSoLzTRo3e04L^GzD7wHdKHJ|n%
zClXSils(AzBsM?Ii-E*+sG{r`h9Sr<|6dn2UIbO#t-{H)qy}?W=HK-r@G{4EM~qe$
z3@$lzzX(g1SX^9n--Ga+WshPT`Z`NnWvEH?Fe<*=dP-o;Ztk|FN6J#W=r`?x&DP>Z
zU5S>wP~OJt(m%PldT{;I`Nb-YIxH2k4%|!iMe%{lYe3&XS=xh8Eo3kP0JPIpB!>d;
z9g2zR>Y9^HoH2b^-Ye;+Y&KSycCq*1u_T{sw#K3+my~~CV!<^o8`JY_z6s?hrWeD3
zJ!rs5Kp$Fh^eO%lOm<$&q+TUyrk+@qD3#$lU}R@1mvy5gnODKxs^ET8)dOP2hVhrW
z)T!;7t;cipxx(`%gGirA@3pzvimIX(9nAFA9XMM+2&C|0ElA>3cE2(uedxI#6REvB
zRvGJ6&{Kl(EJ(Sg5U_bW)ON?ay5~60pzoLJklExv5*?WMW{JLyNLMLZU)1ULSu#<=
z>+x=H&Uu$2=g|3E@(PdjZr*=JmSW1#IGXuAY5O^^>5;Z+0x8wx9Zk(ts(^a
zvUTabv1dXpc2b-Xma9=`uCL2D^Srs2FFRx$@M*J7rMNg$VPXiOHqfzYj~bk_QmbNe
z}zJG{QhMnzvfE&3=bjd(kV%$J_1Q+^{sc|2J`%;xI
zUJzJT5YFdYrn2)g@FjF%=oyykk66Pp5bQyoZXyKl0TTckZc)Vx8ek%*%V9Nr@A({u
zUO9PXcIwa!@?dheIwev=ytK!8vdw|+7)GqAuh
zkK33?)$v^;C{zodiD`}XG#>0V9@HyW{*EWTf>9sw^vF$N=v12W>L9}mr9s_;bZx|C
zyScJbTm-&GO}f_^hpH(?c@+;zcGnbk2TIOfdD3|Nd!p2Zye|k(Mb?i7pSI?mCE5eg
zQpv8Vi!dZe)~C$RIn=tk_bmhP%}Yeo);*y
zu+(I9>7K4$+6X+PgU>4ZxehJ)`KnJcMT#)sOHS{<^P0Q|iBOb8sL4m1Z}uWqv`kwp
zML^lhr){THb$vtaYFpOwT{A~naqsau7*aKidV5F;-HXL7KHGzM!k=ISSJ^745ZbE9
zZKs~nft8}A_g?j#Nz&TBS{F?9w4_L8;qXjc=c1=>{z6^T%a;1Ryq&W}xbe5IO-7_`aOtx+k!vHFxP}uz0j2dvgGGxA
z{>lf_$)bf}RhR-DQG@o}m=&iInPLdGfbw74$Ys4?a?U5k9~FGYbL6G
z*rGH>KAfcdnWFbVYG5aRF@UBri+=>9_R3M6lK@rI)j_I{B``+wp<4pJ2&%hr+t2q8
z-Lv}~UXG(e!$+5OwI)+;afGh+U%BLNYkdByMp|l^@n%y*4!wQohf1$)L)H6_ayYMiH&diD)_xL3RXCBWZ$_H?Y)tG)7pVv-y*%REE)HYb5GrhU#Z&0u-Zn^Vn6I3JX4~NP5_B|%N|Bf5VMxl@2LeJQ-KjUkJJ0o-{+dUOZt5e=nQB_b`rSS((bq}u`3Fu	lzh0K~b3x
zzJHQ=X0<|+aN}3U**W58*7thiw*5NRd41Y!K3~;xv`kL{PZi%VSHS+(^KN#&pX#}y
zC=TQogJ}d7*RU$gunY0|NNj+8gb6TV)Q!Z$x;5iWRcJcl{hY1Ev(EKRfjSe7on+Hf
z0o@gi(WheOwm_G{gXwt43MiWW~kMh%>HSWju2h=5uBVrlPtbribk
z%;t*#nK8yH0PPyzkP+{LVCc;Pa5|iJZuCG7WwKT8gQfPpDZVRGI+rLPYiEpXlHGPJ
zLhnvyhNDy1<8ul?DrjYsRlQEd9bnG*fDHw5-HTe=kBsPeMV@usc9U^SPpF0zc$QZ`
zyCjoYA)bFSXzZ5q2fx{%_KdmRhhkH?rdQQHef}^QNQsZ|y2VaR99FE(niGIiqPy^-
zArr=0LZ)52@R-#N9SdQ_?!eIT;r@}ng(m*#G~at19hA01g&0L5_1YdJo>;f|95j9~
zgiE3>Q!!-ECro?BC3tDFaI1ggycb@$_MT6daXH-)50
z%(h33KElyN!#=4UZt%r5VP1PRkE~WY(6ruhQyUOQsoO0V5uU@h8SQb*OSEX_;dwT{
z4MUSDO+f3QoLH%78E2-H4I;E8N6MpmEWZwW)OG7Z;%EB(j7zTJnj){HZY0AWF>iuK
zvW(KD3NuAdOwb!gaK4T%--3NY-Vs_22!(Y&no~dfeo3n#k6%nF$oat!m`$d`Unp8!
z5q*PO@X{I6t?>zO%fxyMWoVbf{XXLx#Tc^<999+nf{gLn)HPOrcZ
zwg!?mAiuVe`@RZn99(gjvd0n9Jr15qZHAt|;W2gKQNcW9;)i-?6>ti}6dR%-I$09)
z2I-6wC_S2Khl@MmMqR_OX9ipZzLaRtbJNYm#3CxK%AEW8K3M3&LrN>2EvyW@psmrgFdUt6+McGiLPT}{I5i>TS>E6xHk#e;h>2j@~rf*RSFPurp
zt_`s9TF=YG`wh0@W(dNPW2xp#13$9I^iJn)Tkb&~Z{)+m^yTIwWGHfx+ItX@5R3yM
zc#X%Q-eOS5)T-H{%;MJ(Kl6JTnzlxFE(;bs6W)*4$CFY(f%_jw1?|9=Rofa)jT<7n
z7L(GcdAZ24o8E+#XS6zKczAzBOg3?qCKD=YDYGW5!V{4CQLPWt(FBvkKZJ`hkAvAQ
zF%H9TAO|4mNCNt(vm9?ozExY|mhbhq_0HB8bnvgEUvs2SpB=tavS8gm17ph2z@I#Z
zrFVhiO=W+}JDf^t_y~)ZH)?2WOLd|;Mt;q#Sn+Fq8xzsK_!WaY)Rr4-uXM#ZfzqOA
zY$&&?Yb7r23`1HB);bx$zb-1*w+l~Sl+)3Pm}qNuAxyDOp}Wn8#M~;-DyYk#v%|KZ
zLTP}%l*7CS97Isz7QpMX@#VKee8}u1a>;46Ef*)YUe-66mCU>wH;wjDOf;N514*rYnBW#_6%AGaA$a-1gPpyn6P={7xHaXf?4gYQ-o9IVamD_k0(TW4f*al
zm|mZ5*!TYY`G4xWPudpOSp*O*>Z=AJTt_c
zLk6^)Q07uLEhM>VYqr21=-0UwL72$msQbVt1`NeVb;l6G&&MgureCWO9`-U`UB7M4W0KPkr~b){9>J^_Ahmg_+yX{gFnKhhV2dWqB$c
zwp1G}JN^(1`Gdts#j;r*uLPx?pjwx{K3KW*x2eHXc;Zd!C4ql6I3QoDEsj1B1!%QOp;r~HDmFUG59lw)g-PD-kn7+8Vp|*a_D06zDbGZ9M
z++m#`Zx&<*M$G#*(Yf~RUfa%IQnvz)r{F~m6Zz8v6Pqw4j3?}wG;CE1j7Mf6FfiFA
zP}b~vT%`#5E{LMr=Hi{R`VIk?vdCw@ICI1x0
z8c)iBQH@}e+ibpj3Zn)xfcNemq*uaW%@au(5}9SS+-!>MA6kgAH@kEDjIA0aKCJI3
zYqh0p2-Ku}EY*)^bsprT2GEZeK{*O1pk(Huk&_?1(FaG>R;OL2N|Nh7BSoxb^u2Qo
z-{=2x?(w6N!y`Wu`EAi7XKdSMD`%VFNXeuvOre1XI?352BjP%GiUf$`xUj)>hW{AW>MVH)a)24Wu}BVh;nZD-_qH
zN|frDT3w0Xp_}z-K-{K4%%VAhIq0CAmHgN_OJ1PGyG%=iZavLl^FF8Mu=y`Cte7yM
zV!k4rasXS!Joj==?E=9Fk87xIy6KlV57Y-Ru#N{+R0pr_@FS8Q20m)AM=p>M-0`T_(U4hl@ycR5RY>awj3u*~MFrjs9dNeX0V^
z=Ckc*S*7^Z;}i_b)EBDE7EA-SNo_J+Few9>Ss$keY?4le$&gbu!NcJ8ZerSX{QzyF
zJxKXx)%;=I+{vR
z+yCd*ayH7^uS(%kv$Xp2M&@9_CRSa(GfSQe;Krfq}{hd9-ph*XhKR
zUmg~*^X=7~Q@hC2($FpP%Rj}95wWGL5%T3zO-|J?Mk_kj73faJFfe$`pq(jn#L
z?8h$kgo)rgJ%NrNQU2N0guxzcDWt
zK2R+Tq0F2|2zEAz_HM`6n!UcJwUZ*Mc;)T-40H)Ub%-rg45ZU6NXBE^JqSS6^CilZ
z+B+w?m6MZn*vZB9fkta#PXtU}Wca@z0PKo|-a5t-3Ck`h+8p|^~0W?<5r
zeTK3>R7lY8Wsk6z>yy49r)ikCFsc=7a^8ZK2D^)Rffv?>9d-)&ZAxu_%H4*Iskmph
zwpEfPb@-=_xq^*M^i0cre_T@5R#hyFv@x_}Sd_m9aYHBXLEc%w3yH$|9QjNY>i%dl
zMtJgc&Rf8*Q%Kzs=jiF|^T6#UB|%H{OP#pM%@qF>^PjC4Hop#7g8ZghGsU*)51Ii-
z8s~M|*-SE{;>xrw!|HjUP}^$2$L^x>Y*jn2Ph4X9N6$R+`dOWEyn!eDtLB8MyN+_W
zSGZcHt>$=%vB}l(cqi{l%1GT-9Rr&+A-7p*grO@5vtW*3>DG~-Tu!7Kuc^t}C%0Oc
zmq7)e3C4F+mB872YE;lKkTO>oV1)M#nP!Xk6JRwM9D34+)vypzwHDq=tliOT{i^k2
z9w9lTGY)R12P5URgDL$pclKuo3?GxTBqZksbt`vm3}~LHyxZ8GVi7gN$d-J6?Er*>
zhx5&wY@!&e5EX2;=5#iR%^eZ`AmCfE${i{W-eU<8N9C3^@T3eerA*$zys%T3Z*bd>
z{P_l1V`m22gebEe!`t^D|Fli8-&?}VU{s4C-~>-698ka~F#W4g=O@s|R*-WBQM~GV
z5V8Uu*JO5BBE?uFM(u5{lU?p~`>)>fpTpox5hD34C?;;JOnP%tH|(Gc<=TX%i>yx7
zD!6%{i>QBVAE;?ED$kyST*11l6S5z%zgRo;J
z`j$Eyd7rHHV|iyo#?D3?o8EZ@x)XINDuFFz&B|mSKwSmwC`5r-l*RDY(2EO&^>sp>
zK8HuJ2VF1wA6Zh{gS__c{w;cXFp%pm(%0U@$aq~kGDXBoL1`_
ze+$ob;_l)oqYg9eu80cyGHd?#Hv0f4?V&5E+|OeSj@(3@qisi_xtQ0e*3rKA8-b^k
zS+`Z`BaX30wlm_Pk_BdjL4N`5xKHZ2)vrpr!1lB*XcdeJJn8M4vS
zzY)ilWaWW9JOgpSm*OLPC4AUNerA7$%89z0C*lw%O*J~?uW45P5)UNdsW&lkdyoSL
ze?w}2{jU02?Ay5zBnkd}Rld45$CBV4HE&<-HsC3;q_O#ep--e`!2S4DFUV-pl<`P^dB?k{CnDx*
ziB0aoM^vw8TUptqCf4}}q~e;;gS8FloMnf*;uq50ln2sId{%ZDsXzE;t)GB&Yq-r=%=YhMNDlF?PUvT+Pg|PTuQ!*i`Q;ET
z)P2`(Yg}F0>^V2}b;-+B$;?&5F9&TDmS0sd7CT>Ym;lbTkn(S+LSd^Jag;&@GvUdyt~(I53y<7@BP8
zz|_cf$a0d0y4u81dL*Kt5!I_Xq$zuGb$L_2;B}cuV#C)yWE60$X--C?sLKlSrU1;wVd=(Td&wli`
zqoP1^FrpxY(2bpLKAn3y-ybZQX=OcH9}|dZbKA4Qi|PxsluNK$EY$)7C~S8n0SZZ-
zn1f&~&|Wcr(Z`x*P_7f-#54~@1U{;Xu@xz~^Gu9aoTI}w!1~=M$an81!WpA#>)QS={z6+cMN!V1}Jaz48o5-*hR#*hEryhD0*$u
zU`67Tru*C|-B4JQ*O&ZEbmvaT!b=kqqx&i*)F|}F
zHW5E4#%=!}?_@w5%l9C>fVVI=U~MtH=H#Uolw(#-_A=AdGk~s1@anNtQ
z_V)gVN@WX`*z`wa)qz}IyNo5pZTX#P(8Y)oJKlqs2yk3_#gA`OF0QwMUV#t~|0AjW
zIxz(*aiJc(FTWpIGr7o72B(G#M+HZ+-h!?C2=8Uea#v?X(ehy%qEVD}wTnR3Q4fAz
zy>1UB&SSZ6+@z|$A;1$fp-5IX$ga0U+}UE9UblqYL46rYVhGQ;@QYw)pKxD?NBdas
z&DMP@_YK@oQBsThK69hV17-%Su=x;FQwnkQ7TNlVfj0Fa`V4>|4GKVIPfy!4rz4Ir
z6z-iXa?Wx(@0L|^JWt88W7fYqE|0etZr@o<`?laPKH|!n9m^hZQk%=pZ!R=zwK@U6
zS2z2o)p?<&wmGcAb^O=RX9N(9p)9UBGV~I!g6%vcO|K6tfO0GnXb5i!XBirgmeX2s
zPq%tw=Vby61y$|d9CT$dz`~(J8RKcqhv^ViLvsKt^O-Nu$53ZzFY$_B)92UpuGfyJ
z{Ty9v?)j%Wb4@}7w{lW)O#hR9?}0)yMW5%^fMy@v!D1{8AkGs^7f}KLSoU(U>sYTBsO-|WD76vlu6=v@hp+0|uQSXQZ_VdeLi6HM6`&_UNyE!wNMHiL4;2#BgiEGui2j(keY6-
ze592?3aau3z`Sk$6Z9t-7h7qGtuR^uK%+_H3
zeB#sN!yP>l3yizyu04p*9>fnjS#|@krU_hj-r(`J>8+XLAyuJj4_M9jH3cuKSQ7`D+ZYv=+b3R1lf
zXV0<v(qC#RGEgicfZn
z?N3@7EK4^mES2s!gP^*>6Z8%PUCejG9{3k;YvAG#>(IR8>a@Sa`nrVmc=btC<=LTo
zj(M%3W`90ajqX97f_br#TqF?!9wM}>vP%A3L{hls3}`_OBXeF8NP5bH;X2Y$M5grg
zsjebNt+Se8FI6$5QaP%TbtJgdQCJL+Z~)RPnU_X9s9Z>!o5tiphQ-bG!(=k@Q0O>8
zUp5!pTGo@U*jd$UMx3k%!&(YrTkAKBeSkEHq$gXbXX-1tsr03ZXQLk0{DCnZ+5Na_hwLhG*?dcVf$4ciySbBgl4!xA)ScEaL%kpFzDR~Zrc
zW-_^xK2WP|glYjpV{$y3uc`z+p0CcUA&y?NffTR#!7B41!V@CY{4q!p{=MBuDe1A4E|VwlC%e$-b4oGSj|l
zAq8~LEgyH!!?~V9tq04mPrrSsZPTeD35nn~hyQg-N=z-9dc(4)WC$oy^)^z451sz7A_^F6MAyU+EX-Yd!<(9tJGPUBct#;0~WcO@E{
z>KkJ$gu1N?U1TLi1_sQIJ>yl7{$aq2{)`pEd$^q3?IYv6h@8xe)nkgcHq@9p@0^x2
zT>A69TjTv=WS@`@b3N@rie1O~R=(XD{`23v9(E3&h_3}tmZsoc^k(aB3nw@c$jVM^5jOd}%RB#@x6t@{AV2@B+iU0X
z@p3%+^0dVc2?HtG&nu&)Kl-w^2K2?upTi}(_mH*^O;lG
lnZGj1*PdBiG6_(<&EpX#b}#OZn2j;y|Ih#XJizQt{s%+1B?
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Validate that classes from the jakarta.servlet.http package are
+implicitly imported by creating and using an instance of HttpUtils.
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp
new file mode 100644
index 0000000000..681535b582
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportJsp.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Validate that classes from the jakarta.servlet.jsp package are implicitly
+imported
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportLang.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportLang.jsp
new file mode 100644
index 0000000000..2adac10943
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportLang.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Validated that java.lang package is implicitly imported
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp
new file mode 100644
index 0000000000..410c255b91
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/implicitImportServlet.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Validate that classes from the jakarta.servlet package are implicitly
+imported
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/jsp_tagfile_directives_tag20_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/jsp_tagfile_directives_tag20_web.xml
new file mode 100644
index 0000000000..4d65be787d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/jsp_tagfile_directives_tag20_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfileDirectivesTag20
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeBodyContent.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeBodyContent.jsp
new file mode 100644
index 0000000000..8eb59c9f7a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeBodyContent.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+A translation error will result if JSP is used as tag directive
+body-content
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateBodyContent.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateBodyContent.jsp
new file mode 100644
index 0000000000..351f45a64a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateBodyContent.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDescription.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDescription.jsp
new file mode 100644
index 0000000000..b01e620138
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDescription.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDisplayName.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDisplayName.jsp
new file mode 100644
index 0000000000..a28ddd70fe
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDisplayName.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDynamicAttributes.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDynamicAttributes.jsp
new file mode 100644
index 0000000000..2cc6a566cd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateDynamicAttributes.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateExample.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateExample.jsp
new file mode 100644
index 0000000000..cf7a7373bf
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateExample.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateIsELIgnoredFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateIsELIgnoredFatalTranslationError.jsp
new file mode 100644
index 0000000000..43ad55491e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateIsELIgnoredFatalTranslationError.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+invokes a tag file that contains two isELIgnored directives of 
+different values, resulting a translation error
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLanguageFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLanguageFatalTranslationError.jsp
new file mode 100644
index 0000000000..118868a9f3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLanguageFatalTranslationError.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+invokes a tag file that declares two language directive attributes,
+resulting a translation error.
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLargeIcon.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLargeIcon.jsp
new file mode 100644
index 0000000000..be215b0133
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateLargeIcon.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateSmallIcon.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateSmallIcon.jsp
new file mode 100644
index 0000000000..d398402d6f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeDuplicateSmallIcon.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeMultiplePageEncoding.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeMultiplePageEncoding.jsp
new file mode 100644
index 0000000000..79a8284813
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeMultiplePageEncoding.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Declare a tag directive with two pageEncoding attributes, resulting
+in a translation error.
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeUnrecognizedAttribute.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeUnrecognizedAttribute.jsp
new file mode 100644
index 0000000000..0b520e34a0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/negativeUnrecognizedAttribute.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+unexpected output.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveDuplicateAttributes.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveDuplicateAttributes.jsp
new file mode 100644
index 0000000000..f150179f02
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveDuplicateAttributes.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+Test PASSED.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveImport.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveImport.jsp
new file mode 100644
index 0000000000..59a52b1877
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveImport.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Use the import attribute to import 'java.util.ArrayList'.
+Validated that a ArrayList object can be created and used.
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveLang.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveLang.jsp
new file mode 100644
index 0000000000..f068d8aeb7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveLang.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+validates that the language attribute can be set to java without
+an error.
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveMultipleImport.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveMultipleImport.jsp
new file mode 100644
index 0000000000..bd0abddc63
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag20/positiveMultipleImport.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Declare a tag directive with two import attributes.
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseAction.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseAction.jsp
new file mode 100644
index 0000000000..2bcfd455d6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseAction.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Set the deferredSyntaxAllowedAsLiteral attribute to false.
+Verify that a translation error occurs when '{#' is used 
+in an action when the jsp version is set to 2.1 or greater
+in the implicit.tld file.
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseTemplateText.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseTemplateText.jsp
new file mode 100644
index 0000000000..6d8f9b9833
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralFalseTemplateText.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Set the deferredSyntaxAllowedAsLiteral attribute to false.
+Verify that a translation error occurs when '{#' is used 
+in template text when the jsp version is set to 2.1 or greater
+in the implicit.tld file.
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.gf
new file mode 100644
index 0000000000..bc50afbede
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.gf
@@ -0,0 +1 @@
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.jsp
new file mode 100644
index 0000000000..18973afcc7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueAction.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Set the deferredSyntaxAllowedAsLiteral attribute to true.
+Verify that the character sequence '{#' is allowed
+in an action when the jsp version is set to 2.1 or greater
+in the implicit.tld file.
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.gf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.gf
new file mode 100644
index 0000000000..bc50afbede
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.gf
@@ -0,0 +1 @@
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.jsp
new file mode 100644
index 0000000000..e3a76321ce
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/DeferredSyntaxAllowedAsLiteralTrueTemplateText.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+Set the deferredSyntaxAllowedAsLiteral attribute to true.
+Verify that the '{#' sequence is allowed as a string literal
+when used in template text when the jsp version is set to 2.1 or
+greater in the implicit.tld file.
+--%>
+
+<%-- invoke the tag --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseAction.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseAction.tag
new file mode 100644
index 0000000000..e0bee8ad90
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseAction.tag
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralFalseAction
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      tag directive attribute is set to false, a 
+                      translation error occurs when the '{#' character 
+                      sequence is used in an action and the jsp version
+		      is 2.1 or greater.
+**/ %>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%@ tag deferredSyntaxAllowedAsLiteral="false" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseTemplateText.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseTemplateText.tag
new file mode 100644
index 0000000000..0fec4e81c5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralFalseTemplateText.tag
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralFalseTemplateText
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      tag directive attribute is set to false, a 
+                      translation error occurs when the '{#' character 
+                      sequence is used in template text and the jsp 
+		      version is 2.1 or greater.
+**/ %>
+
+<%@ tag deferredSyntaxAllowedAsLiteral="false" %>
+
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueAction.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueAction.tag
new file mode 100644
index 0000000000..65cba26b4d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueAction.tag
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralTrueAction
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      tag directive attribute is set to true, 
+                      the '{#' character sequence is allowed in an
+		      action when the jsp version is 2.1 or greater.
+**/ %>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%@ tag deferredSyntaxAllowedAsLiteral="true" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueTemplateText.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueTemplateText.tag
new file mode 100644
index 0000000000..e3e03f7dac
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAllowedAsLiteralTrueTemplateText.tag
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : DeferredSyntaxAllowedAsLiteralTrueTemplateTextTest
+	Description : Verify that when the DeferredSyntaxAllowedAsLiteral 
+                      tag directive attribute is set to true, the '{#' 
+		      sequence is allowed as a string literal when used
+		      in template text and the jsp version is 2.1 or
+		      greater.
+**/ %>
+
+<%@ tag deferredSyntaxAllowedAsLiteral="true" %>
+
+#{expr}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAsLiteral.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAsLiteral.tag
new file mode 100644
index 0000000000..77b543a701
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/DeferredSyntaxAsLiteral.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="literal" %>
+<%
+    Object o = jspContext.getAttribute("literal");
+    out.println(o);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/implicit.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/implicit.tld
new file mode 100644
index 0000000000..22981b008e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/WEB-INF/tags/implicit.tld
@@ -0,0 +1,27 @@
+
+
+
+
+
+    1.0
+    implicit
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/jsp_tagfile_directives_tag21_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/jsp_tagfile_directives_tag21_web.xml
new file mode 100644
index 0000000000..7ee1369435
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/tag21/jsp_tagfile_directives_tag21_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfileDirectivesTag21
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare.tag
new file mode 100644
index 0000000000..14b27171b5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare.tag
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+<%@ variable name-given="declared" declare="false" scope="AT_END" %>
+<%!  String declared2; %>
+
+<%
+  jspContext.setAttribute("declared", "was declared");
+%>
+
+<%
+  out.println(declared2);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare2.tag
new file mode 100644
index 0000000000..ce5bdb6e67
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/falseDeclare2.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="declared2" declare="false" scope="AT_END" %>
+<%
+  jspContext.setAttribute("declared2", "was declared2");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSame.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSame.tag
new file mode 100644
index 0000000000..a75733a06d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSame.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="result" required="false" rtexprvalue="false"%>
+<%@ attribute name="var" required="true" rtexprvalue="false"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tag
new file mode 100644
index 0000000000..28e5f81f44
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="negativeAliasAttributeSameInclude.tagf" %>
+<%@ attribute name="var" required="true" rtexprvalue="false"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tagf
new file mode 100644
index 0000000000..eec57928be
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasAttributeSameInclude.tagf
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="result" required="false" rtexprvalue="false"%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasNameGiven.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasNameGiven.tag
new file mode 100644
index 0000000000..bf0691830e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeAliasNameGiven.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="true" rtexprvalue="false"%>
+<%@ variable alias="result" name-given="y" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNoAttribute.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNoAttribute.tag
new file mode 100644
index 0000000000..403ee5759e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNoAttribute.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="abc" required="true" rtexprvalue="false"%>
+<%@ tag dynamic-attributes="x" %>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotRequired.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotRequired.tag
new file mode 100644
index 0000000000..f0945c3a07
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotRequired.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="false" rtexprvalue="false"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotString.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotString.tag
new file mode 100644
index 0000000000..29d13c9313
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeNotString.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" type="java.lang.Integer"
+              required="true" rtexprvalue="false"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeRtexpr.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeRtexpr.tag
new file mode 100644
index 0000000000..d8d5240dad
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeRtexpr.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="true" rtexprvalue="true"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSame.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSame.tag
new file mode 100644
index 0000000000..dceb906450
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSame.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="true" rtexprvalue="false"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+<%@ variable alias="abcdef" name-from-attribute="var" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tag
new file mode 100644
index 0000000000..60393a8619
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="true" rtexprvalue="false"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+<%@ include file="negativeNameFromAttributeSameInclude.tagf" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tagf
new file mode 100644
index 0000000000..486400b436
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameFromAttributeSameInclude.tagf
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable alias="abcdef" name-from-attribute="var" scope="AT_BEGIN" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenBoth.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenBoth.tag
new file mode 100644
index 0000000000..5b511ec6b3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenBoth.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="true" rtexprvalue="false"%>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" 
+    name-given="y" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamic.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamic.tag
new file mode 100644
index 0000000000..b723616337
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamic.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag dynamic-attributes="x" %>
+<%@ variable name-given="x" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tag
new file mode 100644
index 0000000000..0252f276e5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="negativeNameGivenDynamicInclude.tagf" %>
+<%@ variable name-given="x" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tagf
new file mode 100644
index 0000000000..65d8734b43
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenDynamicInclude.tagf
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag dynamic-attributes="x" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenNeither.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenNeither.tag
new file mode 100644
index 0000000000..427c7a10b2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenNeither.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="true" rtexprvalue="false"%>
+<%@ variable alias="result" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSame.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSame.tag
new file mode 100644
index 0000000000..d651f36526
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSame.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="AT_BEGIN" %>
+<%@ variable name-given="x" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tag
new file mode 100644
index 0000000000..4e826a46a6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ include file="negativeNameGivenSameInclude.tagf" %>
+<%@ variable name-given="x" scope="AT_BEGIN" %>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tagf b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tagf
new file mode 100644
index 0000000000..96f7bdec89
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/negativeNameGivenSameInclude.tagf
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="AT_BEGIN" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare.tag
new file mode 100644
index 0000000000..4c1bcf38ac
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare.tag
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+<%@ variable name-given="declared" scope="AT_BEGIN" %>
+<%
+  jspContext.setAttribute("declared", "Test PASSED");
+%>
+
+<%
+  out.println("declared2:" + declared2);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare2.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare2.tag
new file mode 100644
index 0000000000..c0366974ce
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveDeclare2.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="declared2" scope="AT_END" %>
+<%
+  jspContext.setAttribute("declared2", "declared2");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveVariableClass.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveVariableClass.tag
new file mode 100644
index 0000000000..83f61c26ca
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/positiveVariableClass.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="y" variable-class="java.lang.Integer"
+    scope="AT_BEGIN" %>
+<%
+  jspContext.setAttribute("y", new Integer(2));
+%>
+tag invoked
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBegin.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBegin.tag
new file mode 100644
index 0000000000..128e6f7b6c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBegin.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="AT_BEGIN" %>
+
+<%
+  if(jspContext.getAttribute("x", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. x is not null in tag file");
+  }
+  jspContext.setAttribute("x", "2");
+%>
+
+${x} <%-- (x == 2) --%>
+<%
+  jspContext.setAttribute("x", "4");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBeginNameFromAttribute.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBeginNameFromAttribute.tag
new file mode 100644
index 0000000000..84bc2af3ae
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtBeginNameFromAttribute.tag
@@ -0,0 +1,38 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="var" required="true" rtexprvalue="false" %>
+<%@ variable alias="result" name-from-attribute="var" scope="AT_BEGIN" %>
+
+<%
+  if(jspContext.getAttribute("x", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. x is not null in tag file");
+  }
+  if(jspContext.getAttribute("result", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. result is not null in tag file");
+  }
+  jspContext.setAttribute("x", "ignoredInCallingPage");
+  jspContext.setAttribute("result", "tagFileResult");
+%>
+
+${x} <%-- (x == 'ignoredInCallingPage') --%>
+${result}  <%-- (result == 'tagFileResult') --%>
+<%
+  jspContext.setAttribute("x", "stillIgnoredInCallingPage");
+  jspContext.setAttribute("result", "4");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtEnd.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtEnd.tag
new file mode 100644
index 0000000000..d0ab0f1edd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncAtEnd.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="AT_END" %>
+
+<%
+  if(jspContext.getAttribute("x", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. x is not null in tag file");
+  }
+  jspContext.setAttribute("x", "2");
+%>
+
+${x} <%-- (x == 2) --%>
+<%
+  jspContext.setAttribute("x", "4");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncNested.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncNested.tag
new file mode 100644
index 0000000000..41918bf809
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncNested.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="NESTED" %>
+
+<%
+  if(jspContext.getAttribute("x", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. x is not null in tag file");
+  }
+  jspContext.setAttribute("x", "2");
+%>
+
+${x} <%-- (x == 2) --%>
+<%
+  jspContext.setAttribute("x", "4");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtBegin.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtBegin.tag
new file mode 100644
index 0000000000..feff6b75dc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtBegin.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="AT_BEGIN" %>
+
+<%
+  if(jspContext.getAttribute("x", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. x is not null in tag file");
+  }
+  jspContext.setAttribute("x", "1");
+%>
+
+<%
+  jspContext.removeAttribute("x", PageContext.PAGE_SCOPE);
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtEnd.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtEnd.tag
new file mode 100644
index 0000000000..313c0174d4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveAtEnd.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="AT_END" %>
+
+<%
+  if(jspContext.getAttribute("x", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. x is not null in tag file");
+  }
+  jspContext.setAttribute("x", "1");
+%>
+
+<%
+  jspContext.removeAttribute("x", PageContext.PAGE_SCOPE);
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveNested.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveNested.tag
new file mode 100644
index 0000000000..0fc8cc8d11
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/WEB-INF/tags/syncRemoveNested.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ variable name-given="x" scope="NESTED" %>
+
+<%
+  if(jspContext.getAttribute("x", PageContext.PAGE_SCOPE) != null) {
+      out.println("Test FAILED. x is not null in tag file");
+  }
+  jspContext.setAttribute("x", "1");
+%>
+
+<%
+  jspContext.removeAttribute("x", PageContext.PAGE_SCOPE);
+%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/falseDeclareTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/falseDeclareTest.jsp
new file mode 100644
index 0000000000..72c7132182
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/falseDeclareTest.jsp
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+<%! String declared; %>
+
+
+
+
+<%
+  out.println(declared);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/jsp_tagfiles_directives_variable_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/jsp_tagfiles_directives_variable_web.xml
new file mode 100644
index 0000000000..c84d0bf091
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/jsp_tagfiles_directives_variable_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfileDirectivesVariable
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSame.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSame.jsp
new file mode 100644
index 0000000000..6f80acd2ed
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSame.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSameInclude.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSameInclude.jsp
new file mode 100644
index 0000000000..b3c100db97
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasAttributeSameInclude.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasNameGiven.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasNameGiven.jsp
new file mode 100644
index 0000000000..ffd82bdb02
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeAliasNameGiven.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNoAttribute.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNoAttribute.jsp
new file mode 100644
index 0000000000..10258feb80
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNoAttribute.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotRequired.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotRequired.jsp
new file mode 100644
index 0000000000..c3d9bebbb2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotRequired.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotString.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotString.jsp
new file mode 100644
index 0000000000..e5ffe6d888
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeNotString.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeRtexpr.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeRtexpr.jsp
new file mode 100644
index 0000000000..d0a3757175
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeRtexpr.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%! String s = "y"; %>
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSame.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSame.jsp
new file mode 100644
index 0000000000..8af16603fc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSame.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSameInclude.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSameInclude.jsp
new file mode 100644
index 0000000000..8e332e30b6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameFromAttributeSameInclude.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenBoth.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenBoth.jsp
new file mode 100644
index 0000000000..788eaa2b37
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenBoth.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamic.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamic.jsp
new file mode 100644
index 0000000000..88f016f984
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamic.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("x", "this is x");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamicInclude.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamicInclude.jsp
new file mode 100644
index 0000000000..6b895d05ff
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenDynamicInclude.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("x", "this is x");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenNeither.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenNeither.jsp
new file mode 100644
index 0000000000..6f705ec681
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenNeither.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("y", "this is y");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSame.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSame.jsp
new file mode 100644
index 0000000000..0ea8b4e88a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSame.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("x", "this is x");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSameInclude.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSameInclude.jsp
new file mode 100644
index 0000000000..cbfc03edf9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/negativeNameGivenSameInclude.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+  pageContext.setAttribute("x", "this is x");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveDeclare.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveDeclare.jsp
new file mode 100644
index 0000000000..23edb131c0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveDeclare.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
+
+
+<%
+  out.println("declared variable value:" + declared);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveVariableClass.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveVariableClass.jsp
new file mode 100644
index 0000000000..45009cb073
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/positiveVariableClass.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
+
+<%
+  Object obj = pageContext.getAttribute("y", PageContext.PAGE_SCOPE);
+  if(obj instanceof Integer) {
+      out.println("Test PASSED.");
+  } else {
+     out.println("y in calling page is not Integer:" + obj);
+  }
+
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBegin.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBegin.jsp
new file mode 100644
index 0000000000..b142024dfc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBegin.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+    pageContext.setAttribute("x", "1");
+%>
+
+${x} <%-- (x == 1) --%>
+
+  ${x} <%-- (x == 2) --%>
+
+${x} <%-- (x == 4) --%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBeginNameFromAttribute.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBeginNameFromAttribute.jsp
new file mode 100644
index 0000000000..8e79e8cd69
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtBeginNameFromAttribute.jsp
@@ -0,0 +1,33 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+    pageContext.setAttribute("x", "1");
+    pageContext.setAttribute("result", "callingPageResult");
+%>
+
+
+  ${x} <%-- (x == tagFileResult) --%>
+  ${result} <%-- (result == callingPageResult) --%>
+
+${x} <%-- (x == 4) --%>
+${result}   <%-- (result == callingPageResult) --%>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtEnd.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtEnd.jsp
new file mode 100644
index 0000000000..ee8eb8cda5
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncAtEnd.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+    pageContext.setAttribute("x", "1");
+%>
+${x} <%-- (x == 1) --%>
+
+
+  ${x} <%-- (x == 1) --%>
+
+${x} <%-- (x == 4) --%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncNested.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncNested.jsp
new file mode 100644
index 0000000000..e7e82a92e4
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncNested.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+    pageContext.setAttribute("x", "1");
+%>
+${x} <%-- (x == 1) --%>
+
+
+  ${x} <%-- (x == 2) --%>
+
+${x} <%-- (x == 1) --%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtBegin.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtBegin.jsp
new file mode 100644
index 0000000000..2e837d10c0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtBegin.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+    pageContext.setAttribute("x", "2");
+%>
+${x} 
+
+
+  '${x}'
+
+'${x}'
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtEnd.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtEnd.jsp
new file mode 100644
index 0000000000..0085545729
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveAtEnd.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+    pageContext.setAttribute("x", "2");
+%>
+${x} 
+
+
+  '${x}'
+
+'${x}'
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveNested.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveNested.jsp
new file mode 100644
index 0000000000..e1125d8cdd
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/directives/variable/syncRemoveNested.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+<%
+    pageContext.setAttribute("x", "2");
+%>
+${x} 
+
+
+  '${x}'
+
+${x} 
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag
new file mode 100644
index 0000000000..b6ee521c04
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkApplication.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="empty" %>
+<%= (application instanceof jakarta.servlet.ServletContext) %>
+Value of Context Init parameter param1: <%= application.getInitParameter( "contextParam1" ) %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag
new file mode 100644
index 0000000000..bb7b5eefde
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkConfig.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="empty" %>
+<%= (config instanceof jakarta.servlet.ServletConfig) %>
+Value of param1 is: <%= config.getInitParameter( "configParam1" ) %>
+Value of param2 is: <%= config.getInitParameter( "configParam2" ) %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag
new file mode 100644
index 0000000000..dcdb636b6c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkJspContext.tag
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="empty" %>
+<%= (jspContext instanceof jakarta.servlet.jsp.JspContext) %>
+<%
+    jspContext.setAttribute( "available", new String( "true" ));
+    String temp = (String) jspContext.findAttribute( "available" );
+    out.print( temp );
+%>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/build.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag
similarity index 78%
rename from jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/build.xml
rename to jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag
index 09a1391a69..be3c84feed 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/api/jakarta_el/build.xml
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkOut.tag
@@ -1,5 +1,4 @@
-
-
+--%>
 
-
-  
-
+<%@ tag body-content="empty" %>
+<%= (out instanceof jakarta.servlet.jsp.JspWriter ) %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag
new file mode 100644
index 0000000000..30da37be01
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkRequest.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="empty" %>
+<%= (request instanceof jakarta.servlet.ServletRequest) %>
+
+<% out.println(request.getProtocol()); %>
+<% out.println(request.getParameter("Years")); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag
new file mode 100644
index 0000000000..4cf813d458
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkResponse.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="empty" %>
+<%= (response instanceof jakarta.servlet.ServletResponse) %>
+<% 
+   response.addHeader("TestHeader", "Method call OK");
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag
new file mode 100644
index 0000000000..50210ca237
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/WEB-INF/tags/checkSession.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag body-content="empty" %>
+<%= (session instanceof jakarta.servlet.http.HttpSession) %>
+<%= session.getAttribute("name.of.this.test") %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkApplication.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkApplication.jsp
new file mode 100644
index 0000000000..45b2cce8d0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkApplication.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkConfig.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkConfig.jsp
new file mode 100644
index 0000000000..433247bbcb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkConfig.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkJspContext.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkJspContext.jsp
new file mode 100644
index 0000000000..3b468ce219
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkJspContext.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkOut.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkOut.jsp
new file mode 100644
index 0000000000..49fac7ac4e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkOut.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkRequest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkRequest.jsp
new file mode 100644
index 0000000000..0bb1b0cbc8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkRequest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkResponse.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkResponse.jsp
new file mode 100644
index 0000000000..ccbe717e92
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkResponse.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkSession.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkSession.jsp
new file mode 100644
index 0000000000..39cd38b698
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/checkSession.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+<%
+  session.setAttribute("name.of.this.test", "checkSession");
+%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/jsp_tagfiles_implicitobjects_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/jsp_tagfiles_implicitobjects_web.xml
new file mode 100644
index 0000000000..90ec139c95
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/implicitobjects/jsp_tagfiles_implicitobjects_web.xml
@@ -0,0 +1,46 @@
+
+
+
+
+  JspTagFileImplicitObj
+  
+    contextParam1
+    bilbo
+  
+  
+    checkConfigLogicalName
+    /checkConfig.jsp
+    
+      configParam1
+      hobbit
+    
+    
+      configParam2
+      gollum
+    
+    0
+  
+  
+    checkConfigLogicalName
+    /checkConfig
+  
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/IgnoreTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/IgnoreTag.tag
new file mode 100644
index 0000000000..2a6bbbe5b7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/IgnoreTag.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% out.println("Test FAILED"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldAdditionalElements.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldAdditionalElements.jsp
new file mode 100644
index 0000000000..37cc9c9813
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldAdditionalElements.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags/toomanytldelements" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldDefaultJspVersion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldDefaultJspVersion.jsp
new file mode 100644
index 0000000000..b22999c86e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldDefaultJspVersion.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags/defaultjspversion" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldMinimumJspVersion.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldMinimumJspVersion.jsp
new file mode 100644
index 0000000000..cd92ff92a7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldMinimumJspVersion.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags/badtldversion" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName20.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName20.jsp
new file mode 100644
index 0000000000..cb575768cc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName20.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags/reservedname20" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName21.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName21.jsp
new file mode 100644
index 0000000000..62a55f7017
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/ImplicitTldReservedName21.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags/reservedname21" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarIgnoredTagTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarIgnoredTagTest.jsp
new file mode 100644
index 0000000000..702f8026c8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarIgnoredTagTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/jartag" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarTest.jsp
new file mode 100644
index 0000000000..5ac22ea105
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedJarTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/jartag" prefix="tags" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTest.jsp
new file mode 100644
index 0000000000..ef174d1d51
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags1" %>
+<%@ taglib tagdir="/WEB-INF/tags/dir" prefix="tags2" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTldTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTldTest.jsp
new file mode 100644
index 0000000000..f9d33a0caa
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/JspTagFilePackagedWarTldTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/webtld" prefix="tags1" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/Tag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/Tag1.tag
new file mode 100644
index 0000000000..d130344c77
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/Tag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% out.println("Test PASSED"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/TldImplicitTldJspVersionNotMatch.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/TldImplicitTldJspVersionNotMatch.jsp
new file mode 100644
index 0000000000..71075e3c5c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/TldImplicitTldJspVersionNotMatch.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="tags1" uri="WEB-INF/tag.tld" %>
+<%@ taglib tagdir="/WEB-INF/tags/versionnotmatch" prefix="tags2" %>
+
+<% out.println("Invoking tag through tld, v 2.0"); %>
+
+
+<% out.println("Invoking tag through implicit tld, v.2.1"); %>
+
+
+<% out.println("Test PASSED."); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tag.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tag.tld
new file mode 100644
index 0000000000..ff5e3bd70c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tag.tld
@@ -0,0 +1,36 @@
+
+
+
+
+    webtagtld
+    1.0
+    webtagtld
+    http://java.sun.com/tck/jsp/webtld
+    
+        webtag
+        /WEB-INF/tags/WebTag1.tag
+    
+    
+        webtag2
+        /WEB-INF/tags/versionnotmatch/WebTag1.tag
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/WebTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/WebTag1.tag
new file mode 100644
index 0000000000..80741f1820
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/WebTag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% out.println("Test PASSED1"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/WebTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/WebTag1.tag
new file mode 100644
index 0000000000..103f276754
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/WebTag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% out.println("Test FAILED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/implicit.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/implicit.tld
new file mode 100644
index 0000000000..3faf3e2360
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/badtldversion/implicit.tld
@@ -0,0 +1,27 @@
+
+
+
+
+
+    1.0
+    implicit
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/defaultjspversion/WebTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/defaultjspversion/WebTag1.tag
new file mode 100644
index 0000000000..da2ae5d28d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/defaultjspversion/WebTag1.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+The use of the expression #{expr} here should not
+cause a translation error because the default implicit tld jsp
+version is 2.0.
+<% out.println("Test PASSED"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/dir/WebTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/dir/WebTag1.tag
new file mode 100644
index 0000000000..ce1b39eabb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/dir/WebTag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% out.println("Test PASSED2"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/DeferredSyntaxAsLiteral.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/DeferredSyntaxAsLiteral.tag
new file mode 100644
index 0000000000..77b543a701
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/DeferredSyntaxAsLiteral.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="literal" %>
+<%
+    Object o = jspContext.getAttribute("literal");
+    out.println(o);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/ImplicitTld20.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/ImplicitTld20.tag
new file mode 100644
index 0000000000..73fdafe17e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/ImplicitTld20.tag
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : ImplicitTld20.tag
+	Description : Verify that the jsp version of an implicit 
+                      tag library is configured by the implicit.tld
+                      file.  Use of '#{' in an action should be 
+                      allowed when the jsp version is 2.0.
+**/ %>
+
+<%@ taglib tagdir="/WEB-INF/tags/reservedname20" prefix="tags" %>
+
+
+<% out.println("Test PASSED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/implicit.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/implicit.tld
new file mode 100644
index 0000000000..3ecad8b770
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname20/implicit.tld
@@ -0,0 +1,27 @@
+
+
+
+
+
+    1.0
+    implicit
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/DeferredSyntaxAsLiteral.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/DeferredSyntaxAsLiteral.tag
new file mode 100644
index 0000000000..77b543a701
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/DeferredSyntaxAsLiteral.tag
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="literal" %>
+<%
+    Object o = jspContext.getAttribute("literal");
+    out.println(o);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/ImplicitTld21.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/ImplicitTld21.tag
new file mode 100644
index 0000000000..3c226834a9
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/ImplicitTld21.tag
@@ -0,0 +1,31 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% /** 	Name : ImplicitTld21.tag
+	Description : Verify that the jsp version of an implicit 
+                      tag library is configured by the implicit.tld
+                      file.  Use of '#{' in an action should result
+                      in a translation error when the jsp version 
+                      is 2.1 or greater.
+**/ %>
+
+<%@ taglib tagdir="/WEB-INF/tags/reservedname21" prefix="tags" %>
+<%@ tag deferredSyntaxAllowedAsLiteral="false" %>
+
+
+<% out.println("Test FAILED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/implicit.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/implicit.tld
new file mode 100644
index 0000000000..22981b008e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/reservedname21/implicit.tld
@@ -0,0 +1,27 @@
+
+
+
+
+
+    1.0
+    implicit
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/WebTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/WebTag1.tag
new file mode 100644
index 0000000000..adbfe01b4c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/WebTag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% out.println("Test FAILED:"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/implicit.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/implicit.tld
new file mode 100644
index 0000000000..782610f6c6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/toomanytldelements/implicit.tld
@@ -0,0 +1,32 @@
+
+
+
+
+
+    1.0
+    implicit
+  
+    foo
+    com.sun.ts.tests.jsp.common.tags.tck.SetTag
+    empty
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/WebTag1.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/WebTag1.tag
new file mode 100644
index 0000000000..fd51ea8e67
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/WebTag1.tag
@@ -0,0 +1,19 @@
+<%--
+
+    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<% out.println("tag invoked"); %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/implicit.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/implicit.tld
new file mode 100644
index 0000000000..22981b008e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/WEB-INF/tags/versionnotmatch/implicit.tld
@@ -0,0 +1,27 @@
+
+
+
+
+
+    1.0
+    implicit
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jartagfile.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jartagfile.tld
new file mode 100644
index 0000000000..04614a556c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jartagfile.tld
@@ -0,0 +1,32 @@
+
+
+
+
+    jartagfile
+    1.0
+    jartag
+    http://java.sun.com/tck/jsp/jartag
+    
+        tag1
+        /META-INF/tags/Tag1.tag
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jsp_tagfile_pkg_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jsp_tagfile_pkg_web.xml
new file mode 100644
index 0000000000..20044dbb65
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/packaging/jsp_tagfile_pkg_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfilepackaging
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsAttributeNotSpecifiedTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsAttributeNotSpecifiedTest.jsp
new file mode 100644
index 0000000000..9965d0db5d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsAttributeNotSpecifiedTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+    Validate that if an attribute is declared, but not specified,
+    that no page scoped variable is created in the JSP Context Wrapper.
+--%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDeclaredAttributesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDeclaredAttributesTest.jsp
new file mode 100644
index 0000000000..fe91098c76
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDeclaredAttributesTest.jsp
@@ -0,0 +1,32 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%--
+    For each attribute declared and specified, a page-scoped variable
+    must be created in the page scope of the JSP Context Wrapper.
+    The name of the variable must be the same as the declared attribute name.
+    The value of the variable must be the value of the attribute passed in
+    during invocation.
+--%>
+
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDynamicAttributesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDynamicAttributesTest.jsp
new file mode 100644
index 0000000000..cf8d97d566
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsDynamicAttributesTest.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsJspContextWrapperTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsJspContextWrapperTest.jsp
new file mode 100644
index 0000000000..5f16590e68
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsJspContextWrapperTest.jsp
@@ -0,0 +1,34 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+<%--
+    The tag file implementation must create and maintain a second
+    instance of JspContext called a JSP ontext Wrapper.  If the
+    invoking JSP Context is an instance of PageContext, the JSP Context Wrapper
+    must also be an instance of PageContext.  This wrapper must be returned
+    when getJspContext() is called.
+--%>
+
+<%-- Store the invoking JSP context in the current request --%>
+<% request.setAttribute("INVOKING_CONTEXT", pageContext); %>
+
+<%-- invoke the tag --%>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsScopesTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsScopesTest.jsp
new file mode 100644
index 0000000000..ad9861bdfa
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/JspTagSemanticsScopesTest.jsp
@@ -0,0 +1,167 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" import="java.io.IOException" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
+
+<%!
+    private void cleanup(PageContext pageContext) {
+        pageContext.removeAttribute("applicationScopeAttr");
+        pageContext.removeAttribute("applAddAttr");
+        pageContext.removeAttribute("pageScopeAttr");
+        pageContext.removeAttribute("requestScopeAttr");
+        pageContext.removeAttribute("sessionScopeAttr");
+        pageContext.removeAttribute("applicationScopeAttr");
+        pageContext.removeAttribute("pageAddAttr");
+        pageContext.removeAttribute("reqAddAttr");
+        pageContext.removeAttribute("sessAddAttr");
+        pageContext.removeAttribute("applAddAttr");
+    }
+%>
+
+<%!
+    private void initTest(PageContext pageContext) {
+        pageContext.setAttribute("pageScopeAttr", "pageScope");
+        pageContext.setAttribute("pageScopeRem", "pageScopeRem");
+        pageContext.setAttribute("requestScopeAttr", "requestScope", PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute("requestScopeRem", "requestScopeRem", PageContext.REQUEST_SCOPE);
+        pageContext.setAttribute("sessionScopeAttr", "sessionScope", PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("sessionScopeRem", "sessionScopeRem", PageContext.SESSION_SCOPE);
+        pageContext.setAttribute("applicationScopeAttr", "applicationScope", PageContext.APPLICATION_SCOPE);
+        pageContext.setAttribute("applicationScopeRem", "applicationScopeRem", PageContext.APPLICATION_SCOPE);
+    }
+%>
+
+<%!
+    private void validate(PageContext pageContext) throws IOException {
+        JspWriter out = pageContext.getOut();
+        String pageScope = (String) pageContext.getAttribute("pageScopeAttr");
+        String reqScope = (String) pageContext.getAttribute("requestScopeAttr", PageContext.REQUEST_SCOPE);
+        String sessScope = (String) pageContext.getAttribute("sessionScopeAttr", PageContext.SESSION_SCOPE);
+        String applScope = (String) pageContext.getAttribute("applicationScopeAttr", PageContext.APPLICATION_SCOPE);
+        String pageAdd = (String) pageContext.getAttribute("pageAddAttr");
+        String reqAdd = (String) pageContext.getAttribute("reqAddAttr", PageContext.REQUEST_SCOPE);
+        String sessAdd = (String) pageContext.getAttribute("sessAddAttr", PageContext.SESSION_SCOPE);
+        String applAdd = (String) pageContext.getAttribute("applAddAttr", PageContext.APPLICATION_SCOPE);
+        String pageRem = (String) pageContext.getAttribute("pageScopeRem");
+
+        if ("pageScope".equals(pageScope)) {
+            if ("requestScopeMod".equals(reqScope)) {
+                if ("sessionScopeMod".equals(sessScope)) {
+                    if ("applicationScopeMod".equals(applScope)) {
+                        if (pageContext.getAttribute("requestScopeRem") == null) {
+                            if (pageContext.getAttribute("sessionScoperem") == null) {
+                                if (pageContext.getAttribute("applicationScopeRem") == null) {
+                                    if ("pageScopeRem".equals(pageRem)) {
+                                        if (pageAdd == null) {
+                                            if ("reqAdd".equals(reqAdd)) {
+                                                if ("sessAdd".equals(sessAdd)) {
+                                                    if ("applAdd".equals(applAdd)) {
+                                                        out.println("Test PASSED");
+                                                    } else {
+                                                        out.println("Test FAILED.  Application scoped " +
+                                                            "variable added to wrapper not reflected in invoking context.");
+                                                    }
+                                                } else {
+                                                    out.println("Test FAILED.  Session scoped " +
+                                                        "variable added to wrapper not reflected in invoking context.");
+                                                }
+                                            } else {
+                                                out.println("Test FAILED.  Request scoped " +
+                                                    "variable added to wrapper not reflected in invoking context.");
+                                            }
+                                        } else {
+                                            out.println("Test FAILED.  Page scoped variable added to wrapper should not" +
+                                                " have been synchronized with the invoking context");
+                                        }
+                                    } else {
+                                        out.println("Test FAILED.  The page scoped variable removed from the wrapper " +
+                                            "should not have been removed from the invoking context.");
+                                    }
+                                } else {
+                                    out.println("Test FAILED.  The application scoped variable that was removed from the " +
+                                        "wrapper was not removed from the invoking context.");
+                                }
+                            } else {
+                                out.println("Test FAILED.  The session scoped variable that was removed from the " +
+                                    "wrapper was not removed from the invoking context.");
+                            }
+                        } else {
+                            out.println("Test FAILED.  The request scoped variable that was removed from the " +
+                                "wrapper was not removed from the invoking context.");
+                        }
+                    } else {
+                        out.println("Test FAILED.  The application scoped variable that was overwritten in the wrapper " +
+                            "was not synchronized with the invoking context.  Expected 'applicationScopeMod', received: " + applScope);
+                    }
+                } else {
+                    out.println("Test FAILED.  The session scoped variable that was overwritten in the wrapper " +
+                        "was not synchronized with the invoking context.  Expected 'sessionScopeMod', received: " + sessScope);
+                }
+            } else {
+                out.println("Test FAILED.  The request scoped variable that was overwritten in the wrapper " +
+                    "was not synchronized with the invoking context.  Expected 'requestScopeMod', received: " + reqScope);
+            }
+        } else {
+            out.println("Test FAILED.  The page scoped variable originally defined in the invoking context " +
+                "was modified by a change in the wrapper context.");
+        }
+    }
+%>
+
+<%--
+    For each invocation to the tag, the JSP Context Wrapper must
+    present a clean page scope containing no initial elements.
+    All scopes other than the page scope must be identical to those
+    in the Invoking JSP Context and must be modified accordingly when updates
+    are made to those scopes in the JSP Context Wrapper.  Any modifications
+    to the page scope, however, must not affect the Invoking JSP Context.
+--%>
+
+<%-- Init the PageContext scopes --%>
+<%
+    initTest(pageContext);
+%>
+
+<%-- invoke the Tag --%>
+
+
+<%-- post-invocation checks --%>
+<%
+    validate(pageContext);
+%>
+
+<%-- post test cleanup --%>
+<%
+    cleanup(pageContext);
+%>
+
+<%-- Invoke the tag again...no change in behavior should occur --%>
+<%
+    initTest(pageContext);
+%>
+
+
+
+<%
+    validate(pageContext);
+%>
+
+<%
+    cleanup(pageContext);
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/mytags.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/mytags.tld
new file mode 100644
index 0000000000..4854612d7f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/mytags.tld
@@ -0,0 +1,41 @@
+
+
+
+
+    mysimpletag
+    1.0
+    mysimpletag
+    http://java.sun.com/tck/jsp/tagfiles/semantics
+    
+        mysimpletag
+        com.sun.ts.tests.jsp.spec.tagfiles.semantics.MySimpleTag
+        empty
+        false
+    
+    
+        myclassictag
+        com.sun.ts.tests.jsp.spec.tagfiles.semantics.MyClassicTag
+        empty
+        false
+    
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/AttributeNotSpecifiedTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/AttributeNotSpecifiedTag.tag
new file mode 100644
index 0000000000..4f73addd2c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/AttributeNotSpecifiedTag.tag
@@ -0,0 +1,28 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="false" %>
+
+<%
+    if (jspContext.getAttribute("attr1") == null) {
+        out.println("Test PASSED");
+    } else {
+        out.println("Test FAILED.  A page scoped variable was incorrectly created" +
+            " for an attribute that was not specified at invocation time.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DeclaredAttributesTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DeclaredAttributesTag.tag
new file mode 100644
index 0000000000..4d699f7680
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DeclaredAttributesTag.tag
@@ -0,0 +1,36 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ attribute name="attr1" required="true" %>
+<%@ attribute name="attr2" required="false" %>
+
+<%
+    String attr1Value = (String) jspContext.getAttribute("attr1");
+    String attr2Value = (String) jspContext.getAttribute("attr2");
+    if ("attrValue".equals(attr1Value)) {
+        if ("attr2Value".equals(attr2Value)) {
+            out.println("Test PASSED");
+        } else {
+            out.println("Test FAILED.  Expected the value of attr2 to be 'attrValue'." +
+                "  Received: " + attr2Value);
+        }
+    } else {
+        out.println("Test FAILED.  Expected the value of attr1 to be 'attrValue'." +
+            "  Received: " + attr1Value);
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DynamicAttributesTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DynamicAttributesTag.tag
new file mode 100644
index 0000000000..633edcbf8f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/DynamicAttributesTag.tag
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag dynamic-attributes="dynMap" import="java.util.Map" %>
+
+<%
+    String attr1Value = (String) ((Map) jspContext.getAttribute("dynMap")).get("attr1");
+    if ("attr1Value".equals(attr1Value)) {
+        out.println("Test PASSED");
+    } else {
+        out.println("Test FAILED.  A page scoped variable was not created" +
+            " or was the incorrect value for the dynamic attribute passed" +
+            " in at invocation time.  Expected: attr1Value, received: " + attr1Value);
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperScopesTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperScopesTag.tag
new file mode 100644
index 0000000000..e49098f990
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperScopesTag.tag
@@ -0,0 +1,69 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ tag import="java.util.Enumeration"%>
+
+<%
+    // check to make sure the page scope of wrapper context is emtpy.
+    Enumeration e = jspContext.getAttributeNamesInScope(PageContext.PAGE_SCOPE);
+    if (e.hasMoreElements()) {
+        out.println("Test FAILED.  The JSP Context Wrapper did not have a clean " +
+            "page scope.");
+        out.println("Attribute names found:");
+        for (String name = (String) e.nextElement();
+            e.hasMoreElements();
+            name = (String) e.nextElement()) {
+            out.println(name);
+        }
+    } else {
+        String reqScope = (String) jspContext.getAttribute("requestScopeAttr", PageContext.REQUEST_SCOPE);
+        String sessScope = (String) jspContext.getAttribute("sessionScopeAttr", PageContext.SESSION_SCOPE);
+        String applScope = (String) jspContext.getAttribute("applicationScopeAttr", PageContext.APPLICATION_SCOPE);
+        if ("requestScope".equals(reqScope)) {
+            if ("sessionScope".equals(sessScope)) {
+                if ("applicationScope".equals(applScope)) {
+                    out.println("Wrapper Test PASSED");
+                } else {
+                    out.println("Test FAILED.  Invoking context application scope not " +
+                        "totally available to the wrapping context.  Expected 'applicationScope'," +
+                        " received: " + applScope);
+                }
+            } else {
+                out.println("Test FAILED.  Invoking context session scope not " +
+                    "totally available to the wrapping context.  Expected 'sessionScope'," +
+                    " received: " + sessScope);
+            }
+        } else {
+            out.println("Test FAILED.  Invoking context request scope not " +
+                "totally available to the wrapping context.  Expected 'requestScope'," +
+                " received: " + reqScope);
+        }
+        jspContext.setAttribute("requestScopeAttr", "requestScopeMod", PageContext.REQUEST_SCOPE);
+        jspContext.setAttribute("sessionScopeAttr", "sessionScopeMod", PageContext.SESSION_SCOPE);
+        jspContext.setAttribute("applicationScopeAttr", "applicationScopeMod", PageContext.APPLICATION_SCOPE);
+        jspContext.removeAttribute("requestScopeRem");
+        jspContext.removeAttribute("sessionScopeRem");
+        jspContext.removeAttribute("applicationScopeRem");
+        jspContext.setAttribute("pageScopeRem", "pageScopeRem");
+        jspContext.removeAttribute("pageScopeRem");
+        jspContext.setAttribute("pageAddAttr", "pageAdd");
+        jspContext.setAttribute("reqAddAttr", "reqAdd", PageContext.REQUEST_SCOPE);
+        jspContext.setAttribute("sessAddAttr", "sessAdd", PageContext.SESSION_SCOPE);
+        jspContext.setAttribute("applAddAttr", "applAdd", PageContext.APPLICATION_SCOPE);
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperTag.tag
new file mode 100644
index 0000000000..b1345236e2
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/JspContextWrapperTag.tag
@@ -0,0 +1,53 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%
+    JspContext invokingContext =
+        (JspContext) request.getAttribute("INVOKING_CONTEXT");
+
+    JspContext tagContext = this.getJspContext();
+
+    if (invokingContext != null) {
+        if (tagContext != null) {
+            if (tagContext instanceof PageContext) {
+                if (tagContext != invokingContext) {
+                    if (jspContext == tagContext) {
+                        out.println("Test PASSED");
+                    } else {
+                        out.println("Test FAILED.  The jspContext scripting" +
+                            " variable is not the same context as that returned " +
+                            "by getJspContext()");
+                    }
+                } else {
+                    out.println("Test FAILED.  The JSP Context Wrapper is the " +
+                        "same object as the invoking JSP Context.");
+                }
+            } else {
+                out.println("Test FAILED.  The JSP Context Wrapper returned by" +
+                    " getJspContext() should have been an instance of PageContext\n" +
+                    " as the invoking JSP Context is Servlet-based.");
+            }
+        } else {
+            out.println("Test FAILED.  The invocation of getJspContext() " +
+                "returned null.");
+        }
+    } else {
+        out.println("Test FAILED.  Unable to find the invoking PageContext in the" +
+            " request object.");
+    }
+%>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeClassicTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeClassicTag.tag
new file mode 100644
index 0000000000..895c96cefb
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeClassicTag.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="my" uri="http://java.sun.com/tck/jsp/tagfiles/semantics" %>
+
+endOfTagFile
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeSimpleTag.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeSimpleTag.tag
new file mode 100644
index 0000000000..d7d8f88e39
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsInvokeSimpleTag.tag
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ taglib prefix="my" uri="http://java.sun.com/tck/jsp/tagfiles/semantics" %>
+
+Test FAILED. This part of the tag file should not be processed.
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsJspForward.tag b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsJspForward.tag
new file mode 100644
index 0000000000..9d2fb51995
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/WEB-INF/tags/semanticsJspForward.tag
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+
+Test FAILED. This part of the tag file should not be processed.
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/jsp_tagfile_semantics_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/jsp_tagfile_semantics_web.xml
new file mode 100644
index 0000000000..7069498001
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/jsp_tagfile_semantics_web.xml
@@ -0,0 +1,25 @@
+
+
+
+
+  JspTagfileSemantics
+  
+    5
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeClassicTag.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeClassicTag.jsp
new file mode 100644
index 0000000000..261fd2c44d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeClassicTag.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+endOfCallingPage
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeSimpleTag.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeSimpleTag.jsp
new file mode 100644
index 0000000000..75cd743ce0
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsInvokeSimpleTag.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+Test FAILED. this part of the page should not be processed.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForward.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForward.jsp
new file mode 100644
index 0000000000..b258d81b8a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForward.jsp
@@ -0,0 +1,22 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
+
+Test FAILED. this part should not be processed.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForwardTarget.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForwardTarget.jsp
new file mode 100644
index 0000000000..41f2e7ec52
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tagfiles/semantics/semanticsJspForwardTarget.jsp
@@ -0,0 +1,20 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+Test PASSED. The forwarded jsp processed.
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldExplicitWebXmlPrecedenceTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldExplicitWebXmlPrecedenceTest.jsp
new file mode 100644
index 0000000000..d23241a56e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldExplicitWebXmlPrecedenceTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    Taglibs defined in the web.xml takes precedence over taglibraries
+    defined in JAR files or in the WEB-INF directory.
+--%>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/webxmlpres" prefix="webxml" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPath11Test.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPath11Test.jsp
new file mode 100644
index 0000000000..705207dbb1
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPath11Test.jsp
@@ -0,0 +1,29 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%--
+     Validate a taglibrary can be detected when packaged
+     as specified in the JSP 1.1 specification.  No
+     translation error should occur if properly found
+     by the container and the tag should work as expected.
+--%>
+
+<%@ taglib uri="/WEB-INF/lib/jsp11taglib.jar" prefix="taglib" %>
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathAbsUriNotFoundTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathAbsUriNotFoundTest.jsp
new file mode 100644
index 0000000000..45a2e8fe0e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathAbsUriNotFoundTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    If the URI provided to the uri attribute is an absolute URI
+    and the URI is not found in the taglib map, a translation
+    error must be raised.
+--%>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/nosuchuriexists" prefix="pre" %>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathDirectTldReferenceTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathDirectTldReferenceTest.jsp
new file mode 100644
index 0000000000..1cbf7e6e79
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathDirectTldReferenceTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+    TLDs can be directly referenced in the uri attribute of the
+    taglib directive.
+--%>
+
+<%@ taglib uri="/WEB-INF/webxml.tld" prefix="webxml" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathExplicitWebXmlTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathExplicitWebXmlTest.jsp
new file mode 100644
index 0000000000..71c40341e7
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathExplicitWebXmlTest.jsp
@@ -0,0 +1,25 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%--
+     Validate a taglibrary can be used when explicitly
+     defined within the web.xml descriptor.
+--%>
+<%@ taglib uri="http://java.sun.com/tck/jsp/webxml" prefix="webxml" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathMultiTldTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathMultiTldTest.jsp
new file mode 100644
index 0000000000..936958e8f6
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathMultiTldTest.jsp
@@ -0,0 +1,30 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%--
+    As of JSP 1.2 multiple TLD's can be packaged within a JAR file.
+    Validate the container registers the taglibrary based on the URI
+    specified in the  element of the package TLDs.
+--%>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/multi1" prefix="m1" %>
+<%@ taglib uri="http://java.sun.com/tck/jsp/multi2" prefix="m2" %>
+
+
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathWebInfUriTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathWebInfUriTest.jsp
new file mode 100644
index 0000000000..3511036e94
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/TldResPathWebInfUriTest.jsp
@@ -0,0 +1,27 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%--
+    As of JSP 2.0, TLDs with the  element, if placed in /WEB-INF
+    (or some subdirectory thereof) will be processed by the container
+    and have the URI added to the taglib map.
+--%>
+
+<%@ taglib uri="http://java.sun.com/tck/jsp/uri" prefix="uri" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/a12.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/a12.tld
new file mode 100644
index 0000000000..5f1f510f42
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/a12.tld
@@ -0,0 +1,31 @@
+
+
+
+
+
+    1.0
+    1.2
+    a12
+    a12
+    
+        a12
+        com.sun.ts.tests.jsp.spec.tldres.WebXmlTag
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/sub/webinfsub.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/sub/webinfsub.tld
new file mode 100644
index 0000000000..f2169c8494
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/sub/webinfsub.tld
@@ -0,0 +1,30 @@
+
+
+
+
+    webinfsub
+    1.0
+    webinfsub
+    
+      com.sun.ts.tests.jsp.spec.tldres.HSListenerWebInfSub
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/tlds/uri.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/tlds/uri.tld
new file mode 100644
index 0000000000..3b2f79de30
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/tlds/uri.tld
@@ -0,0 +1,33 @@
+
+
+
+
+    uri
+    1.0
+    uri
+    http://java.sun.com/tck/jsp/uri
+    
+        uri
+        com.sun.ts.tests.jsp.spec.tldres.UriTag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webinfpres.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webinfpres.tld
new file mode 100644
index 0000000000..4360d9acea
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webinfpres.tld
@@ -0,0 +1,33 @@
+
+
+
+
+    webinfpres
+    1.0
+    webinfpres
+    http://java.sun.com/tck/jsp/webxmlpres
+    
+        webxml
+        com.sun.ts.tests.jsp.spec.tldres.UriTag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webxml.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webxml.tld
new file mode 100644
index 0000000000..53b8e98bf3
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/WEB-INF/webxml.tld
@@ -0,0 +1,35 @@
+
+
+
+
+    webxml
+    1.0
+    webxml
+    
+      com.sun.ts.tests.jsp.spec.tldres.HSListenerWebInf
+    
+    
+        webxml
+        com.sun.ts.tests.jsp.spec.tldres.WebXmlTag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jartagpres.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jartagpres.tld
new file mode 100644
index 0000000000..cc6fdb0a8e
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jartagpres.tld
@@ -0,0 +1,33 @@
+
+
+
+
+    jartag
+    1.0
+    jartag
+    http://java.sun.com/tck/jsp/webxmlpres
+    
+        webxml
+        com.sun.ts.tests.jsp.spec.tldres.Multi1Tag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jsp_tldres_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jsp_tldres_web.xml
new file mode 100644
index 0000000000..f71cf445fc
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/jsp_tldres_web.xml
@@ -0,0 +1,35 @@
+
+
+
+
+  JspTldRes
+  
+    5
+  
+  
+      
+          http://java.sun.com/tck/jsp/webxml
+          /WEB-INF/webxml.tld
+      
+      
+          http://java.sun.com/tck/jsp/webxmlpres
+          /WEB-INF/webxml.tld
+      
+  
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/listenerTldTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/listenerTldTest.jsp
new file mode 100644
index 0000000000..1bbaedc509
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/listenerTldTest.jsp
@@ -0,0 +1,23 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+${sessionScope["session.created.meta.inf"]}
+${sessionScope["session.created.meta.inf.sub"]}
+${sessionScope["session.created.web.inf"]}
+${sessionScope["session.created.web.inf.sub"]}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/metainfsub.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/metainfsub.tld
new file mode 100644
index 0000000000..bc99ee2c22
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/metainfsub.tld
@@ -0,0 +1,31 @@
+
+
+
+
+    metainfsub
+    1.0
+    metainfsub
+    http://java.sun.com/tck/jsp/metainfsub
+    
+      com.sun.ts.tests.jsp.spec.tldres.HSListenerMetaInfSub
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi1.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi1.tld
new file mode 100644
index 0000000000..d60f40418c
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi1.tld
@@ -0,0 +1,36 @@
+
+
+
+
+    multi1
+    1.0
+    multi1
+    http://java.sun.com/tck/jsp/multi1
+    
+      com.sun.ts.tests.jsp.spec.tldres.HSListenerMetaInf
+    
+    
+        multi1
+        com.sun.ts.tests.jsp.spec.tldres.Multi1Tag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi2.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi2.tld
new file mode 100644
index 0000000000..60df5d0e2f
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/multi2.tld
@@ -0,0 +1,33 @@
+
+
+
+
+    multi2
+    1.0
+    multi2
+    http://java.sun.com/tck/jsp/multi2
+    
+        multi2
+        com.sun.ts.tests.jsp.spec.tldres.Multi2Tag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeJSPPrefix.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeJSPPrefix.jsp
new file mode 100644
index 0000000000..b2829fad9d
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeJSPPrefix.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+use jsp prefix for an element that is not a standard action
+--%>
+
+<%@ taglib uri="/WEB-INF/webxml.tld" prefix="jsp" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeTaglibAfterActionTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeTaglibAfterActionTest.jsp
new file mode 100644
index 0000000000..47cde5d23a
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/negativeTaglibAfterActionTest.jsp
@@ -0,0 +1,24 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+
+
+<%@ taglib uri="/WEB-INF/webxml.tld" prefix="webxml" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/path/TldResPathRelativeUriTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/path/TldResPathRelativeUriTest.jsp
new file mode 100644
index 0000000000..a20361fb0b
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/path/TldResPathRelativeUriTest.jsp
@@ -0,0 +1,21 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+<%@ taglib uri="../WEB-INF/webxml.tld" prefix="webxml" %>
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/taglib.tld b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/taglib.tld
new file mode 100644
index 0000000000..0e50b13ca8
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/taglib.tld
@@ -0,0 +1,32 @@
+
+
+
+
+    taglib.tld
+    1.0
+    tld11
+    
+        tld11
+        com.sun.ts.tests.jsp.spec.tldres.Tld11Tag
+        JSP 
+    
+
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/tld12DefaultBodyContent.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/tld12DefaultBodyContent.jsp
new file mode 100644
index 0000000000..8ae7bdb949
--- /dev/null
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/tldres/tld12DefaultBodyContent.jsp
@@ -0,0 +1,26 @@
+<%--
+
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+--%>
+
+<%@ page contentType="text/plain" %>
+
+<%--
+omit body-content in a 1.2 style tld and a container is required to apply default JSP.
+--%>
+
+<%@ taglib uri="/WEB-INF/a12.tld" prefix="a12" %>
+