Created
June 6, 2024 19:30
-
-
Save scottmarlow/3dd660a473e69acc667ada579b39327c to your computer and use it in GitHub Desktop.
mvn -Djar2shrinkwrap.technology=com.sun.ts.tests.servlet org.openrewrite.maven:rewrite-maven-plugin:runNoFork
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asynccontext/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asynccontext/URLClient.java | |
| index f6c4bf9af..b626b970b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asynccontext/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asynccontext/URLClient.java | |
| @@ -22,13 +22,54 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_asynccontext.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_asynccontext_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_asynccontext_web_war"); | |
| + servlet_js_asynccontext_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListener.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListener1.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListener2.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListenerBad.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$1.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$10.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$11.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$12.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$13.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$2.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$3.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$4.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$5.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$6.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$7.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$8.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$9.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTests.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.RequestWrapper.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ResponseWrapper.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + servlet_js_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + ear.addAsModule(servlet_js_asynccontext_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("AsyncTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asyncevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asyncevent/URLClient.java | |
| index b3e314e71..db87a78cc 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asyncevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/asyncevent/URLClient.java | |
| @@ -21,13 +21,36 @@ import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet; | |
| import jakarta.servlet.GenericServlet; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_asyncevent.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_asyncevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_asyncevent_web_war"); | |
| + servlet_js_asyncevent_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_asyncevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asyncevent.AsyncTestServlet.class); | |
| + servlet_js_asyncevent_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_asyncevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_asyncevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_asyncevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_asyncevent_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("AsyncTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchertype/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchertype/URLClient.java | |
| index ef98137fb..d84394115 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchertype/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchertype/URLClient.java | |
| @@ -24,13 +24,35 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.ServletTestUtil; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_dispatchertype.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_dispatchertype_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_dispatchertype_web_war"); | |
| + servlet_js_dispatchertype_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_dispatchertype_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchertype.TestServlet.class); | |
| + servlet_js_dispatchertype_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_dispatchertype_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_dispatchertype_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_dispatchertype_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchtest/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchtest/URLClient.java | |
| index c50218a24..eaa3de6fa 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchtest/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dispatchtest/URLClient.java | |
| @@ -33,6 +33,25 @@ import java.net.URL; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_dispatchtest1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_dispatchtest1_web_war"); | |
| + servlet_js_dispatchtest1_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests10.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests11.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests12.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests13.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests14.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests15.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests16.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests17.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests18.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests19.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchtest.DispatchTests20.class); | |
| + servlet_js_dispatchtest1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("DispatchTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dofilter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dofilter/URLClient.java | |
| index ff2fdfda0..fc30aae9b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dofilter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/dofilter/URLClient.java | |
| @@ -24,13 +24,40 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.ServletTestUtil; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_dofilter.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_dofilter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_dofilter_web_war"); | |
| + servlet_js_dofilter_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.CTSResponseWrapper.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.ForwardedServlet.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.IncludedServlet.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.SetHeaderResponseFilter.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.TestServlet.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.WrapResponseFilter.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_dofilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_dofilter_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filter/URLClient.java | |
| index 8dfa5d702..e15430db3 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filter/URLClient.java | |
| @@ -24,12 +24,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.ServletTestUtil; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_filter.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_filter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_filter_web_war"); | |
| + servlet_js_filter_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_filter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.DoFilterTestServlet.class); | |
| + servlet_js_filter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.DoFilter_Filter.class); | |
| + servlet_js_filter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.InitFilterConfigTestServlet.class); | |
| + servlet_js_filter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.InitFilter_Filter.class); | |
| + servlet_js_filter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_filter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_filter_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterchain/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterchain/URLClient.java | |
| index e3fb5a115..4bfb3e5b6 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterchain/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterchain/URLClient.java | |
| @@ -24,12 +24,35 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.ServletTestUtil; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_filterchain.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_filterchain_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_filterchain_web_war"); | |
| + servlet_js_filterchain_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_filterchain_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterchain.FilterChainTestServlet.class); | |
| + servlet_js_filterchain_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterchain.FilterChain_Filter1.class); | |
| + servlet_js_filterchain_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterchain.FilterChain_Filter2.class); | |
| + servlet_js_filterchain_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_filterchain_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_filterchain_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterconfig/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterconfig/URLClient.java | |
| index 7ae53e92c..7a6b5e0e1 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterconfig/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterconfig/URLClient.java | |
| @@ -23,12 +23,44 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_filterconfig.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_filterconfig_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_filterconfig_web_war"); | |
| + servlet_js_filterconfig_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetFilterNameTestServlet.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetFilterName_Filter.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNamesNullTestServlet.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNamesNull_Filter.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNamesTestServlet.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNames_Filter.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNullTestServlet.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNull_Filter.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamTestServlet.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParam_Filter.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetServletContextTestServlet.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetServletContext_Filter.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_filterconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_filterconfig_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterrequestdispatcher/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterrequestdispatcher/URLClient.java | |
| index 79803eaf0..5df86d951 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterrequestdispatcher/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/filterrequestdispatcher/URLClient.java | |
| @@ -24,7 +24,9 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.Data; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -33,6 +35,38 @@ import java.util.Arrays; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_filterrequestdispatcher.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_filterrequestdispatcher_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_filterrequestdispatcher_web_war"); | |
| + servlet_js_filterrequestdispatcher_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_filterrequestdispatcher_web_war.addAsWebResource("dummy.html"); | |
| + servlet_js_filterrequestdispatcher_web_war.addAsWebResource("dummyJSP.jsp"); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.DummyServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ErrorPage.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ForwardTest1Servlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ForwardTestServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ForwardedServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.IncludeTest1Servlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.IncludeTestServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.IncludedServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.RequestTestServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.TestServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.Test_Filter.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_filterrequestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_filterrequestdispatcher_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericfilter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericfilter/URLClient.java | |
| index 1ee5fe5ae..a8b3b740b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericfilter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericfilter/URLClient.java | |
| @@ -23,12 +23,48 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_genericfilter.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_genericfilter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_genericfilter_web_war"); | |
| + servlet_js_genericfilter_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetFilterNameTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetFilterName_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParamNamesNullTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParamNamesNull_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParamNamesTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParamNames_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParamNullTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParamNull_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParamTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetInitParam_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetServletContextTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.GetServletContext_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.InitFilterConfigTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.InitFilterConfig_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.InitFilterTestServlet.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericfilter.InitFilter_Filter.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_genericfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_genericfilter_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericservlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericservlet/URLClient.java | |
| index 3ad101880..5f20ed327 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericservlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/genericservlet/URLClient.java | |
| @@ -23,13 +23,43 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_genericservlet.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_genericservlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_genericservlet_web_war"); | |
| + servlet_js_genericservlet_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.DestroyTestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.InitServletExceptionTestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.InitTestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.Init_ServletConfigServletExceptionTestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.Init_ServletConfigTestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.ServiceTestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.ServletErrorPage.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.TestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.ServiceTestServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_genericservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_genericservlet_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/registration/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/registration/URLClient.java | |
| index 204baa2d5..f59f6bfd1 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/registration/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/registration/URLClient.java | |
| @@ -33,7 +33,9 @@ import com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateServl | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -41,6 +43,40 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_registration.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_registration_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_registration_web_war"); | |
| + servlet_js_registration_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.registration.TestListener.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.registration.TestServlet.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterClass.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterNotFound.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterString.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletClass.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletNotFound.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletString.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadFilter.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadListener.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadServlet.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateFilter.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateServlet.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_registration_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_registration_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/requestdispatcher/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/requestdispatcher/URLClient.java | |
| index 8444adc52..eebab8e26 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/requestdispatcher/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/requestdispatcher/URLClient.java | |
| @@ -23,7 +23,9 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -31,6 +33,31 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_requestdispatcher.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_requestdispatcher_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_requestdispatcher_web_war"); | |
| + servlet_js_requestdispatcher_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.ForwardedServlet.class); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.ForwardedServlet2.class); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.ForwardedServlet3.class); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.IncludedServlet.class); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.TestServlet.class); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_requestdispatcher_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributeevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributeevent/URLClient.java | |
| index ff87d2677..a85eecbb1 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributeevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributeevent/URLClient.java | |
| @@ -27,13 +27,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.scattributeevent; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_scattributeevent.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_scattributeevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_scattributeevent_web_war"); | |
| + servlet_js_scattributeevent_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_scattributeevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributeevent.SCAttributeListener.class); | |
| + servlet_js_scattributeevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributeevent.TestServlet.class); | |
| + servlet_js_scattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_scattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_scattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_scattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_scattributeevent_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener/URLClient.java | |
| index 5fca1650a..17b579b4b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener/URLClient.java | |
| @@ -23,13 +23,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_scattributelistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_scattributelistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_scattributelistener_web_war"); | |
| + servlet_js_scattributelistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_scattributelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener.SCAttributeListener.class); | |
| + servlet_js_scattributelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener.TestServlet.class); | |
| + servlet_js_scattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_scattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_scattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_scattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_scattributelistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener40/URLClient.java | |
| index a3ff73116..ab8054045 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scattributelistener40/URLClient.java | |
| @@ -23,7 +23,9 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener40; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -31,6 +33,29 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_scattributelistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_scattributelistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_scattributelistener40_web_war"); | |
| + servlet_js_scattributelistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_scattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener40.SCAttributeListener40.class); | |
| + servlet_js_scattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener40.TestServlet.class); | |
| + servlet_js_scattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_scattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_scattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_scattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_scattributelistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scevent/URLClient.java | |
| index 973f5805d..9480c0e44 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scevent/URLClient.java | |
| @@ -23,13 +23,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.scevent; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_scevent.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_scevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_scevent_web_war"); | |
| + servlet_js_scevent_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_scevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scevent.SContextEventListener.class); | |
| + servlet_js_scevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scevent.TestServlet.class); | |
| + servlet_js_scevent_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_scevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_scevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_scevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_scevent_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter/URLClient.java | |
| index 244c8cc61..065297648 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter/URLClient.java | |
| @@ -23,6 +23,7 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -30,6 +31,31 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_addfilter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_addfilter_web_war"); | |
| + servlet_sci_addfilter_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_addfilter_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_addfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter.AddFilterString.class); | |
| + servlet_sci_addfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter.TCKServletContainerInitializer.class); | |
| + servlet_sci_addfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter.TestListener.class); | |
| + servlet_sci_addfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter.TestServlet.class); | |
| + servlet_sci_addfilter_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_addfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_addfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter1/URLClient.java | |
| index 3400e60b9..04b2651bb 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addfilter1/URLClient.java | |
| @@ -23,6 +23,7 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -30,6 +31,31 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_addfilter1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_addfilter1_web_war"); | |
| + servlet_sci_addfilter1_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter1.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_addfilter1_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_addfilter1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter1.AddFilterClass.class); | |
| + servlet_sci_addfilter1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter1.TCKServletContainerInitializer.class); | |
| + servlet_sci_addfilter1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter1.TestListener.class); | |
| + servlet_sci_addfilter1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addfilter1.TestServlet.class); | |
| + servlet_sci_addfilter1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_addfilter1_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_addfilter1_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener/URLClient.java | |
| index deb38dda6..be698ba4f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener/URLClient.java | |
| @@ -23,6 +23,7 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -30,6 +31,34 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_addlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_addlistener_web_war"); | |
| + servlet_sci_addlistener_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_addlistener_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SCAttributeListener.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SCListener.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SRAttributeListener.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SRListener.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.TCKServletContainerInitializer.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.TestListener.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.TestServlet.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_addlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener1/URLClient.java | |
| index fc7d9f06e..5a7b49659 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addlistener1/URLClient.java | |
| @@ -23,12 +23,40 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_addlistener1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_addlistener1_web_war"); | |
| + servlet_sci_addlistener1_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener1.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_addlistener1_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener1.TCKServletContainerInitializer.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener1.TestListener.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener1.TestServlet.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SCAttributeListener.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SCListener.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SRAttributeListener.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SRListener.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_addlistener1_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet/URLClient.java | |
| index e40e81321..13400e6d5 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet/URLClient.java | |
| @@ -23,12 +23,37 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_addservlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_addservlet_web_war"); | |
| + servlet_sci_addservlet_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_addservlet_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_addservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet.DummyServlet.class); | |
| + servlet_sci_addservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet.TCKServletContainerInitializer.class); | |
| + servlet_sci_addservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet.TestListener.class); | |
| + servlet_sci_addservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet.TestServlet.class); | |
| + servlet_sci_addservlet_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_addservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_addservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet1/URLClient.java | |
| index 7ba53cb42..88121553a 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/addservlet1/URLClient.java | |
| @@ -23,12 +23,37 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_addservlet1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_addservlet1_web_war"); | |
| + servlet_sci_addservlet1_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet1.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_addservlet1_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_addservlet1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet1.DummyServlet.class); | |
| + servlet_sci_addservlet1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet1.TCKServletContainerInitializer.class); | |
| + servlet_sci_addservlet1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet1.TestListener.class); | |
| + servlet_sci_addservlet1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addservlet1.TestServlet.class); | |
| + servlet_sci_addservlet1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_addservlet1_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_addservlet1_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createfilter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createfilter/URLClient.java | |
| index 35bbc09d9..4024da104 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createfilter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createfilter/URLClient.java | |
| @@ -23,12 +23,37 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_createfilter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_createfilter_web_war"); | |
| + servlet_sci_createfilter_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createfilter.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_createfilter_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_createfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createfilter.CreateFilter.class); | |
| + servlet_sci_createfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createfilter.TCKServletContainerInitializer.class); | |
| + servlet_sci_createfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createfilter.TestListener.class); | |
| + servlet_sci_createfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createfilter.TestServlet.class); | |
| + servlet_sci_createfilter_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_createfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_createfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createlistener/URLClient.java | |
| index d4205a637..b59e5abcf 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createlistener/URLClient.java | |
| @@ -27,12 +27,40 @@ import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SCListener; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_createlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_createlistener_web_war"); | |
| + servlet_sci_createlistener_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createlistener.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_createlistener_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createlistener.TCKServletContainerInitializer.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createlistener.TestListener.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createlistener.TestServlet.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SCAttributeListener.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SCListener.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SRAttributeListener.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.addlistener.SRListener.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_createlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createservlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createservlet/URLClient.java | |
| index 375960ca9..f4fb84f24 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createservlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/createservlet/URLClient.java | |
| @@ -23,12 +23,37 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_createservlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_createservlet_web_war"); | |
| + servlet_sci_createservlet_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createservlet.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_createservlet_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_createservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createservlet.DummyServlet.class); | |
| + servlet_sci_createservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createservlet.TCKServletContainerInitializer.class); | |
| + servlet_sci_createservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createservlet.TestListener.class); | |
| + servlet_sci_createservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.createservlet.TestServlet.class); | |
| + servlet_sci_createservlet_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_createservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_createservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getclassloader/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getclassloader/URLClient.java | |
| index a6004afe8..4d72eef2a 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getclassloader/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getclassloader/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_getclassloader_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_getclassloader_web_war"); | |
| + servlet_sci_getclassloader_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getclassloader.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_getclassloader_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_getclassloader_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getclassloader.TCKServletContainerInitializer.class); | |
| + servlet_sci_getclassloader_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getclassloader.TestListener.class); | |
| + servlet_sci_getclassloader_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getclassloader.TestServlet.class); | |
| + servlet_sci_getclassloader_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_getclassloader_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_getclassloader_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getdefaultsessiontrackingmodes/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getdefaultsessiontrackingmodes/URLClient.java | |
| index efad6a2cf..9c3f656f7 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getdefaultsessiontrackingmodes/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getdefaultsessiontrackingmodes/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_getdefaultsessiontrackingmode_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_getdefaultsessiontrackingmode_web_war"); | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getdefaultsessiontrackingmodes.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getdefaultsessiontrackingmodes.TCKServletContainerInitializer.class); | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getdefaultsessiontrackingmodes.TestListener.class); | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getdefaultsessiontrackingmodes.TestServlet.class); | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_getdefaultsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivemajorversion/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivemajorversion/URLClient.java | |
| index d381e9e8e..fdc7d0964 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivemajorversion/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivemajorversion/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_geteffectivemajorversion_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_geteffectivemajorversion_web_war"); | |
| + servlet_sci_geteffectivemajorversion_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivemajorversion.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_geteffectivemajorversion_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_geteffectivemajorversion_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivemajorversion.TCKServletContainerInitializer.class); | |
| + servlet_sci_geteffectivemajorversion_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivemajorversion.TestListener.class); | |
| + servlet_sci_geteffectivemajorversion_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivemajorversion.TestServlet.class); | |
| + servlet_sci_geteffectivemajorversion_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_geteffectivemajorversion_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_geteffectivemajorversion_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectiveminorversion/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectiveminorversion/URLClient.java | |
| index 1e53361ba..45fc21b3d 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectiveminorversion/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectiveminorversion/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_geteffectiveminorversion_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_geteffectiveminorversion_web_war"); | |
| + servlet_sci_geteffectiveminorversion_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectiveminorversion.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_geteffectiveminorversion_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_geteffectiveminorversion_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectiveminorversion.TCKServletContainerInitializer.class); | |
| + servlet_sci_geteffectiveminorversion_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectiveminorversion.TestListener.class); | |
| + servlet_sci_geteffectiveminorversion_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectiveminorversion.TestServlet.class); | |
| + servlet_sci_geteffectiveminorversion_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_geteffectiveminorversion_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_geteffectiveminorversion_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivesessiontrackingmodes/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivesessiontrackingmodes/URLClient.java | |
| index ca3deca51..518d55d5e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivesessiontrackingmodes/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/geteffectivesessiontrackingmodes/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_geteffectivesessiontrackingmode_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_geteffectivesessiontrackingmode_web_war"); | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivesessiontrackingmodes.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivesessiontrackingmodes.TCKServletContainerInitializer.class); | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivesessiontrackingmodes.TestListener.class); | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.geteffectivesessiontrackingmodes.TestServlet.class); | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_geteffectivesessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistration/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistration/URLClient.java | |
| index 3265731bd..160597de7 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistration/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistration/URLClient.java | |
| @@ -23,12 +23,37 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_getfilterregistration_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_getfilterregistration_web_war"); | |
| + servlet_sci_getfilterregistration_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistration.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_getfilterregistration_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_getfilterregistration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistration.TCKServletContainerInitializer.class); | |
| + servlet_sci_getfilterregistration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistration.TestFilter.class); | |
| + servlet_sci_getfilterregistration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistration.TestListener.class); | |
| + servlet_sci_getfilterregistration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistration.TestServlet.class); | |
| + servlet_sci_getfilterregistration_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_getfilterregistration_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_getfilterregistration_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistrations/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistrations/URLClient.java | |
| index fc2c7caba..c01f1d466 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistrations/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getfilterregistrations/URLClient.java | |
| @@ -23,12 +23,38 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_getfilterregistrations_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_getfilterregistrations_web_war"); | |
| + servlet_sci_getfilterregistrations_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistrations.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_getfilterregistrations_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistrations.TCKServletContainerInitializer.class); | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistrations.TestFilter.class); | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistrations.TestFilter1.class); | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistrations.TestListener.class); | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getfilterregistrations.TestServlet.class); | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_getfilterregistrations_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistration/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistration/URLClient.java | |
| index e3bf88450..52dc9f28f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistration/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistration/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_getservletregistration_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_getservletregistration_web_war"); | |
| + servlet_sci_getservletregistration_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistration.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_getservletregistration_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_getservletregistration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistration.TCKServletContainerInitializer.class); | |
| + servlet_sci_getservletregistration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistration.TestListener.class); | |
| + servlet_sci_getservletregistration_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistration.TestServlet.class); | |
| + servlet_sci_getservletregistration_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_getservletregistration_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_getservletregistration_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistrations/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistrations/URLClient.java | |
| index 083895a0a..83f5f4788 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistrations/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getservletregistrations/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_getservletregistrations_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_getservletregistrations_web_war"); | |
| + servlet_sci_getservletregistrations_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistrations.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_getservletregistrations_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_getservletregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistrations.TCKServletContainerInitializer.class); | |
| + servlet_sci_getservletregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistrations.TestListener.class); | |
| + servlet_sci_getservletregistrations_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getservletregistrations.TestServlet.class); | |
| + servlet_sci_getservletregistrations_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_getservletregistrations_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_getservletregistrations_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getsessioncookieconfig/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getsessioncookieconfig/URLClient.java | |
| index 93dcfbb1e..c64017c48 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getsessioncookieconfig/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/getsessioncookieconfig/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_getsessioncookieconfig_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_getsessioncookieconfig_web_war"); | |
| + servlet_sci_getsessioncookieconfig_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getsessioncookieconfig.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_getsessioncookieconfig_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_getsessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getsessioncookieconfig.TCKServletContainerInitializer.class); | |
| + servlet_sci_getsessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getsessioncookieconfig.TestListener.class); | |
| + servlet_sci_getsessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.getsessioncookieconfig.TestServlet.class); | |
| + servlet_sci_getsessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_getsessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_getsessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setinitparameter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setinitparameter/URLClient.java | |
| index 79a305457..e2134c7be 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setinitparameter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setinitparameter/URLClient.java | |
| @@ -23,11 +23,35 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_setinitparameter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_setinitparameter_web_war"); | |
| + servlet_sci_setinitparameter_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setinitparameter.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_setinitparameter_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_setinitparameter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setinitparameter.TCKServletContainerInitializer.class); | |
| + servlet_sci_setinitparameter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setinitparameter.TestListener.class); | |
| + servlet_sci_setinitparameter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setinitparameter.TestServlet.class); | |
| + servlet_sci_setinitparameter_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_setinitparameter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_setinitparameter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setsessiontrackingmodes/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setsessiontrackingmodes/URLClient.java | |
| index 2973eda70..9155d0745 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setsessiontrackingmodes/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/scinitializer/setsessiontrackingmodes/URLClient.java | |
| @@ -23,12 +23,36 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_sci_setsessiontrackingmode_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sci_setsessiontrackingmode_web_war"); | |
| + servlet_sci_setsessiontrackingmode_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setsessiontrackingmodes.TCKServletContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_sci_setsessiontrackingmode_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_sci_setsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setsessiontrackingmodes.TCKServletContainerInitializer.class); | |
| + servlet_sci_setsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setsessiontrackingmodes.TestListener.class); | |
| + servlet_sci_setsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scinitializer.setsessiontrackingmodes.TestServlet.class); | |
| + servlet_sci_setsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_sci_setsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_sci_setsessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener/URLClient.java | |
| index 8357750f7..61be27aaa 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener/URLClient.java | |
| @@ -23,13 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_sclistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_sclistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_sclistener_web_war"); | |
| + servlet_js_sclistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_sclistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener.ContextListener.class); | |
| + servlet_js_sclistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener.TestServlet.class); | |
| + servlet_js_sclistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_sclistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_sclistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_sclistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener40/URLClient.java | |
| index bfc29ab26..bfe99d689 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sclistener40/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener40; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_sclistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_sclistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_sclistener40_web_war"); | |
| + servlet_js_sclistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_sclistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener40.SCListener40.class); | |
| + servlet_js_sclistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener40.TestServlet.class); | |
| + servlet_js_sclistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_sclistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_sclistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_sclistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_sclistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servlet/URLClient.java | |
| index 8fa835b22..0acc2ae27 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servlet/URLClient.java | |
| @@ -23,12 +23,40 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servlet; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servlet.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servlet_web_war"); | |
| + servlet_js_servlet_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.CoreServletTest.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoDestroyedTestServlet.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoInit1TestServlet.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoInit2TestServlet.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoServiceTestServlet.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoServletConfigTestServlet.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoServletInfoTestServlet.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.PUTestServlet.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servlet_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletconfig/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletconfig/URLClient.java | |
| index d0d5e12bd..d808acbb7 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletconfig/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletconfig/URLClient.java | |
| @@ -22,12 +22,34 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletconfig; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletconfig.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletconfig_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletconfig_web_war"); | |
| + servlet_js_servletconfig_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletconfig.TestServlet.class); | |
| + servlet_js_servletconfig_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletconfig_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext/URLClient.java | |
| index 06ba21ebb..255820c8b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext/URLClient.java | |
| @@ -22,13 +22,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletcontext.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletcontext_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext_web_war"); | |
| + servlet_js_servletcontext_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext.GetNamedDispatcherTestServlet.class); | |
| + servlet_js_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext.TestServlet.class); | |
| + servlet_js_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletcontext_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext30/URLClient.java | |
| index c8d25a7a6..f9660887a 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext30/URLClient.java | |
| @@ -22,13 +22,65 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletcontext30.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletcontext30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext30_web_war"); | |
| + servlet_js_servletcontext30_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterNotFound.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCAttributeListenerClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCAttributeListenerString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCListenerClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCListenerString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRAttributeListenerClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRAttributeListenerString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRListenerClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRListenerString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletNotFound.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadFilter.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadListener.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadServlet.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateFilter.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSCAttributeListener.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSCListener.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSRAttributeListener.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSRListener.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateServlet.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateFilterClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateFilterString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateServletClass.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateServletString.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.FilterTestServlet.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.TestListener.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.TestServlet.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_servletcontext30_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_servletcontext30_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext301/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext301/URLClient.java | |
| index daac5b5a4..4e3ac095f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext301/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext301/URLClient.java | |
| @@ -29,6 +29,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_servletcontext301_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext301_web_war"); | |
| + servlet_js_servletcontext301_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext301_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext301.AddGenericEventListenerClass.class); | |
| + servlet_js_servletcontext301_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext301.TestListener.class); | |
| + servlet_js_servletcontext301_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext301.TestServlet.class); | |
| + servlet_js_servletcontext301_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext301_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext302/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext302/URLClient.java | |
| index 578ccf43a..cde837da8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext302/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext302/URLClient.java | |
| @@ -31,6 +31,19 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_servletcontext302_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext302_web_war"); | |
| + servlet_js_servletcontext302_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext302_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext302.TestListener.class); | |
| + servlet_js_servletcontext302_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext301.AddGenericEventListenerClass.class); | |
| + servlet_js_servletcontext302_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext301.TestServlet.class); | |
| + servlet_js_servletcontext302_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext302_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_servletcontext302_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext303/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext303/URLClient.java | |
| index 3ab1cf60e..9673fab41 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext303/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext303/URLClient.java | |
| @@ -33,6 +33,20 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_servletcontext303_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext303_web_war"); | |
| + servlet_js_servletcontext303_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext303.TestServlet.class); | |
| + servlet_js_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.common.sharedfiles.SCAttributeListener.class); | |
| + servlet_js_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.common.sharedfiles.SCListener.class); | |
| + servlet_js_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.common.sharedfiles.SRAttributeListener.class); | |
| + servlet_js_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.common.sharedfiles.SRListener.class); | |
| + servlet_js_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext304/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext304/URLClient.java | |
| index 047de6f96..b93ef7ea9 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext304/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext304/URLClient.java | |
| @@ -30,6 +30,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_servletcontext304_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext304_web_war"); | |
| + servlet_js_servletcontext304_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext304.CreateGenericEventListener.class); | |
| + servlet_js_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext304.TestListener.class); | |
| + servlet_js_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext301.TestServlet.class); | |
| + servlet_js_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext305/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext305/URLClient.java | |
| index ed1a42c21..9112ee40b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext305/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext305/URLClient.java | |
| @@ -45,12 +45,64 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| 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.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_servletcontext305_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext305_web_war"); | |
| + servlet_js_servletcontext305_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive initilizer_jar = ShrinkWrap.create(JavaArchive.class, "initilizer.jar"); | |
| + initilizer_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext305.TestContainerInitializer.class); | |
| + initilizer_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + initilizer_jar.addAsManifestResource("META-INF/services/jakarta.servlet.ServletContainerInitializer"); | |
| + servlet_js_servletcontext305_web_war.addAsLibrary(initilizer_jar); | |
| + | |
| + } | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext305.AddSCListenerClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext305.AddSCListenerString.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext305.CreateSCListener.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext305.TestContainerInitializer.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext305.TestServlet.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterNotFound.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterString.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCAttributeListenerClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCAttributeListenerString.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCListenerClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCListenerString.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRAttributeListenerClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRAttributeListenerString.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRListenerClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRListenerString.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletNotFound.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletString.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadFilter.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadListener.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadServlet.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateFilter.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSCAttributeListener.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSCListener.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSRAttributeListener.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSRListener.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateServlet.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext301.AddGenericEventListenerClass.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext304.CreateGenericEventListener.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext306/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext306/URLClient.java | |
| index fe740bd28..4248f7705 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext306/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext306/URLClient.java | |
| @@ -35,6 +35,22 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_servletcontext306_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext306_web_war"); | |
| + servlet_js_servletcontext306_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext306.TestServlet.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterClass.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterString.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletClass.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletString.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateFilter.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateServlet.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext306_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext31/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext31/URLClient.java | |
| index 678b7ccb7..1d3105bbd 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext31/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext31/URLClient.java | |
| @@ -29,6 +29,16 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_servletcontext31_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext31_web_war"); | |
| + servlet_js_servletcontext31_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext31_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext31.TestServlet.class); | |
| + servlet_js_servletcontext31_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletcontext31_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext40/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext40/Client.java | |
| index dd2f8ede6..ee37c92c6 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext40/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletcontext40/Client.java | |
| @@ -24,7 +24,9 @@ import com.sun.ts.lib.util.WebUtil; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -33,6 +35,37 @@ import java.net.InetAddress; | |
| public class Client extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletcontext40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletcontext40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletcontext40_web_war"); | |
| + servlet_js_servletcontext40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletcontext40_web_war.addAsWebResource("addJspFile.jsp"); | |
| + | |
| + { | |
| + | |
| + JavaArchive tagfile_jar = ShrinkWrap.create(JavaArchive.class, "tagfile.jar"); | |
| + tagfile_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + tagfile_jar.addAsManifestResource("META-INF/listener.tld"); | |
| + servlet_js_servletcontext40_web_war.addAsLibrary(tagfile_jar); | |
| + | |
| + } | |
| + servlet_js_servletcontext40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext40.AddListener.class); | |
| + servlet_js_servletcontext40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext40.TestListener.class); | |
| + servlet_js_servletcontext40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext40.TestServlet.class); | |
| + servlet_js_servletcontext40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext40.TestServlet2.class); | |
| + servlet_js_servletcontext40_web_war.addClass(com.sun.ts.lib.porting.TSURL.class); | |
| + ear.addAsModule(servlet_js_servletcontext40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| private WebUtil.Response response = null; | |
| private String request = null; | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletexception/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletexception/URLClient.java | |
| index 76246c7e3..94afb71f2 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletexception/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletexception/URLClient.java | |
| @@ -23,13 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletexception; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletexception.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletexception_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletexception_web_war"); | |
| + servlet_js_servletexception_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletexception_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletexception.TestServlet.class); | |
| + servlet_js_servletexception_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletexception_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletexception_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_servletexception_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_servletexception_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletinputstream/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletinputstream/URLClient.java | |
| index de3bc1638..a2662be43 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletinputstream/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletinputstream/URLClient.java | |
| @@ -24,13 +24,34 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.Data; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletinputstream.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletinputstream_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletinputstream_web_war"); | |
| + servlet_js_servletinputstream_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletinputstream_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletinputstream.ReadLineTestServlet.class); | |
| + servlet_js_servletinputstream_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletinputstream_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletinputstream_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletoutputstream/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletoutputstream/URLClient.java | |
| index d434b648c..bd56a7cec 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletoutputstream/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletoutputstream/URLClient.java | |
| @@ -27,13 +27,34 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletoutputstream; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletoutputstream.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletoutputstream_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletoutputstream_web_war"); | |
| + servlet_js_servletoutputstream_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletoutputstream_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletoutputstream.TestServlet.class); | |
| + servlet_js_servletoutputstream_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletoutputstream_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletoutputstream_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest/URLClient.java | |
| index d11ef7b9c..b42de7eb8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest/URLClient.java | |
| @@ -21,13 +21,40 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest; | |
| import com.sun.ts.tests.servlet.common.request.RequestClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends RequestClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletrequest.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletrequest_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletrequest_web_war"); | |
| + servlet_js_servletrequest_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.GetParameterNamesEmptyEnumTestServlet.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.GetReaderUnsupportedEncodingExceptionTestServlet.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.SetCharacterEncodingTest.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletrequest_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletrequest_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest1/URLClient.java | |
| index 212301c53..5bf199802 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest1/URLClient.java | |
| @@ -21,13 +21,35 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest1; | |
| import com.sun.ts.tests.servlet.common.request.RequestClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends RequestClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletrequest1.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletrequest1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletrequest1_web_war"); | |
| + servlet_js_servletrequest1_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletrequest1_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_js_servletrequest1_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_js_servletrequest1_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletrequest1_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletrequest1_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest30/URLClient.java | |
| index 58bf7d253..6a0b7ade7 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequest30/URLClient.java | |
| @@ -22,13 +22,39 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletrequest30.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletrequest30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletrequest30_web_war"); | |
| + servlet_js_servletrequest30_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTestServlet.class); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTests.class); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.SecondServlet.class); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.TestServlet.class); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletrequest30_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletrequest30_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper/URLClient.java | |
| index 8cca8f504..5d7802c80 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper/URLClient.java | |
| @@ -21,13 +21,40 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper; | |
| import com.sun.ts.tests.servlet.common.request.RequestClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends RequestClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletrequestwrapper.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletrequestwrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletrequestwrapper_web_war"); | |
| + servlet_js_servletrequestwrapper_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingTest.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingTestWrapper.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTestWrapper.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.TestServlet.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletrequestwrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletrequestwrapper_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30/URLClient.java | |
| index f90c56c2c..a089d42c0 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30/URLClient.java | |
| @@ -26,12 +26,41 @@ import com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.SecondServl | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletrequestwrapper30.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletrequestwrapper30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletrequestwrapper30_web_war"); | |
| + servlet_js_servletrequestwrapper30_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30.AsyncTestServletWrapper.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30.ErrorServletWrapper.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30.TestServletWrapper.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTestServlet.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTests.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.SecondServlet.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.TestServlet.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletrequestwrapper30_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletrequestwrapper30_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java | |
| index bd90e69ae..371408abb 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java | |
| @@ -22,12 +22,34 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30x; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletrequestwrapper30x.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletrequestwrapper30x_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletrequestwrapper30x_web_war"); | |
| + servlet_js_servletrequestwrapper30x_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletrequestwrapper30x_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30x.IsWrapperForTest.class); | |
| + servlet_js_servletrequestwrapper30x_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30x.TCKServletRequestWrapper.class); | |
| + servlet_js_servletrequestwrapper30x_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30x.TCKServletRequestsubWrapper.class); | |
| + servlet_js_servletrequestwrapper30x_web_war.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + ear.addAsModule(servlet_js_servletrequestwrapper30x_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponse/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponse/URLClient.java | |
| index a04ba35b2..0669fd00a 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponse/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponse/URLClient.java | |
| @@ -22,13 +22,37 @@ import com.sun.ts.tests.servlet.common.servlets.GenericCheckTestResultServlet; | |
| import com.sun.ts.tests.servlet.common.response.ResponseClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends ResponseClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletresponse.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletresponse_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletresponse_web_war"); | |
| + servlet_js_servletresponse_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponse.SetCharacterEncodingTestServlet.class); | |
| + servlet_js_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTestServlet.class); | |
| + servlet_js_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_js_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericCheckTestResultServlet.class); | |
| + servlet_js_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletresponse_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper/URLClient.java | |
| index f40162646..095a390a6 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper/URLClient.java | |
| @@ -22,13 +22,37 @@ import com.sun.ts.tests.servlet.common.response.HttpResponseClient; | |
| import com.sun.ts.tests.servlet.common.response.ResponseTestServlet; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletresponsewrapper.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletresponsewrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletresponsewrapper_web_war"); | |
| + servlet_js_servletresponsewrapper_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletresponsewrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper.SetCharacterEncodingTestServlet.class); | |
| + servlet_js_servletresponsewrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper.TestServlet.class); | |
| + servlet_js_servletresponsewrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTestServlet.class); | |
| + servlet_js_servletresponsewrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_js_servletresponsewrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_servletresponsewrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_servletresponsewrapper_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper30/URLClient.java | |
| index 1290db592..d463f4811 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/servletresponsewrapper30/URLClient.java | |
| @@ -22,13 +22,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper30; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletresponsewrapper30.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletresponsewrapper30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletresponsewrapper30_web_war"); | |
| + servlet_js_servletresponsewrapper30_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletresponsewrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper30.IsWrapperForTest.class); | |
| + servlet_js_servletresponsewrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper30.TCKServletResponseWrapper.class); | |
| + servlet_js_servletresponsewrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper30.TCKServletResponsesubWrapper.class); | |
| + servlet_js_servletresponsewrapper30_web_war.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + ear.addAsModule(servlet_js_servletresponsewrapper30_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode/URLClient.java | |
| index 3282ff0a7..2ea2d1b6b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode/URLClient.java | |
| @@ -29,6 +29,19 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_sessiontrackingmode_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_sessiontrackingmode_web_war"); | |
| + servlet_js_sessiontrackingmode_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_sessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode.TestListener.class); | |
| + servlet_js_sessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode.TestServlet.class); | |
| + servlet_js_sessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_sessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_sessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_sessiontrackingmode_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode1/URLClient.java | |
| index 0b2c948b2..e018e1cae 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode1/URLClient.java | |
| @@ -29,6 +29,17 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_sessiontrackingmode1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_sessiontrackingmode1_web_war"); | |
| + servlet_js_sessiontrackingmode1_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_sessiontrackingmode1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode1.TestServlet.class); | |
| + servlet_js_sessiontrackingmode1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_sessiontrackingmode1_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_sessiontrackingmode1_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode2/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode2/URLClient.java | |
| index 5b015b1e4..f68ac5660 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode2/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode2/URLClient.java | |
| @@ -29,6 +29,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_sessiontrackingmode2_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_sessiontrackingmode2_web_war"); | |
| + servlet_js_sessiontrackingmode2_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_sessiontrackingmode2_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode2.TestListener.class); | |
| + servlet_js_sessiontrackingmode2_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode2.TestServlet.class); | |
| + servlet_js_sessiontrackingmode2_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_sessiontrackingmode2_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_sessiontrackingmode2_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode3/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode3/URLClient.java | |
| index 6424b7f98..4b17bbadb 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode3/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode3/URLClient.java | |
| @@ -29,6 +29,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_sessiontrackingmode3_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_sessiontrackingmode3_web_war"); | |
| + servlet_js_sessiontrackingmode3_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_sessiontrackingmode3_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode3.TestListener.class); | |
| + servlet_js_sessiontrackingmode3_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode3.TestServlet.class); | |
| + servlet_js_sessiontrackingmode3_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_sessiontrackingmode3_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_sessiontrackingmode3_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode4/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode4/URLClient.java | |
| index 2155ad06a..36a77c4dc 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode4/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/sessiontrackingmode4/URLClient.java | |
| @@ -29,6 +29,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_js_sessiontrackingmode4_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_sessiontrackingmode4_web_war"); | |
| + servlet_js_sessiontrackingmode4_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_sessiontrackingmode4_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode4.TestListener.class); | |
| + servlet_js_sessiontrackingmode4_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode4.TestServlet.class); | |
| + servlet_js_sessiontrackingmode4_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_sessiontrackingmode4_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_sessiontrackingmode4_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributeevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributeevent/URLClient.java | |
| index ee9b0a8e8..8df1488e0 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributeevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributeevent/URLClient.java | |
| @@ -27,13 +27,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.srattributeevent; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_srattributeevent.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_srattributeevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_srattributeevent_web_war"); | |
| + servlet_js_srattributeevent_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_srattributeevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributeevent.SRAttributeListener.class); | |
| + servlet_js_srattributeevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributeevent.TestServlet.class); | |
| + servlet_js_srattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_srattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_srattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_srattributeevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_srattributeevent_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener/URLClient.java | |
| index 16c0c3b12..9e689d55c 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener/URLClient.java | |
| @@ -27,12 +27,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_srattributelistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_srattributelistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_srattributelistener_web_war"); | |
| + servlet_js_srattributelistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_srattributelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener.SRAttributeListener.class); | |
| + servlet_js_srattributelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener.TestServlet.class); | |
| + servlet_js_srattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_srattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_srattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_srattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_srattributelistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener40/URLClient.java | |
| index 2c85a7a3c..3b95ed3bc 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srattributelistener40/URLClient.java | |
| @@ -23,13 +23,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener40; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_srattributelistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_srattributelistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_srattributelistener40_web_war"); | |
| + servlet_js_srattributelistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_srattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener40.SRAttributeListener40.class); | |
| + servlet_js_srattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener40.TestServlet.class); | |
| + servlet_js_srattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_srattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_srattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_srattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_srattributelistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srevent/URLClient.java | |
| index 1cf8f6899..8e6c8d4de 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srevent/URLClient.java | |
| @@ -23,12 +23,34 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.srevent; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_srevent.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_srevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_srevent_web_war"); | |
| + servlet_js_srevent_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_srevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srevent.TestServlet.class); | |
| + servlet_js_srevent_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_srevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_srevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_srevent_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener/URLClient.java | |
| index 7e7c9c9c7..a995531d0 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener/URLClient.java | |
| @@ -27,7 +27,9 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -35,6 +37,29 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_srlistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_srlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_srlistener_web_war"); | |
| + servlet_js_srlistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_srlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener.SRListener.class); | |
| + servlet_js_srlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener.TestServlet.class); | |
| + servlet_js_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_srlistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener40/URLClient.java | |
| index 53aca9934..5fdbfaf98 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/srlistener40/URLClient.java | |
| @@ -23,13 +23,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener40; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_srlistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_srlistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_srlistener40_web_war"); | |
| + servlet_js_srlistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_srlistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener40.SRListener40.class); | |
| + servlet_js_srlistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener40.TestServlet.class); | |
| + servlet_js_srlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_srlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_srlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_js_srlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_js_srlistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/unavailableexception/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/unavailableexception/URLClient.java | |
| index dd3007f56..e918c23e7 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/unavailableexception/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet/unavailableexception/URLClient.java | |
| @@ -23,13 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet.unavailableexception; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_unavailableexception.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_unavailableexception_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_unavailableexception_web_war"); | |
| + servlet_js_unavailableexception_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_unavailableexception_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.unavailableexception.TestServlet.class); | |
| + servlet_js_unavailableexception_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.unavailableexception.UnavailableServlet.class); | |
| + servlet_js_unavailableexception_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_js_unavailableexception_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_js_unavailableexception_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_js_unavailableexception_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/asynccontext/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/asynccontext/URLClient.java | |
| index c9f45d8e9..750b3ec3a 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/asynccontext/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/asynccontext/URLClient.java | |
| @@ -30,6 +30,24 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_asynccontext_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_asynccontext_web_war"); | |
| + servlet_jsh_asynccontext_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.ACListener.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.ACListener1.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.ACListener2.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.ACListenerBad.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.AsyncTestServlet.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.AsyncTests.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.RequestWrapper.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.asynccontext.ResponseWrapper.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + servlet_jsh_asynccontext_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("AsyncTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java | |
| index 027b4a49d..1b7d1a7ba 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/cookie/URLClient.java | |
| @@ -31,7 +31,9 @@ import org.apache.commons.httpclient.Header; | |
| import org.apache.commons.httpclient.cookie.CookiePolicy; | |
| import org.apache.commons.httpclient.cookie.CookieSpec; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Disabled; | |
| @@ -44,6 +46,27 @@ import java.util.TimeZone; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_cookie.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_cookie_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_cookie_web_war"); | |
| + servlet_jsh_cookie_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_cookie_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.cookie.TestServlet.class); | |
| + servlet_jsh_cookie_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_cookie_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_cookie_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_cookie_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpfilter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpfilter/URLClient.java | |
| index ebe523bf6..d81f047fc 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpfilter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpfilter/URLClient.java | |
| @@ -23,12 +23,35 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpfilter; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpfilter.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpfilter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpfilter_web_war"); | |
| + servlet_jsh_httpfilter_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpfilter.HttpFilterTestServlet.class); | |
| + servlet_jsh_httpfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpfilter.HttpFilter_Filter1.class); | |
| + servlet_jsh_httpfilter_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpfilter.HttpFilter_Filter2.class); | |
| + servlet_jsh_httpfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpfilter_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservlet/URLClient.java | |
| index 67120157c..9e0a52514 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservlet/URLClient.java | |
| @@ -22,13 +22,39 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservlet.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservlet_web_war"); | |
| + servlet_jsh_httpservlet_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.DestroyTestServlet.class); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.InitTestServlet.class); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.Init_ServletConfigTestServlet.class); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.ServiceTestServlet.class); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.TestServlet.class); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpservlet_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpservlet_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest/URLClient.java | |
| index 08f44b7c0..20e3cdb38 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest/URLClient.java | |
| @@ -30,13 +30,44 @@ import com.sun.ts.tests.servlet.common.request.HttpRequestClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.Data; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservletrequest.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservletrequest_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletrequest_web_war"); | |
| + servlet_jsh_httpservletrequest_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetParameterNamesEmptyEnumTestServlet.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetQueryStringNullTestServlet.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetReaderUnsupportedEncodingExceptionTestServlet.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetServletPathEmptyStringTestServlet.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.SetCharacterEncodingTest.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.doHeadTest.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.getServletContextTest.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.HttpRequestTestServlet.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpservletrequest_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpservletrequest_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest1/URLClient.java | |
| index 3d61f76d5..4db82bf28 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest1/URLClient.java | |
| @@ -22,13 +22,35 @@ import com.sun.ts.tests.servlet.common.request.HttpRequestClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| import org.jboss.arquillian.container.test.api.TargetsContainer; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservletrequest1.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservletrequest1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletrequest1_web_war"); | |
| + servlet_jsh_httpservletrequest1_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletrequest1_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.HttpRequestTestServlet.class); | |
| + servlet_jsh_httpservletrequest1_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_jsh_httpservletrequest1_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpservletrequest1_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpservletrequest1_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest30/URLClient.java | |
| index 8bb6f95da..dad6decb6 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest30/URLClient.java | |
| @@ -22,13 +22,34 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest30; | |
| import com.sun.ts.tests.servlet.common.request.HttpRequestClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservletrequest30.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservletrequest30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletrequest30_web_war"); | |
| + servlet_jsh_httpservletrequest30_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletrequest30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest30.LoginTestServlet.class); | |
| + servlet_jsh_httpservletrequest30_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpservletrequest30_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpservletrequest30_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("LoginTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest31/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest31/URLClient.java | |
| index 1d67a183f..afc29dbbf 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest31/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest31/URLClient.java | |
| @@ -28,6 +28,19 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_httpservletrequest31_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletrequest31_web_war"); | |
| + servlet_jsh_httpservletrequest31_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletrequest31_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.HttpRequestTestServlet.class); | |
| + servlet_jsh_httpservletrequest31_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_jsh_httpservletrequest31_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_jsh_httpservletrequest31_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpservletrequest31_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpservletrequest31_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java | |
| index 5890a6d0b..5fa3e7bc5 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequest40/Client.java | |
| @@ -24,7 +24,9 @@ import com.sun.ts.lib.util.WebUtil; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -37,6 +39,32 @@ import java.net.URL; | |
| public class Client extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservletrequest40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservletrequest40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletrequest40_web_war"); | |
| + servlet_jsh_httpservletrequest40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.DispatchServlet.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.ForwardFilter.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.ForwardServlet.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.IncludeServlet.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.NamedForwardServlet.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.NamedIncludeServlet.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.TestServlet.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.TrailerTestServlet.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest40.Utilities.class); | |
| + servlet_jsh_httpservletrequest40_web_war.addClass(com.sun.ts.lib.porting.TSURL.class); | |
| + ear.addAsModule(servlet_jsh_httpservletrequest40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| public static final String DELIMITER = "\r\n"; | |
| public static final String ENCODING = "ISO-8859-1"; | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java | |
| index 778cbd363..99371d724 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java | |
| @@ -21,13 +21,41 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrap | |
| import com.sun.ts.tests.servlet.common.request.HttpRequestClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_HSReqWrapper.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_HSReqWrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_HSReqWrapper_web_war"); | |
| + servlet_jsh_HSReqWrapper_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingTest.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingTestWrapper.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTestWrapper.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.TCKHttpSessionIDListener.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.TestServlet.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.HttpRequestTestServlet.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_HSReqWrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_HSReqWrapper_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse/URLClient.java | |
| index 9f8c384d0..f1978dd2e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse/URLClient.java | |
| @@ -21,7 +21,9 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse; | |
| import com.sun.ts.tests.servlet.common.response.HttpResponseClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -29,6 +31,31 @@ import org.slf4j.LoggerFactory; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservletresponse.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservletresponse_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletresponse_web_war"); | |
| + servlet_jsh_httpservletresponse_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.GetContentTypeNullTestServlet.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.RedirectedTestServlet.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.ServletErrorPage.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.SetCharacterEncodingTestServlet.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpCheckTestResultServlet.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpservletresponse_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse30/URLClient.java | |
| index 24a2163eb..22ad39be6 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse30/URLClient.java | |
| @@ -21,13 +21,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse30; | |
| import com.sun.ts.tests.servlet.common.response.HttpResponseClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservletresponse30.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservletresponse30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletresponse30_web_war"); | |
| + servlet_jsh_httpservletresponse30_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletresponse30_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_jsh_httpservletresponse30_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_jsh_httpservletresponse30_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpCheckTestResultServlet.class); | |
| + servlet_jsh_httpservletresponse30_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpservletresponse30_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpservletresponse30_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse40/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse40/Client.java | |
| index 5122d44f6..437718d59 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse40/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponse40/Client.java | |
| @@ -24,7 +24,9 @@ import com.sun.ts.lib.util.WebUtil; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -39,6 +41,25 @@ import static com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletreque | |
| public class Client extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpservletresponse40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpservletresponse40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpservletresponse40_web_war"); | |
| + servlet_jsh_httpservletresponse40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpservletresponse40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse40.TrailerTestServlet.class); | |
| + servlet_jsh_httpservletresponse40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse40.TrailerTestServlet2.class); | |
| + servlet_jsh_httpservletresponse40_web_war.addClass(com.sun.ts.lib.porting.TSURL.class); | |
| + ear.addAsModule(servlet_jsh_httpservletresponse40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java | |
| index 15815037f..af8ce9f3e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java | |
| @@ -21,13 +21,38 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewra | |
| import com.sun.ts.tests.servlet.common.response.HttpResponseClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_HSRespWrapper.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_HSRespWrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_HSRespWrapper_web_war"); | |
| + servlet_jsh_HSRespWrapper_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_HSRespWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper.RedirectedTestServlet.class); | |
| + servlet_jsh_HSRespWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper.SetCharacterEncodingTestServlet.class); | |
| + servlet_jsh_HSRespWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper.TestServlet.class); | |
| + servlet_jsh_HSRespWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_jsh_HSRespWrapper_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_jsh_HSRespWrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_HSRespWrapper_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_HSRespWrapper_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java | |
| index 8acc5c45e..5949e8d1f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java | |
| @@ -22,13 +22,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewra | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_HSRespWrapper30.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_HSRespWrapper30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_HSRespWrapper30_web_war"); | |
| + servlet_jsh_HSRespWrapper30_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_HSRespWrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper30.TestServlet.class); | |
| + servlet_jsh_HSRespWrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_jsh_HSRespWrapper30_web_war.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_jsh_HSRespWrapper30_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_HSRespWrapper30_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_HSRespWrapper30_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsession/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsession/URLClient.java | |
| index e4176371c..e9b534f72 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsession/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsession/URLClient.java | |
| @@ -23,13 +23,38 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsession; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsession.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsession_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsession_web_war"); | |
| + servlet_jsh_httpsession_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsession_web_war.addAsWebResource("index.html"); | |
| + servlet_jsh_httpsession_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsession.ExpireHttpSession.class); | |
| + servlet_jsh_httpsession_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsession.GetLastAccessedTime.class); | |
| + servlet_jsh_httpsession_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsession.TestServlet.class); | |
| + servlet_jsh_httpsession_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsession_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsession_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpsession_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionactivationlistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionactivationlistener40/URLClient.java | |
| index 892c58bcb..2390b6b1b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionactivationlistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionactivationlistener40/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionactivationl | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionactivationlistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionactivationlistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionactivationlistener40_web_war"); | |
| + servlet_jsh_httpsessionactivationlistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionactivationlistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionactivationlistener40.HSActivationListener40.class); | |
| + servlet_jsh_httpsessionactivationlistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionactivationlistener40.TestServlet.class); | |
| + servlet_jsh_httpsessionactivationlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_jsh_httpsessionactivationlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionactivationlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionactivationlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionactivationlistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java | |
| index 1ec752300..32bd75f32 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributeli | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionattributelistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionattributelistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionattributelistener_web_war"); | |
| + servlet_jsh_httpsessionattributelistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionattributelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributelistener.HSAttributeListener.class); | |
| + servlet_jsh_httpsessionattributelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributelistener.TestServlet.class); | |
| + servlet_jsh_httpsessionattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionattributelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionattributelistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener40/URLClient.java | |
| index 7b34df767..d014dbfbe 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionattributelistener40/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributeli | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionattributelistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionattributelistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionattributelistener40_web_war"); | |
| + servlet_jsh_httpsessionattributelistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributelistener40.HSAttributeListener40.class); | |
| + servlet_jsh_httpsessionattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributelistener40.TestServlet.class); | |
| + servlet_jsh_httpsessionattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_jsh_httpsessionattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionattributelistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionattributelistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java | |
| index d4f17476a..1d016efb1 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindingeven | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionbindingevent.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionbindingevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionbindingevent_web_war"); | |
| + servlet_jsh_httpsessionbindingevent_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionbindingevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindingevent.HSBindingEvent.class); | |
| + servlet_jsh_httpsessionbindingevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindingevent.TestServlet.class); | |
| + servlet_jsh_httpsessionbindingevent_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionbindingevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionbindingevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionbindingevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionbindingevent_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java | |
| index dafd1fbca..06c11700b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglist | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionbindinglistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionbindinglistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionbindinglistener_web_war"); | |
| + servlet_jsh_httpsessionbindinglistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionbindinglistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglistener.HSBindingListener.class); | |
| + servlet_jsh_httpsessionbindinglistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglistener.TestServlet.class); | |
| + servlet_jsh_httpsessionbindinglistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionbindinglistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionbindinglistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionbindinglistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionbindinglistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener40/URLClient.java | |
| index fbc3215b9..6a1825f48 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionbindinglistener40/URLClient.java | |
| @@ -23,13 +23,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglist | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionbindinglistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionbindinglistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionbindinglistener40_web_war"); | |
| + servlet_jsh_httpsessionbindinglistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionbindinglistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglistener40.HSBindingListener40.class); | |
| + servlet_jsh_httpsessionbindinglistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglistener40.TestServlet.class); | |
| + servlet_jsh_httpsessionbindinglistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_jsh_httpsessionbindinglistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionbindinglistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionbindinglistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionbindinglistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionevent/URLClient.java | |
| index 3e31f130d..73a4515b5 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionevent/URLClient.java | |
| @@ -23,13 +23,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionevent; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionevent.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionevent_web_war"); | |
| + servlet_jsh_httpsessionevent_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionevent.HSEvent.class); | |
| + servlet_jsh_httpsessionevent_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionevent.TestServlet.class); | |
| + servlet_jsh_httpsessionevent_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionevent_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionevent_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionidlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionidlistener/URLClient.java | |
| index a95ec9f79..8b632f310 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionidlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionidlistener/URLClient.java | |
| @@ -28,6 +28,20 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_httpsessionidlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionidlistener_web_war"); | |
| + servlet_jsh_httpsessionidlistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionidlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionidlistener.TCKHttpSessionIDListener.class); | |
| + servlet_jsh_httpsessionidlistener_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.HttpRequestTestServlet.class); | |
| + servlet_jsh_httpsessionidlistener_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_jsh_httpsessionidlistener_web_war.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_jsh_httpsessionidlistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionidlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionidlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener/URLClient.java | |
| index 4d4317435..ad28ca365 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionlistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionlistener_web_war"); | |
| + servlet_jsh_httpsessionlistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener.HSListener.class); | |
| + servlet_jsh_httpsessionlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener.TestServlet.class); | |
| + servlet_jsh_httpsessionlistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionlistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener40/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener40/URLClient.java | |
| index 7c67b1102..f91193294 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener40/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionlistener40/URLClient.java | |
| @@ -23,13 +23,37 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener40; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_jsh_httpsessionlistener40.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionlistener40_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionlistener40_web_war"); | |
| + servlet_jsh_httpsessionlistener40_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionlistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener40.HSListener40.class); | |
| + servlet_jsh_httpsessionlistener40_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener40.TestServlet.class); | |
| + servlet_jsh_httpsessionlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_jsh_httpsessionlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_httpsessionlistener40_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionlistener40_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionx/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionx/URLClient.java | |
| index 1f5eb74ba..86c77c122 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionx/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpsessionx/URLClient.java | |
| @@ -26,12 +26,54 @@ package com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_httpsessionx.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionx2_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionx2_web_war"); | |
| + servlet_jsh_httpsessionx2_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.ExpireHttpSession.class); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.GetNewSession.class); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.InvalidateHttpSession.class); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.SetMaxInterval.class); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.TestServlet.class); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionx2_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionx2_web_war); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_jsh_httpsessionx_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_httpsessionx_web_war"); | |
| + servlet_jsh_httpsessionx_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.ExpireHttpSession.class); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.GetNewSession.class); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.InvalidateHttpSession.class); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.SetMaxInterval.class); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.TestServlet.class); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_httpsessionx_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_jsh_httpsessionx_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpupgradehandler/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpupgradehandler/URLClient.java | |
| index a28995a5e..3e34adf8f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpupgradehandler/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpupgradehandler/URLClient.java | |
| @@ -34,6 +34,17 @@ import java.net.URL; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_upgradehandler_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_upgradehandler_web_war"); | |
| + servlet_jsh_upgradehandler_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpupgradehandler.TCKHttpUpgradeHandler.class); | |
| + servlet_jsh_upgradehandler_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpupgradehandler.TCKReadListener.class); | |
| + servlet_jsh_upgradehandler_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpupgradehandler.TestServlet.class); | |
| + servlet_jsh_upgradehandler_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_upgradehandler_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| private static final String CRLF = "\r\n"; | |
| @BeforeEach | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part/URLClient.java | |
| index 3db5d2b73..9d3bcd68e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part/URLClient.java | |
| @@ -41,6 +41,15 @@ import java.net.URL; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_part_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_part_web_war"); | |
| + servlet_jsh_part_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.part.TestServlet.class); | |
| + servlet_jsh_part_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_part_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| private static final String CRLF = "\r\n"; | |
| @BeforeEach | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part1/URLClient.java | |
| index ec4f3e48c..c96e5cbd0 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/part1/URLClient.java | |
| @@ -45,6 +45,16 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_part1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_part1_web_war"); | |
| + servlet_jsh_part1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.part1.TestServletWrapper.class); | |
| + servlet_jsh_part1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.part.TestServlet.class); | |
| + servlet_jsh_part1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_part1_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| private static final String CRLF = "\r\n"; | |
| @BeforeEach | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener/URLClient.java | |
| index 32461f314..3211bb24b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener/URLClient.java | |
| @@ -37,6 +37,15 @@ import java.net.URL; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_readlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_readlistener_web_war"); | |
| + servlet_jsh_readlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.readlistener.TestListener.class); | |
| + servlet_jsh_readlistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.readlistener.TestServlet.class); | |
| + } | |
| + | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener1/URLClient.java | |
| index 44ad51580..ee0e1b5c9 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/readlistener1/URLClient.java | |
| @@ -37,6 +37,15 @@ import java.net.URL; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_readlistener1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_readlistener1_web_war"); | |
| + servlet_jsh_readlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.readlistener1.TestListener.class); | |
| + servlet_jsh_readlistener1_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.readlistener1.TestServlet.class); | |
| + servlet_jsh_readlistener1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext303/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext303/URLClient.java | |
| index 602c55466..34f758248 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext303/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext303/URLClient.java | |
| @@ -29,6 +29,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_servletcontext303_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_servletcontext303_web_war"); | |
| + servlet_jsh_servletcontext303_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext303.TestServlet.class); | |
| + servlet_jsh_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.common.sharedfiles.HSessionAttributeListener.class); | |
| + servlet_jsh_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.api.common.sharedfiles.HSessionListener.class); | |
| + servlet_jsh_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_servletcontext303_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext304/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext304/URLClient.java | |
| index 0a979c2d8..e28cc15b2 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext304/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext304/URLClient.java | |
| @@ -29,6 +29,21 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_servletcontext304_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_servletcontext304_web_war"); | |
| + servlet_jsh_servletcontext304_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext304.AddHttpSessionListenerClass.class); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext304.AddHttpSessionListenerString.class); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext304.CreateHttpSessionListener.class); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext304.TestListener.class); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext304.TestServlet.class); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_servletcontext304_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext305/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext305/URLClient.java | |
| index 1f35f38b9..88a00a46e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext305/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/servletcontext305/URLClient.java | |
| @@ -29,6 +29,21 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_servletcontext305_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_servletcontext305_web_war"); | |
| + servlet_jsh_servletcontext305_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext305.AddHttpSessionAttributeListenerClass.class); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext305.AddHttpSessionAttributeListenerString.class); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext305.CreateHttpSessionAttributeListener.class); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext305.TestListener.class); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.servletcontext305.TestServlet.class); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_jsh_servletcontext305_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java | |
| index 3a545b619..dcd216b56 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java | |
| @@ -29,6 +29,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_sessioncookieconfig_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_sessioncookieconfig_web_war"); | |
| + servlet_jsh_sessioncookieconfig_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_jsh_sessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.sessioncookieconfig.TestListener.class); | |
| + servlet_jsh_sessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.sessioncookieconfig.TestServlet.class); | |
| + servlet_jsh_sessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_sessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_jsh_sessioncookieconfig_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/writelistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/writelistener/URLClient.java | |
| index 076a63bcb..4711b0f45 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/writelistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/api/jakarta_servlet_http/writelistener/URLClient.java | |
| @@ -35,6 +35,16 @@ import java.net.URL; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_jsh_writelistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_jsh_writelistener_web_war"); | |
| + servlet_jsh_writelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.writelistener.TestListener.class); | |
| + servlet_jsh_writelistener_web_war.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.writelistener.TestServlet.class); | |
| + servlet_jsh_writelistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_jsh_writelistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithLeadingSlash/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithLeadingSlash/URLClient.java | |
| index c413236c6..a58f73f80 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithLeadingSlash/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithLeadingSlash/URLClient.java | |
| @@ -23,13 +23,32 @@ package com.sun.ts.tests.servlet.compat.LeadingSlash.WithLeadingSlash; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_compat_LeadingSlash_With.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_compat_LeadingSlash_With_web_war = ShrinkWrap.create(WebArchive.class, "servlet_compat_LeadingSlash_With_web_war"); | |
| + servlet_compat_LeadingSlash_With_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_compat_LeadingSlash_With_web_war.addClass(com.sun.ts.tests.servlet.compat.LeadingSlash.WithLeadingSlash.WithLeadingSlashTestServlet.class); | |
| + ear.addAsModule(servlet_compat_LeadingSlash_With_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithoutLeadingSlash/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithoutLeadingSlash/URLClient.java | |
| index e8db1bf61..eb48e2016 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithoutLeadingSlash/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/compat/LeadingSlash/WithoutLeadingSlash/URLClient.java | |
| @@ -23,13 +23,32 @@ package com.sun.ts.tests.servlet.compat.LeadingSlash.WithoutLeadingSlash; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_compat_LeadingSlash_Without.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_compat_LeadingSlash_Without_web_war = ShrinkWrap.create(WebArchive.class, "servlet_compat_LeadingSlash_Without_web_war"); | |
| + servlet_compat_LeadingSlash_Without_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_compat_LeadingSlash_Without_web_war.addClass(com.sun.ts.tests.servlet.compat.LeadingSlash.WithoutLeadingSlash.WithoutLeadingSlashTestServlet.class); | |
| + ear.addAsModule(servlet_compat_LeadingSlash_Without_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| // TOFIX setGeneralURI("/servlet/compat/LeadingSlash/WithoutLeadingSlash"); | |
| /** | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering/URLClient.java | |
| index 04da68f82..365e4e5b8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering/URLClient.java | |
| @@ -24,12 +24,84 @@ import com.sun.ts.tests.servlet.pluggability.common.CommonArchives; | |
| import com.sun.ts.tests.servlet.pluggability.common.RequestListener; | |
| import com.sun.ts.tests.servlet.pluggability.common.TestServlet1; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| +import org.jboss.shrinkwrap.api.spec.JavaArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_aordering.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_aordering_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_aordering_web_war"); | |
| + servlet_spec_aordering_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering1_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering1.jar"); | |
| + servlet_spec_aordering1_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener1.class); | |
| + servlet_spec_aordering1_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + servlet_spec_aordering1_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering1_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering_web_war.addAsLibrary(servlet_spec_aordering1_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering2_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering2.jar"); | |
| + servlet_spec_aordering2_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener2.class); | |
| + servlet_spec_aordering2_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering2_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering_web_war.addAsLibrary(servlet_spec_aordering2_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering3_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering3.jar"); | |
| + servlet_spec_aordering3_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener3.class); | |
| + servlet_spec_aordering3_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering3_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering_web_war.addAsLibrary(servlet_spec_aordering3_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering4_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering4.jar"); | |
| + servlet_spec_aordering4_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener4.class); | |
| + servlet_spec_aordering4_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering4_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering_web_war.addAsLibrary(servlet_spec_aordering4_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering5_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering5.jar"); | |
| + servlet_spec_aordering5_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener5.class); | |
| + servlet_spec_aordering5_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering5_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering_web_war.addAsLibrary(servlet_spec_aordering5_jar); | |
| + | |
| + } | |
| + servlet_spec_aordering_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener.class); | |
| + servlet_spec_aordering_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + ear.addAsModule(servlet_spec_aordering_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering1/URLClient.java | |
| index 07762ab43..083ebbbba 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering1/URLClient.java | |
| @@ -24,12 +24,84 @@ import com.sun.ts.tests.servlet.pluggability.common.CommonArchives; | |
| import com.sun.ts.tests.servlet.pluggability.common.RequestListener; | |
| import com.sun.ts.tests.servlet.pluggability.common.TestServlet1; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| +import org.jboss.shrinkwrap.api.spec.JavaArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_aordering1.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_aordering1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_aordering1_web_war"); | |
| + servlet_spec_aordering1_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering11_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering11.jar"); | |
| + servlet_spec_aordering11_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener1.class); | |
| + servlet_spec_aordering11_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + servlet_spec_aordering11_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering11_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering1_web_war.addAsLibrary(servlet_spec_aordering11_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering12_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering12.jar"); | |
| + servlet_spec_aordering12_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener2.class); | |
| + servlet_spec_aordering12_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering12_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering1_web_war.addAsLibrary(servlet_spec_aordering12_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering13_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering13.jar"); | |
| + servlet_spec_aordering13_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener3.class); | |
| + servlet_spec_aordering13_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering13_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering1_web_war.addAsLibrary(servlet_spec_aordering13_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering14_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering14.jar"); | |
| + servlet_spec_aordering14_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener4.class); | |
| + servlet_spec_aordering14_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering14_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering1_web_war.addAsLibrary(servlet_spec_aordering14_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering15_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering15.jar"); | |
| + servlet_spec_aordering15_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener5.class); | |
| + servlet_spec_aordering15_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering15_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering1_web_war.addAsLibrary(servlet_spec_aordering15_jar); | |
| + | |
| + } | |
| + servlet_spec_aordering1_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener.class); | |
| + servlet_spec_aordering1_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + ear.addAsModule(servlet_spec_aordering1_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering2/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering2/URLClient.java | |
| index 6cfe20663..79ff79c75 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering2/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering2/URLClient.java | |
| @@ -26,13 +26,94 @@ import com.sun.ts.tests.servlet.pluggability.common.RequestListener5; | |
| import com.sun.ts.tests.servlet.pluggability.common.RequestListener6; | |
| import com.sun.ts.tests.servlet.pluggability.common.TestServlet1; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_aordering2.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_aordering2_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_aordering2_web_war"); | |
| + servlet_spec_aordering2_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering21_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering21.jar"); | |
| + servlet_spec_aordering21_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener1.class); | |
| + servlet_spec_aordering21_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + servlet_spec_aordering21_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering21_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering2_web_war.addAsLibrary(servlet_spec_aordering21_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering22_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering22.jar"); | |
| + servlet_spec_aordering22_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener2.class); | |
| + servlet_spec_aordering22_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering22_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering2_web_war.addAsLibrary(servlet_spec_aordering22_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering23_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering23.jar"); | |
| + servlet_spec_aordering23_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener3.class); | |
| + servlet_spec_aordering23_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering23_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering2_web_war.addAsLibrary(servlet_spec_aordering23_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering24_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering24.jar"); | |
| + servlet_spec_aordering24_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener4.class); | |
| + servlet_spec_aordering24_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering24_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering2_web_war.addAsLibrary(servlet_spec_aordering24_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering25_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering25.jar"); | |
| + servlet_spec_aordering25_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener5.class); | |
| + servlet_spec_aordering25_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering25_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering2_web_war.addAsLibrary(servlet_spec_aordering25_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering26_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering26.jar"); | |
| + servlet_spec_aordering26_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener6.class); | |
| + servlet_spec_aordering26_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet2.class); | |
| + servlet_spec_aordering26_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering2_web_war.addAsLibrary(servlet_spec_aordering26_jar); | |
| + | |
| + } | |
| + servlet_spec_aordering2_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener.class); | |
| + servlet_spec_aordering2_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + ear.addAsModule(servlet_spec_aordering2_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering3/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering3/URLClient.java | |
| index 973d291eb..d16a347c4 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering3/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering3/URLClient.java | |
| @@ -25,13 +25,94 @@ import com.sun.ts.tests.servlet.pluggability.common.RequestListener; | |
| import com.sun.ts.tests.servlet.pluggability.common.RequestListener6; | |
| import com.sun.ts.tests.servlet.pluggability.common.TestServlet1; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_aordering3.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_aordering3_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_aordering3_web_war"); | |
| + servlet_spec_aordering3_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering31_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering31.jar"); | |
| + servlet_spec_aordering31_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener1.class); | |
| + servlet_spec_aordering31_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + servlet_spec_aordering31_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering31_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering3_web_war.addAsLibrary(servlet_spec_aordering31_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering32_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering32.jar"); | |
| + servlet_spec_aordering32_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener2.class); | |
| + servlet_spec_aordering32_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering32_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering3_web_war.addAsLibrary(servlet_spec_aordering32_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering33_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering33.jar"); | |
| + servlet_spec_aordering33_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener3.class); | |
| + servlet_spec_aordering33_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering33_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering3_web_war.addAsLibrary(servlet_spec_aordering33_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering34_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering34.jar"); | |
| + servlet_spec_aordering34_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener4.class); | |
| + servlet_spec_aordering34_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering34_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering3_web_war.addAsLibrary(servlet_spec_aordering34_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering35_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering35.jar"); | |
| + servlet_spec_aordering35_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener5.class); | |
| + servlet_spec_aordering35_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering35_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering3_web_war.addAsLibrary(servlet_spec_aordering35_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering36_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering36.jar"); | |
| + servlet_spec_aordering36_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener6.class); | |
| + servlet_spec_aordering36_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet2.class); | |
| + servlet_spec_aordering36_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering3_web_war.addAsLibrary(servlet_spec_aordering36_jar); | |
| + | |
| + } | |
| + servlet_spec_aordering3_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener.class); | |
| + servlet_spec_aordering3_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + ear.addAsModule(servlet_spec_aordering3_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering4/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering4/URLClient.java | |
| index b55d06b2f..b113779a8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering4/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/aordering4/URLClient.java | |
| @@ -27,7 +27,9 @@ import com.sun.ts.tests.servlet.pluggability.common.RequestListener7; | |
| import com.sun.ts.tests.servlet.pluggability.common.TestServlet1; | |
| import com.sun.ts.tests.servlet.pluggability.common.TestServlet3; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -35,6 +37,96 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_aordering4.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_aordering4_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_aordering4_web_war"); | |
| + servlet_spec_aordering4_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering41_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering41.jar"); | |
| + servlet_spec_aordering41_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener1.class); | |
| + servlet_spec_aordering41_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + servlet_spec_aordering41_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering41_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering4_web_war.addAsLibrary(servlet_spec_aordering41_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering42_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering42.jar"); | |
| + servlet_spec_aordering42_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener2.class); | |
| + servlet_spec_aordering42_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering42_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering4_web_war.addAsLibrary(servlet_spec_aordering42_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering43_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering43.jar"); | |
| + servlet_spec_aordering43_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener3.class); | |
| + servlet_spec_aordering43_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering43_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering4_web_war.addAsLibrary(servlet_spec_aordering43_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering44_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering44.jar"); | |
| + servlet_spec_aordering44_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener4.class); | |
| + servlet_spec_aordering44_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering44_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering4_web_war.addAsLibrary(servlet_spec_aordering44_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering45_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering45.jar"); | |
| + servlet_spec_aordering45_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener5.class); | |
| + servlet_spec_aordering45_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering45_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_aordering4_web_war.addAsLibrary(servlet_spec_aordering45_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering46_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering46.jar"); | |
| + servlet_spec_aordering46_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener6.class); | |
| + servlet_spec_aordering46_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet2.class); | |
| + servlet_spec_aordering46_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering4_web_war.addAsLibrary(servlet_spec_aordering46_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_aordering47_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_aordering47.jar"); | |
| + servlet_spec_aordering47_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener7.class); | |
| + servlet_spec_aordering47_jar.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet3.class); | |
| + servlet_spec_aordering47_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_aordering4_web_war.addAsLibrary(servlet_spec_aordering47_jar); | |
| + | |
| + } | |
| + servlet_spec_aordering4_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.RequestListener.class); | |
| + servlet_spec_aordering4_web_war.addClass(com.sun.ts.tests.servlet.pluggability.common.TestServlet1.class); | |
| + ear.addAsModule(servlet_spec_aordering4_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asynccontext/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asynccontext/URLClient.java | |
| index 056cb4f9c..626a9d899 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asynccontext/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asynccontext/URLClient.java | |
| @@ -38,6 +38,44 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_asynccontext_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_asynccontext_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_asynccontext_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_asynccontext.jar"); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListener.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListener1.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListener2.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ACListenerBad.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$1.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$10.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$11.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$12.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$13.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$2.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$3.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$4.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$5.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$6.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$7.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$8.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet$9.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTestServlet.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.AsyncTests.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.RequestWrapper.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asynccontext.ResponseWrapper.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + servlet_plu_asynccontext_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_asynccontext_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_asynccontext_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_asynccontext_web_war.addAsLibrary(servlet_plu_asynccontext_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("AsyncTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asyncevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asyncevent/URLClient.java | |
| index 640661a47..54bbfe61e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asyncevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/asyncevent/URLClient.java | |
| @@ -30,6 +30,23 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_asyncevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_asyncevent_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_asyncevent_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_asyncevent.jar"); | |
| + servlet_plu_asyncevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.asyncevent.AsyncTestServlet.class); | |
| + servlet_plu_asyncevent_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_asyncevent_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_asyncevent_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_asyncevent_web_war.addAsLibrary(servlet_plu_asyncevent_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("AsyncTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dispatchertype/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dispatchertype/URLClient.java | |
| index cb9cdf4c8..433a977dd 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dispatchertype/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dispatchertype/URLClient.java | |
| @@ -33,6 +33,24 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_dispatchertype_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_dispatchertype_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_dispatchertype_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_dispatchertype.jar"); | |
| + servlet_plu_dispatchertype_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dispatchertype.TestServlet.class); | |
| + servlet_plu_dispatchertype_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_dispatchertype_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_dispatchertype_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_dispatchertype_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_dispatchertype_web_war.addAsLibrary(servlet_plu_dispatchertype_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dofilter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dofilter/URLClient.java | |
| index 472f5bb89..56ac14b1b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dofilter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/dofilter/URLClient.java | |
| @@ -38,6 +38,29 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_dofilter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_dofilter_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_dofilter_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_dofilter.jar"); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.CTSResponseWrapper.class); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.ForwardedServlet.class); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.IncludedServlet.class); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.SetHeaderResponseFilter.class); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.TestServlet.class); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.dofilter.WrapResponseFilter.class); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_dofilter_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_dofilter_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_dofilter_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_dofilter_web_war.addAsLibrary(servlet_plu_dofilter_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filter/URLClient.java | |
| index 730fff9ad..a9ebff6d5 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filter/URLClient.java | |
| @@ -36,6 +36,28 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_filter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_filter_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_filter_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_filter.jar"); | |
| + servlet_plu_filter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.DoFilterTestServlet.class); | |
| + servlet_plu_filter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.DoFilter_Filter.class); | |
| + servlet_plu_filter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.InitFilterConfigTestServlet.class); | |
| + servlet_plu_filter_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filter.InitFilter_Filter.class); | |
| + servlet_plu_filter_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_filter_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_filter_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_filter_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_filter_web_war.addAsLibrary(servlet_plu_filter_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterchain/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterchain/URLClient.java | |
| index 217aef14b..e1ffff94d 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterchain/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterchain/URLClient.java | |
| @@ -35,6 +35,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_filterchain_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_filterchain_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_filterchain_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_filterchain.jar"); | |
| + servlet_plu_filterchain_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterchain.FilterChainTestServlet.class); | |
| + servlet_plu_filterchain_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterchain.FilterChain_Filter1.class); | |
| + servlet_plu_filterchain_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterchain.FilterChain_Filter2.class); | |
| + servlet_plu_filterchain_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_filterchain_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_filterchain_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_filterchain_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_filterchain_web_war.addAsLibrary(servlet_plu_filterchain_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterconfig/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterconfig/URLClient.java | |
| index 01bb6a80b..1772dba1e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterconfig/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterconfig/URLClient.java | |
| @@ -44,6 +44,36 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_filterconfig_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_filterconfig_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_filterconfig_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_filterconfig.jar"); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetFilterNameTestServlet.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetFilterName_Filter.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNamesNullTestServlet.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNamesNull_Filter.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNamesTestServlet.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNames_Filter.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNullTestServlet.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamNull_Filter.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParamTestServlet.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetInitParam_Filter.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetServletContextTestServlet.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterconfig.GetServletContext_Filter.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_filterconfig_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_filterconfig_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_filterconfig_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_filterconfig_web_war.addAsLibrary(servlet_plu_filterconfig_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterrequestdispatcher/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterrequestdispatcher/URLClient.java | |
| index 63bbffe5d..71315f6ef 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterrequestdispatcher/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/filterrequestdispatcher/URLClient.java | |
| @@ -44,6 +44,37 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_filterrequestdispatcher_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_filterrequestdispatcher_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_filterrequestdispatcher_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_filterrequestdispatcher.jar"); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.DummyServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ErrorPage.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ForwardTest1Servlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ForwardTestServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.ForwardedServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.IncludeTest1Servlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.IncludeTestServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.IncludedServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.RequestTestServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.TestServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.filterrequestdispatcher.Test_Filter.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_filterrequestdispatcher_jar.addAsManifestResource("dummy.html"); | |
| + servlet_plu_filterrequestdispatcher_jar.addAsManifestResource("dummyJSP.jsp"); | |
| + servlet_plu_filterrequestdispatcher_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_filterrequestdispatcher_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_filterrequestdispatcher_web_war.addAsLibrary(servlet_plu_filterrequestdispatcher_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/genericservlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/genericservlet/URLClient.java | |
| index 52852f4d8..b8bf2aa57 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/genericservlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/genericservlet/URLClient.java | |
| @@ -41,6 +41,33 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_genericservlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_genericservlet_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_genericservlet_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_genericservlet.jar"); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.DestroyTestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.InitServletExceptionTestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.InitTestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.Init_ServletConfigServletExceptionTestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.Init_ServletConfigTestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.ServiceTestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.ServletErrorPage.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.genericservlet.TestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.ServiceTestServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_genericservlet_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_genericservlet_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_genericservlet_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_genericservlet_web_war.addAsLibrary(servlet_plu_genericservlet_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/registration/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/registration/URLClient.java | |
| index 2d58d194d..8340d9e4e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/registration/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/registration/URLClient.java | |
| @@ -44,6 +44,38 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_registration_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_registration_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_registration_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_registration.jar"); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.registration.TestListener.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.registration.TestServlet.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterClass.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterNotFound.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterString.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletClass.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletNotFound.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletString.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadFilter.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadListener.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadServlet.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateFilter.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateServlet.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_registration_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_registration_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_registration_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_registration_web_war.addAsLibrary(servlet_plu_registration_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/requestdispatcher/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/requestdispatcher/URLClient.java | |
| index 10bf7d880..424f6ebcf 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/requestdispatcher/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/requestdispatcher/URLClient.java | |
| @@ -37,6 +37,29 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_requestdispatcher_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_requestdispatcher_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_requestdispatcher_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_requestdispatcher.jar"); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.ForwardedServlet.class); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.ForwardedServlet2.class); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.ForwardedServlet3.class); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.IncludedServlet.class); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.requestdispatcher.TestServlet.class); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_requestdispatcher_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_requestdispatcher_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_requestdispatcher_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_requestdispatcher_web_war.addAsLibrary(servlet_plu_requestdispatcher_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributeevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributeevent/URLClient.java | |
| index 632ce9edb..9ffbc5516 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributeevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributeevent/URLClient.java | |
| @@ -35,6 +35,28 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_scattributeevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_scattributeevent_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_scattributeevent_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_scattributeevent.jar"); | |
| + servlet_plu_scattributeevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributeevent.SCAttributeEventListener.class); | |
| + servlet_plu_scattributeevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributeevent.SCAttributeListener.class); | |
| + servlet_plu_scattributeevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributeevent.TestServlet.class); | |
| + servlet_plu_scattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_scattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_scattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_scattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_scattributeevent_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_scattributeevent_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_scattributeevent_web_war.addAsLibrary(servlet_plu_scattributeevent_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributelistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributelistener/URLClient.java | |
| index 87ba64a20..1e6d4476d 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributelistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scattributelistener/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_scattributelistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_scattributelistener_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_scattributelistener_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_scattributelistener.jar"); | |
| + servlet_plu_scattributelistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener.SCAttributeListener.class); | |
| + servlet_plu_scattributelistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scattributelistener.TestServlet.class); | |
| + servlet_plu_scattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_scattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_scattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_scattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_scattributelistener_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_scattributelistener_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_scattributelistener_web_war.addAsLibrary(servlet_plu_scattributelistener_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scevent/URLClient.java | |
| index eb17d3d3f..f056656c2 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/scevent/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_scevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_scevent_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_scevent_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_scevent.jar"); | |
| + servlet_plu_scevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scevent.SContextEventListener.class); | |
| + servlet_plu_scevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.scevent.TestServlet.class); | |
| + servlet_plu_scevent_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_scevent_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_scevent_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_scevent_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_scevent_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_scevent_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_scevent_web_war.addAsLibrary(servlet_plu_scevent_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sclistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sclistener/URLClient.java | |
| index ff758e249..01cf04fa5 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sclistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sclistener/URLClient.java | |
| @@ -34,6 +34,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_sclistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_sclistener_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_sclistener_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_sclistener.jar"); | |
| + servlet_plu_sclistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener.ContextListener.class); | |
| + servlet_plu_sclistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sclistener.TestServlet.class); | |
| + servlet_plu_sclistener_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_sclistener_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_sclistener_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_sclistener_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_sclistener_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_sclistener_web_war.addAsLibrary(servlet_plu_sclistener_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servlet/URLClient.java | |
| index c95330360..8579c9e63 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servlet/URLClient.java | |
| @@ -39,6 +39,31 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servlet_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servlet_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servlet.jar"); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.CoreServletTest.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoDestroyedTestServlet.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoInit1TestServlet.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoInit2TestServlet.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoServiceTestServlet.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoServletConfigTestServlet.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.DoServletInfoTestServlet.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servlet.PUTestServlet.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servlet_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servlet_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servlet_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servlet_web_war.addAsLibrary(servlet_plu_servlet_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletconfig/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletconfig/URLClient.java | |
| index 6abd2d554..6591d0ed7 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletconfig/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletconfig/URLClient.java | |
| @@ -33,6 +33,25 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletconfig_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletconfig_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletconfig_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletconfig.jar"); | |
| + servlet_plu_servletconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletconfig.TestServlet.class); | |
| + servlet_plu_servletconfig_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletconfig_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletconfig_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletconfig_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletconfig_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletconfig_web_war.addAsLibrary(servlet_plu_servletconfig_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext/URLClient.java | |
| index d80c1945d..da6537b5f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext/URLClient.java | |
| @@ -34,6 +34,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletcontext_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletcontext_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletcontext_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletcontext.jar"); | |
| + servlet_plu_servletcontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext.GetNamedDispatcherTestServlet.class); | |
| + servlet_plu_servletcontext_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext.TestServlet.class); | |
| + servlet_plu_servletcontext_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletcontext_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletcontext_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletcontext_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletcontext_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletcontext_web_war.addAsLibrary(servlet_plu_servletcontext_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext30/URLClient.java | |
| index f38946d1b..470ca9d28 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletcontext30/URLClient.java | |
| @@ -62,6 +62,56 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletcontext30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletcontext30_web_war"); | |
| + servlet_plu_servletcontext30_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletcontext30_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletcontext30.jar"); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterNotFound.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddFilterString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCAttributeListenerClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCAttributeListenerString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCListenerClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSCListenerString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRAttributeListenerClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRAttributeListenerString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRListenerClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddSRListenerString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletNotFound.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.AddServletString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadFilter.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadListener.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.BadServlet.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateFilter.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSCAttributeListener.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSCListener.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSRAttributeListener.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateSRListener.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.CreateServlet.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateFilterClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateFilterString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateServletClass.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.DuplicateServletString.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.FilterTestServlet.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.TestListener.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletcontext30.TestServlet.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletcontext30_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_servletcontext30_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletcontext30_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletcontext30_web_war.addAsLibrary(servlet_plu_servletcontext30_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletexception/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletexception/URLClient.java | |
| index 1d7af2980..9312eda2f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletexception/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletexception/URLClient.java | |
| @@ -33,6 +33,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletexception_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletexception_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletexception_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletexception.jar"); | |
| + servlet_plu_servletexception_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletexception.TestServlet.class); | |
| + servlet_plu_servletexception_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletexception_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletexception_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletexception_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_servletexception_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletexception_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletexception_web_war.addAsLibrary(servlet_plu_servletexception_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletinputstream/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletinputstream/URLClient.java | |
| index efc0df950..46714089c 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletinputstream/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletinputstream/URLClient.java | |
| @@ -34,6 +34,24 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletinputstream_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletinputstream_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletinputstream_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletinputstream.jar"); | |
| + servlet_plu_servletinputstream_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletinputstream.ReadLineTestServlet.class); | |
| + servlet_plu_servletinputstream_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletinputstream_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletinputstream_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletinputstream_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletinputstream_web_war.addAsLibrary(servlet_plu_servletinputstream_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletoutputstream/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletoutputstream/URLClient.java | |
| index 8eddad6d4..e21104bc3 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletoutputstream/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletoutputstream/URLClient.java | |
| @@ -33,6 +33,24 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletoutputstream_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletoutputstream_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletoutputstream_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletoutputstream.jar"); | |
| + servlet_plu_servletoutputstream_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletoutputstream.TestServlet.class); | |
| + servlet_plu_servletoutputstream_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletoutputstream_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletoutputstream_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletoutputstream_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletoutputstream_web_war.addAsLibrary(servlet_plu_servletoutputstream_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest/URLClient.java | |
| index bb6b9319c..d3d27fdad 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest/URLClient.java | |
| @@ -35,6 +35,30 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends RequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletrequest_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletrequest_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletrequest_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletrequest.jar"); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.GetParameterNamesEmptyEnumTestServlet.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.GetReaderUnsupportedEncodingExceptionTestServlet.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.SetCharacterEncodingTest.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletrequest_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletrequest_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletrequest_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletrequest_web_war.addAsLibrary(servlet_plu_servletrequest_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest1/URLClient.java | |
| index 665bcae57..23199d82e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest1/URLClient.java | |
| @@ -31,6 +31,25 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends RequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletrequest1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletrequest1_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletrequest1_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletrequest1.jar"); | |
| + servlet_plu_servletrequest1_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_plu_servletrequest1_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_plu_servletrequest1_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletrequest1_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletrequest1_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletrequest1_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletrequest1_web_war.addAsLibrary(servlet_plu_servletrequest1_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest30/URLClient.java | |
| index ca462e009..535be7ab2 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequest30/URLClient.java | |
| @@ -36,6 +36,29 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletrequest30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletrequest30_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletrequest30_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletrequest30.jar"); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTestServlet.class); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTests.class); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.SecondServlet.class); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.TestServlet.class); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.common.client.AbstractUrlClient.class); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletrequest30_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletrequest30_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletrequest30_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletrequest30_web_war.addAsLibrary(servlet_plu_servletrequest30_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper/URLClient.java | |
| index 3b2e6fc13..866f5ac83 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper/URLClient.java | |
| @@ -36,6 +36,30 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends RequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletrequestwrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletrequestwrapper_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletrequestwrapper_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletrequestwrapper.jar"); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingTest.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingTestWrapper.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTestWrapper.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper.TestServlet.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTestServlet.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletrequestwrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletrequestwrapper_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletrequestwrapper_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletrequestwrapper_web_war.addAsLibrary(servlet_plu_servletrequestwrapper_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30/URLClient.java | |
| index cb0f09c6b..2114f4fb8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30/URLClient.java | |
| @@ -39,6 +39,32 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletrequestwrapper30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletrequestwrapper30_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletrequestwrapper30_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletrequestwrapper30.jar"); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30.AsyncTestServletWrapper.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30.ErrorServletWrapper.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30.TestServletWrapper.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTestServlet.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.AsyncTests.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.SecondServlet.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequest30.TestServlet.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletrequestwrapper30_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletrequestwrapper30_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletrequestwrapper30_web_war.addAsLibrary(servlet_plu_servletrequestwrapper30_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java | |
| index 662d67bb6..4ac1756a5 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletrequestwrapper30x/URLClient.java | |
| @@ -34,6 +34,24 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletrequestwrapper30x_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletrequestwrapper30x_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletrequestwrapper30x_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletrequestwrapper30x.jar"); | |
| + servlet_plu_servletrequestwrapper30x_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30x.IsWrapperForTest.class); | |
| + servlet_plu_servletrequestwrapper30x_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30x.TCKServletRequestWrapper.class); | |
| + servlet_plu_servletrequestwrapper30x_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletrequestwrapper30x.TCKServletRequestsubWrapper.class); | |
| + servlet_plu_servletrequestwrapper30x_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletrequestwrapper30x_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletrequestwrapper30x_web_war.addAsLibrary(servlet_plu_servletrequestwrapper30x_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponse/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponse/URLClient.java | |
| index 9bde995c2..189f99f6c 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponse/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponse/URLClient.java | |
| @@ -33,6 +33,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends ResponseClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletresponse_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletresponse_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletresponse_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletresponse.jar"); | |
| + servlet_plu_servletresponse_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponse.SetCharacterEncodingTestServlet.class); | |
| + servlet_plu_servletresponse_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTestServlet.class); | |
| + servlet_plu_servletresponse_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_plu_servletresponse_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericCheckTestResultServlet.class); | |
| + servlet_plu_servletresponse_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletresponse_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletresponse_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletresponse_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletresponse_web_war.addAsLibrary(servlet_plu_servletresponse_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper/URLClient.java | |
| index 5ba4a435c..4d3b8cab9 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletresponsewrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletresponsewrapper_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletresponsewrapper_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletresponsewrapper.jar"); | |
| + servlet_plu_servletresponsewrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper.SetCharacterEncodingTestServlet.class); | |
| + servlet_plu_servletresponsewrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper.TestServlet.class); | |
| + servlet_plu_servletresponsewrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTestServlet.class); | |
| + servlet_plu_servletresponsewrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_plu_servletresponsewrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_servletresponsewrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_servletresponsewrapper_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletresponsewrapper_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletresponsewrapper_web_war.addAsLibrary(servlet_plu_servletresponsewrapper_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper30/URLClient.java | |
| index 23541ef42..77f82840f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/servletresponsewrapper30/URLClient.java | |
| @@ -34,6 +34,24 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_servletresponsewrapper30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_servletresponsewrapper30_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_servletresponsewrapper30_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_servletresponsewrapper30.jar"); | |
| + servlet_plu_servletresponsewrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper30.IsWrapperForTest.class); | |
| + servlet_plu_servletresponsewrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper30.TCKServletResponseWrapper.class); | |
| + servlet_plu_servletresponsewrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.servletresponsewrapper30.TCKServletResponsesubWrapper.class); | |
| + servlet_plu_servletresponsewrapper30_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_servletresponsewrapper30_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_servletresponsewrapper30_web_war.addAsLibrary(servlet_plu_servletresponsewrapper30_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sessiontrackingmode/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sessiontrackingmode/URLClient.java | |
| index 2cf34e60b..fb55c7e5c 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sessiontrackingmode/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/sessiontrackingmode/URLClient.java | |
| @@ -34,6 +34,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_sessiontrackingmode_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_sessiontrackingmode_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_sessiontrackingmode_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_sessiontrackingmode.jar"); | |
| + servlet_plu_sessiontrackingmode_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode.TestListener.class); | |
| + servlet_plu_sessiontrackingmode_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.sessiontrackingmode.TestServlet.class); | |
| + servlet_plu_sessiontrackingmode_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_sessiontrackingmode_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_sessiontrackingmode_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_sessiontrackingmode_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_sessiontrackingmode_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_sessiontrackingmode_web_war.addAsLibrary(servlet_plu_sessiontrackingmode_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributeevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributeevent/URLClient.java | |
| index d9a01f11c..4b8536261 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributeevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributeevent/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_srattributeevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_srattributeevent_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_srattributeevent_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_srattributeevent.jar"); | |
| + servlet_plu_srattributeevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributeevent.SRAttributeListener.class); | |
| + servlet_plu_srattributeevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributeevent.TestServlet.class); | |
| + servlet_plu_srattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_srattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_srattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_srattributeevent_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_srattributeevent_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_srattributeevent_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_srattributeevent_web_war.addAsLibrary(servlet_plu_srattributeevent_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributelistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributelistener/URLClient.java | |
| index 3bd5c25ea..4436ee8c8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributelistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srattributelistener/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_srattributelistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_srattributelistener_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_srattributelistener_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_srattributelistener.jar"); | |
| + servlet_plu_srattributelistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener.SRAttributeListener.class); | |
| + servlet_plu_srattributelistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srattributelistener.TestServlet.class); | |
| + servlet_plu_srattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_srattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_srattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_srattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_srattributelistener_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_srattributelistener_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_srattributelistener_web_war.addAsLibrary(servlet_plu_srattributelistener_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srevent/URLClient.java | |
| index 52d26fe52..77dac16e8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srevent/URLClient.java | |
| @@ -33,6 +33,25 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_srevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_srevent_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_srevent_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_srevent.jar"); | |
| + servlet_plu_srevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srevent.TestServlet.class); | |
| + servlet_plu_srevent_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_srevent_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_srevent_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_srevent_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_srevent_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_srevent_web_war.addAsLibrary(servlet_plu_srevent_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srlistener/URLClient.java | |
| index d8ac3db17..97173ef8e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/srlistener/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_srlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_srlistener_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_srlistener_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_srlistener.jar"); | |
| + servlet_plu_srlistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener.SRListener.class); | |
| + servlet_plu_srlistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.srlistener.TestServlet.class); | |
| + servlet_plu_srlistener_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_srlistener_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_srlistener_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_srlistener_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_plu_srlistener_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_srlistener_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_srlistener_web_war.addAsLibrary(servlet_plu_srlistener_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/unavailableexception/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/unavailableexception/URLClient.java | |
| index b16704cf0..16ac9647e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/unavailableexception/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet/unavailableexception/URLClient.java | |
| @@ -34,6 +34,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_plu_unavailableexception_web_war = ShrinkWrap.create(WebArchive.class, "servlet_plu_unavailableexception_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_plu_unavailableexception_jar = ShrinkWrap.create(JavaArchive.class, "servlet_plu_unavailableexception.jar"); | |
| + servlet_plu_unavailableexception_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.unavailableexception.TestServlet.class); | |
| + servlet_plu_unavailableexception_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet.unavailableexception.UnavailableServlet.class); | |
| + servlet_plu_unavailableexception_jar.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_plu_unavailableexception_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_plu_unavailableexception_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_plu_unavailableexception_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_plu_unavailableexception_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_plu_unavailableexception_web_war.addAsLibrary(servlet_plu_unavailableexception_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/cookie/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/cookie/URLClient.java | |
| index d551401ea..ad3dc611d 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/cookie/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/cookie/URLClient.java | |
| @@ -47,6 +47,25 @@ import java.util.TimeZone; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_cookie_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_cookie_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_cookie_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_cookie.jar"); | |
| + servlet_pluh_cookie_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.cookie.TestServlet.class); | |
| + servlet_pluh_cookie_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_cookie_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_cookie_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_cookie_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_cookie_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_cookie_web_war.addAsLibrary(servlet_pluh_cookie_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservlet/URLClient.java | |
| index 332efb161..3154445fd 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservlet/URLClient.java | |
| @@ -37,6 +37,29 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpservlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpservlet_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpservlet_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpservlet.jar"); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.DestroyTestServlet.class); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.InitTestServlet.class); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.Init_ServletConfigTestServlet.class); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.ServiceTestServlet.class); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservlet.TestServlet.class); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpservlet_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpservlet_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpservlet_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpservlet_web_war.addAsLibrary(servlet_pluh_httpservlet_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest/URLClient.java | |
| index 9f8d69eb7..a60934042 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest/URLClient.java | |
| @@ -39,6 +39,34 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpservletrequest_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpservletrequest_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpservletrequest_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpservletrequest.jar"); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetParameterNamesEmptyEnumTestServlet.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetQueryStringNullTestServlet.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetReaderUnsupportedEncodingExceptionTestServlet.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.GetServletPathEmptyStringTestServlet.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.SetCharacterEncodingTest.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.doHeadTest.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest.getServletContextTest.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.common.request.HttpRequestTestServlet.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpservletrequest_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpservletrequest_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpservletrequest_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpservletrequest_web_war.addAsLibrary(servlet_pluh_httpservletrequest_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest30/URLClient.java | |
| index 2386b6785..5f8292f07 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequest30/URLClient.java | |
| @@ -33,6 +33,24 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpservletrequest30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpservletrequest30_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpservletrequest30_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpservletrequest30.jar"); | |
| + servlet_pluh_httpservletrequest30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequest30.LoginTestServlet.class); | |
| + servlet_pluh_httpservletrequest30_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpservletrequest30_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpservletrequest30_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpservletrequest30_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpservletrequest30_web_war.addAsLibrary(servlet_pluh_httpservletrequest30_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("LoginTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java | |
| index db4d198f6..3c4c5a10a 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletrequestwrapper/URLClient.java | |
| @@ -37,6 +37,31 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpRequestClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_HSReqWrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_HSReqWrapper_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_HSReqWrapper_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_HSReqWrapper.jar"); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingTest.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingTestWrapper.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTest.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.SetCharacterEncodingUnsupportedEncodingExceptionTestWrapper.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.TCKHttpSessionIDListener.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletrequestwrapper.TestServlet.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.request.HttpRequestTestServlet.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.request.RequestTests.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_HSReqWrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_HSReqWrapper_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_HSReqWrapper_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_HSReqWrapper_web_war.addAsLibrary(servlet_pluh_HSReqWrapper_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse/URLClient.java | |
| index dd1fbcdac..f2347bd6b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse/URLClient.java | |
| @@ -35,6 +35,30 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpservletresponse_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpservletresponse_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpservletresponse_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpservletresponse.jar"); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.GetContentTypeNullTestServlet.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.RedirectedTestServlet.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.ServletErrorPage.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponse.SetCharacterEncodingTestServlet.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpCheckTestResultServlet.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpservletresponse_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpservletresponse_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpservletresponse_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpservletresponse_web_war.addAsLibrary(servlet_pluh_httpservletresponse_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse30/URLClient.java | |
| index 02ac1cc68..c3ba70aae 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponse30/URLClient.java | |
| @@ -31,6 +31,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpservletresponse30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpservletresponse30_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpservletresponse30_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpservletresponse30.jar"); | |
| + servlet_pluh_httpservletresponse30_jar.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_pluh_httpservletresponse30_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_pluh_httpservletresponse30_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpCheckTestResultServlet.class); | |
| + servlet_pluh_httpservletresponse30_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpservletresponse30_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpservletresponse30_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpservletresponse30_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpservletresponse30_web_war.addAsLibrary(servlet_pluh_httpservletresponse30_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java | |
| index a05ac095c..b7b57fee2 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper/URLClient.java | |
| @@ -34,6 +34,28 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_HSRespWrapper_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_HSRespWrapper_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_HSRespWrapper_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_HSRespWrapper.jar"); | |
| + servlet_pluh_HSRespWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper.RedirectedTestServlet.class); | |
| + servlet_pluh_HSRespWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper.SetCharacterEncodingTestServlet.class); | |
| + servlet_pluh_HSRespWrapper_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper.TestServlet.class); | |
| + servlet_pluh_HSRespWrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_pluh_HSRespWrapper_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_pluh_HSRespWrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_HSRespWrapper_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_HSRespWrapper_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_HSRespWrapper_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_HSRespWrapper_web_war.addAsLibrary(servlet_pluh_HSRespWrapper_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java | |
| index 41295aa38..730009be2 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpservletresponsewrapper30/URLClient.java | |
| @@ -33,6 +33,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends HttpResponseClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_HSRespWrapper30_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_HSRespWrapper30_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_HSRespWrapper30_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_HSRespWrapper30.jar"); | |
| + servlet_pluh_HSRespWrapper30_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpservletresponsewrapper30.TestServlet.class); | |
| + servlet_pluh_HSRespWrapper30_jar.addClass(com.sun.ts.tests.servlet.api.common.response.HttpResponseTestServlet.class); | |
| + servlet_pluh_HSRespWrapper30_jar.addClass(com.sun.ts.tests.servlet.api.common.response.ResponseTests.class); | |
| + servlet_pluh_HSRespWrapper30_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_HSRespWrapper30_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_HSRespWrapper30_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_HSRespWrapper30_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_HSRespWrapper30_web_war.addAsLibrary(servlet_pluh_HSRespWrapper30_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsession/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsession/URLClient.java | |
| index 166c0f1bd..fd76463e0 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsession/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsession/URLClient.java | |
| @@ -35,6 +35,28 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpsession_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpsession_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpsession_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpsession.jar"); | |
| + servlet_pluh_httpsession_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsession.ExpireHttpSession.class); | |
| + servlet_pluh_httpsession_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsession.GetLastAccessedTime.class); | |
| + servlet_pluh_httpsession_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsession.TestServlet.class); | |
| + servlet_pluh_httpsession_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpsession_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpsession_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpsession_jar.addAsManifestResource("index.html"); | |
| + servlet_pluh_httpsession_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpsession_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpsession_web_war.addAsLibrary(servlet_pluh_httpsession_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java | |
| index f438cf0f2..8a9517703 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionattributelistener/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpsessionattributelistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpsessionattributelistener_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpsessionattributelistener_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpsessionattributelistener.jar"); | |
| + servlet_pluh_httpsessionattributelistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributelistener.HSAttributeListener.class); | |
| + servlet_pluh_httpsessionattributelistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionattributelistener.TestServlet.class); | |
| + servlet_pluh_httpsessionattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpsessionattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpsessionattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpsessionattributelistener_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_pluh_httpsessionattributelistener_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpsessionattributelistener_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpsessionattributelistener_web_war.addAsLibrary(servlet_pluh_httpsessionattributelistener_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java | |
| index 698a5001e..72be93eca 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindingevent/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpsessionbindingevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpsessionbindingevent_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpsessionbindingevent_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpsessionbindingevent.jar"); | |
| + servlet_pluh_httpsessionbindingevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindingevent.HSBindingEvent.class); | |
| + servlet_pluh_httpsessionbindingevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindingevent.TestServlet.class); | |
| + servlet_pluh_httpsessionbindingevent_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpsessionbindingevent_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpsessionbindingevent_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpsessionbindingevent_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_pluh_httpsessionbindingevent_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpsessionbindingevent_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpsessionbindingevent_web_war.addAsLibrary(servlet_pluh_httpsessionbindingevent_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java | |
| index f542fd6fd..2c9e33ad6 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionbindinglistener/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpsessionbindinglistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpsessionbindinglistener_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpsessionbindinglistener_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpsessionbindinglistener.jar"); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglistener.HSBindingListener.class); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionbindinglistener.TestServlet.class); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpsessionbindinglistener_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpsessionbindinglistener_web_war.addAsLibrary(servlet_pluh_httpsessionbindinglistener_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionevent/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionevent/URLClient.java | |
| index 2c20d9a54..79f43a929 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionevent/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionevent/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpsessionevent_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpsessionevent_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpsessionevent_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpsessionevent.jar"); | |
| + servlet_pluh_httpsessionevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionevent.HSEvent.class); | |
| + servlet_pluh_httpsessionevent_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionevent.TestServlet.class); | |
| + servlet_pluh_httpsessionevent_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpsessionevent_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpsessionevent_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpsessionevent_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_pluh_httpsessionevent_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpsessionevent_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpsessionevent_web_war.addAsLibrary(servlet_pluh_httpsessionevent_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionlistener/URLClient.java | |
| index f9b481430..530ece61e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/httpsessionlistener/URLClient.java | |
| @@ -34,6 +34,27 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_httpsessionlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_httpsessionlistener_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_httpsessionlistener_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_httpsessionlistener.jar"); | |
| + servlet_pluh_httpsessionlistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener.HSListener.class); | |
| + servlet_pluh_httpsessionlistener_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionlistener.TestServlet.class); | |
| + servlet_pluh_httpsessionlistener_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_httpsessionlistener_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_httpsessionlistener_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_httpsessionlistener_jar.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + servlet_pluh_httpsessionlistener_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_httpsessionlistener_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_httpsessionlistener_web_war.addAsLibrary(servlet_pluh_httpsessionlistener_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java | |
| index 09c3f37fe..9b4ef0874 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/api/jakarta_servlet_http/sessioncookieconfig/URLClient.java | |
| @@ -34,6 +34,26 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_pluh_sessioncookieconfig_web_war = ShrinkWrap.create(WebArchive.class, "servlet_pluh_sessioncookieconfig_web_war"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_pluh_sessioncookieconfig_jar = ShrinkWrap.create(JavaArchive.class, "servlet_pluh_sessioncookieconfig.jar"); | |
| + servlet_pluh_sessioncookieconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.sessioncookieconfig.TestListener.class); | |
| + servlet_pluh_sessioncookieconfig_jar.addClass(com.sun.ts.tests.servlet.api.jakarta_servlet_http.sessioncookieconfig.TestServlet.class); | |
| + servlet_pluh_sessioncookieconfig_jar.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_pluh_sessioncookieconfig_jar.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_pluh_sessioncookieconfig_jar.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_pluh_sessioncookieconfig_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_pluh_sessioncookieconfig_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_pluh_sessioncookieconfig_web_war.addAsLibrary(servlet_pluh_sessioncookieconfig_jar); | |
| + | |
| + } | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/fragment/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/fragment/URLClient.java | |
| index a0ee6c677..54b3c32c4 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/fragment/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/pluggability/fragment/URLClient.java | |
| @@ -29,6 +29,59 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_spec_fragment_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_fragment_web_war"); | |
| + servlet_spec_fragment_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_fragment_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_fragment.jar"); | |
| + servlet_spec_fragment_jar.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestServlet2.class); | |
| + servlet_spec_fragment_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_fragment_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_fragment_web_war.addAsLibrary(servlet_spec_fragment_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_fragment1_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_fragment1.jar"); | |
| + servlet_spec_fragment1_jar.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestFilter1.class); | |
| + servlet_spec_fragment1_jar.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestServlet3.class); | |
| + servlet_spec_fragment1_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_fragment1_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_fragment_web_war.addAsLibrary(servlet_spec_fragment1_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_fragment2_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_fragment2.jar"); | |
| + servlet_spec_fragment2_jar.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestFilter2.class); | |
| + servlet_spec_fragment2_jar.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestServlet4.class); | |
| + servlet_spec_fragment2_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_fragment2_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_fragment_web_war.addAsLibrary(servlet_spec_fragment2_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_fragment3_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_fragment3.jar"); | |
| + servlet_spec_fragment3_jar.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestFilter3.class); | |
| + servlet_spec_fragment3_jar.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestServlet5.class); | |
| + servlet_spec_fragment3_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_fragment3_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_fragment_web_war.addAsLibrary(servlet_spec_fragment3_jar); | |
| + | |
| + } | |
| + servlet_spec_fragment_web_war.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestFilter.class); | |
| + servlet_spec_fragment_web_war.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestServlet1.class); | |
| + servlet_spec_fragment_web_war.addClass(com.sun.ts.tests.servlet.pluggability.fragment.TestServlet2.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setContextRoot("/servlet_spec_fragment_web"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webfilter/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webfilter/URLClient.java | |
| index b4e99e466..8f5d0a623 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webfilter/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webfilter/URLClient.java | |
| @@ -22,13 +22,39 @@ package com.sun.ts.tests.servlet.spec.annotationservlet.webfilter; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_annotationservlet_webfilter.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_annotationservlet_webfilter_web_war = ShrinkWrap.create(WebArchive.class, "servlet_annotationservlet_webfilter_web_war"); | |
| + servlet_annotationservlet_webfilter_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webfilter.Servlet1.class); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webfilter.TestFilter1.class); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webfilter.TestFilter2.class); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webfilter.TestServlet.class); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_annotationservlet_webfilter_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_annotationservlet_webfilter_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/weblistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/weblistener/URLClient.java | |
| index 542a9eb0d..7d9392317 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/weblistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/weblistener/URLClient.java | |
| @@ -22,13 +22,41 @@ package com.sun.ts.tests.servlet.spec.annotationservlet.weblistener; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_annotationservlet_weblistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_annotationservlet_weblistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_annotationservlet_weblistener_web_war"); | |
| + servlet_annotationservlet_weblistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.ContextListener.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.HSAttributeListener.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.HSListener.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.HttpTestServlet.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.SCAttributeListener.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.SRAttributeListener.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.SRListener.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.weblistener.TestServlet.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_annotationservlet_weblistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + ear.addAsModule(servlet_annotationservlet_weblistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservlet/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservlet/URLClient.java | |
| index f8215a017..e893a0720 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservlet/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservlet/URLClient.java | |
| @@ -21,13 +21,35 @@ package com.sun.ts.tests.servlet.spec.annotationservlet.webservlet; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_annotationservlet_webservlet.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_annotationservlet_webservlet_web_war = ShrinkWrap.create(WebArchive.class, "servlet_annotationservlet_webservlet_web_war"); | |
| + servlet_annotationservlet_webservlet_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet1.class); | |
| + servlet_annotationservlet_webservlet_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet2.class); | |
| + servlet_annotationservlet_webservlet_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet3.class); | |
| + servlet_annotationservlet_webservlet_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet4.class); | |
| + servlet_annotationservlet_webservlet_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet5.class); | |
| + ear.addAsModule(servlet_annotationservlet_webservlet_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletapi/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletapi/URLClient.java | |
| index feb09bd55..207b606a1 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletapi/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletapi/URLClient.java | |
| @@ -26,13 +26,36 @@ import com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet3; | |
| import com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet4; | |
| import com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet5; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_annotationservlet_webservletapi.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_annotationservlet_webservletapi_web_war = ShrinkWrap.create(WebArchive.class, "servlet_annotationservlet_webservletapi_web_war"); | |
| + servlet_annotationservlet_webservletapi_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservletapi.TestListener.class); | |
| + servlet_annotationservlet_webservletapi_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet1.class); | |
| + servlet_annotationservlet_webservletapi_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet2.class); | |
| + servlet_annotationservlet_webservletapi_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet3.class); | |
| + servlet_annotationservlet_webservletapi_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet4.class); | |
| + servlet_annotationservlet_webservletapi_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet5.class); | |
| + ear.addAsModule(servlet_annotationservlet_webservletapi_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletdd/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletdd/URLClient.java | |
| index fb12d15c1..a28a00875 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletdd/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/annotationservlet/webservletdd/URLClient.java | |
| @@ -33,6 +33,18 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_annotationservlet_webservletdd_web_war = ShrinkWrap.create(WebArchive.class, "servlet_annotationservlet_webservletdd_web_war"); | |
| + servlet_annotationservlet_webservletdd_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_annotationservlet_webservletdd_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet1.class); | |
| + servlet_annotationservlet_webservletdd_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet2.class); | |
| + servlet_annotationservlet_webservletdd_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet3.class); | |
| + servlet_annotationservlet_webservletdd_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet4.class); | |
| + servlet_annotationservlet_webservletdd_web_war.addClass(com.sun.ts.tests.servlet.spec.annotationservlet.webservlet.Servlet5.class); | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/async/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/async/URLClient.java | |
| index 7ee3143f9..6349b9d6e 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/async/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/async/URLClient.java | |
| @@ -22,12 +22,52 @@ package com.sun.ts.tests.servlet.spec.async; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_async.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_async_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_async_web_war"); | |
| + servlet_spec_async_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Filter10.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Filter4.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Filter5.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Filter6.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Filter7.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Filter8.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Filter9.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet1.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet10.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet2.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet3.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet4.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet5.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet6.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet7.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet8.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.Servlet9.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.TestServlet$1.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.spec.async.TestServlet.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_async_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_spec_async_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultcontextpath/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultcontextpath/URLClient.java | |
| index d223f2737..836573bae 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultcontextpath/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultcontextpath/URLClient.java | |
| @@ -19,13 +19,36 @@ package com.sun.ts.tests.servlet.spec.defaultcontextpath; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_defaultcontextpath.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_defaultcontextpath_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_defaultcontextpath_web_war"); | |
| + servlet_spec_defaultcontextpath_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_defaultcontextpath_web_war.addClass(com.sun.ts.tests.servlet.spec.defaultcontextpath.TestServlet.class); | |
| + servlet_spec_defaultcontextpath_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_spec_defaultcontextpath_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_defaultcontextpath_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_spec_defaultcontextpath_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_spec_defaultcontextpath_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultmapping/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultmapping/URLClient.java | |
| index 5be4f1256..a6a519628 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultmapping/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/defaultmapping/URLClient.java | |
| @@ -23,12 +23,36 @@ package com.sun.ts.tests.servlet.spec.defaultmapping; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_defaultmapping.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_defaultmapping_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_defaultmapping_web_war"); | |
| + servlet_spec_defaultmapping_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_defaultmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.defaultmapping.TestServlet6.class); | |
| + servlet_spec_defaultmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet1.class); | |
| + servlet_spec_defaultmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet2.class); | |
| + servlet_spec_defaultmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet3.class); | |
| + servlet_spec_defaultmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet4.class); | |
| + servlet_spec_defaultmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet5.class); | |
| + ear.addAsModule(servlet_spec_defaultmapping_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/dir_struct/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/dir_struct/URLClient.java | |
| index d6054eb0d..3d5d6327c 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/dir_struct/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/dir_struct/URLClient.java | |
| @@ -22,13 +22,33 @@ package com.sun.ts.tests.servlet.spec.dir_struct; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_dirstruct.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_dirstruct_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_dirstruct_web_war"); | |
| + servlet_spec_dirstruct_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_dirstruct_web_war.addClass(com.sun.ts.tests.servlet.spec.dir_struct.ClassFileTestServlet.class); | |
| + servlet_spec_dirstruct_web_war.addClass(com.sun.ts.tests.servlet.spec.dir_struct.JarFileTestServlet.class); | |
| + ear.addAsModule(servlet_spec_dirstruct_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage/URLClient.java | |
| index 133179449..7ae5274fa 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage/URLClient.java | |
| @@ -24,13 +24,39 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.Data; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_errorpage.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_errorpage_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_errorpage_web_war"); | |
| + servlet_spec_errorpage_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_errorpage_web_war.addAsWebResource("HTMLErrorPage.html"); | |
| + servlet_spec_errorpage_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.SecondServletErrorPage.class); | |
| + servlet_spec_errorpage_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.ServletErrorPage.class); | |
| + servlet_spec_errorpage_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.TestException.class); | |
| + servlet_spec_errorpage_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.TestServlet.class); | |
| + servlet_spec_errorpage_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.WrappedException.class); | |
| + servlet_spec_errorpage_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_spec_errorpage_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + ear.addAsModule(servlet_spec_errorpage_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage1/URLClient.java | |
| index b5b65b305..42234fe76 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/errorpage1/URLClient.java | |
| @@ -27,13 +27,40 @@ import com.sun.ts.tests.servlet.spec.errorpage.ServletErrorPage; | |
| import com.sun.ts.tests.servlet.spec.errorpage.SecondServletErrorPage; | |
| import com.sun.ts.tests.servlet.spec.errorpage.TestException; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_errorpage1.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_errorpage1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_errorpage1_web_war"); | |
| + servlet_spec_errorpage1_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage1.TestServlet.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage1.TestServletException.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.SecondServletErrorPage.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.ServletErrorPage.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.TestException.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.TestServlet.class); | |
| + servlet_spec_errorpage1_web_war.addClass(com.sun.ts.tests.servlet.spec.errorpage.WrappedException.class); | |
| + ear.addAsModule(servlet_spec_errorpage1_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/httpservletresponse/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/httpservletresponse/URLClient.java | |
| index 081887ba0..d3810291d 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/httpservletresponse/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/httpservletresponse/URLClient.java | |
| @@ -23,13 +23,36 @@ package com.sun.ts.tests.servlet.spec.httpservletresponse; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_httpservletresponse.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_httpservletresponse_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_httpservletresponse_web_war"); | |
| + servlet_spec_httpservletresponse_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.spec.httpservletresponse.HttpTestServlet.class); | |
| + servlet_spec_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.spec.httpservletresponse.RedirectedTestServlet.class); | |
| + servlet_spec_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_spec_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_httpservletresponse_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_spec_httpservletresponse_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("HttpTestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/i18n/encoding/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/i18n/encoding/URLClient.java | |
| index fd8c9f79b..6c6b001f8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/i18n/encoding/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/i18n/encoding/URLClient.java | |
| @@ -23,13 +23,35 @@ package com.sun.ts.tests.servlet.spec.i18n.encoding; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_i18n_encoding.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_i18n_encoding_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_i18n_encoding_web_war"); | |
| + servlet_spec_i18n_encoding_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_i18n_encoding_web_war.addClass(com.sun.ts.tests.servlet.spec.i18n.encoding.TestServlet.class); | |
| + servlet_spec_i18n_encoding_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_spec_i18n_encoding_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_i18n_encoding_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_spec_i18n_encoding_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/listenerorder/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/listenerorder/URLClient.java | |
| index 2661af9cc..559951ca6 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/listenerorder/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/listenerorder/URLClient.java | |
| @@ -21,13 +21,36 @@ package com.sun.ts.tests.servlet.spec.listenerorder; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_listenerorder.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_listenerorder_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_listenerorder_web_war"); | |
| + servlet_spec_listenerorder_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_listenerorder_web_war.addClass(com.sun.ts.tests.servlet.spec.listenerorder.ServletRequestListener1.class); | |
| + servlet_spec_listenerorder_web_war.addClass(com.sun.ts.tests.servlet.spec.listenerorder.ServletRequestListener2.class); | |
| + servlet_spec_listenerorder_web_war.addClass(com.sun.ts.tests.servlet.spec.listenerorder.ServletRequestListener3.class); | |
| + servlet_spec_listenerorder_web_war.addClass(com.sun.ts.tests.servlet.spec.listenerorder.TestServlet.class); | |
| + ear.addAsModule(servlet_spec_listenerorder_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/multifiltermapping/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/multifiltermapping/URLClient.java | |
| index f4dea56a1..26e117c5d 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/multifiltermapping/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/multifiltermapping/URLClient.java | |
| @@ -28,13 +28,48 @@ import com.sun.ts.tests.servlet.spec.requestmap.TestServlet3; | |
| import com.sun.ts.tests.servlet.spec.requestmap.TestServlet4; | |
| import com.sun.ts.tests.servlet.spec.requestmap.TestServlet5; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_multifiltermapping.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_multifiltermapping_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_multifiltermapping_web_war"); | |
| + servlet_spec_multifiltermapping_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_multifiltermapping_web_war.addAsWebResource("dummy.html"); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.ErrorPage.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.TestServlet.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.TestServlet6.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.TestServlet7.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.Test_ErrorFilter.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.Test_ForwardFilter.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.Test_IncludeFilter.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.multifiltermapping.Test_RequestFilter.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet1.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet2.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet3.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet4.class); | |
| + servlet_spec_multifiltermapping_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet5.class); | |
| + ear.addAsModule(servlet_spec_multifiltermapping_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/pluggability/ordering/test1/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/pluggability/ordering/test1/URLClient.java | |
| index b505e22ee..3cf6302d2 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/pluggability/ordering/test1/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/pluggability/ordering/test1/URLClient.java | |
| @@ -30,6 +30,46 @@ import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static WebArchive getTestArchive() throws Exception { | |
| + | |
| + WebArchive servlet_spec_ordering1_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_ordering1_web_war"); | |
| + servlet_spec_ordering1_web_war.addAsWebInfResource("web.xml"); | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_ordering11_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_ordering11.jar"); | |
| + servlet_spec_ordering11_jar.addClass(com.sun.ts.tests.servlet.spec.pluggability.common.RequestListener.class); | |
| + servlet_spec_ordering11_jar.addClass(com.sun.ts.tests.servlet.spec.pluggability.common.TestServlet4.class); | |
| + servlet_spec_ordering11_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_ordering11_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_ordering1_web_war.addAsLibrary(servlet_spec_ordering11_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_ordering12_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_ordering12.jar"); | |
| + servlet_spec_ordering12_jar.addClass(com.sun.ts.tests.servlet.spec.pluggability.common.TestServlet4.class); | |
| + servlet_spec_ordering12_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_ordering12_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_ordering1_web_war.addAsLibrary(servlet_spec_ordering12_jar); | |
| + | |
| + } | |
| + | |
| + { | |
| + | |
| + JavaArchive servlet_spec_ordering13_jar = ShrinkWrap.create(JavaArchive.class, "servlet_spec_ordering13.jar"); | |
| + servlet_spec_ordering13_jar.addClass(com.sun.ts.tests.servlet.spec.pluggability.common.TestServlet4.class); | |
| + servlet_spec_ordering13_jar.addAsManifestResource("META-INF/MANIFEST.MF"); | |
| + servlet_spec_ordering13_jar.addAsManifestResource("META-INF/web-fragment.xml"); | |
| + servlet_spec_ordering1_web_war.addAsLibrary(servlet_spec_ordering13_jar); | |
| + | |
| + } | |
| + servlet_spec_ordering1_web_war.addClass(com.sun.ts.tests.servlet.spec.pluggability.common.RequestListener.class); | |
| + servlet_spec_ordering1_web_war.addClass(com.sun.ts.tests.servlet.spec.pluggability.common.TestServlet4.class); | |
| + } | |
| + | |
| public static JavaArchive getFragment1() { | |
| return ShrinkWrap.create(JavaArchive.class, "fragment-1.jar") | |
| .addClasses(RequestListener.class, TestServlet4.class) | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/protocols/http/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/protocols/http/URLClient.java | |
| index 96a60b0ea..feba01015 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/protocols/http/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/protocols/http/URLClient.java | |
| @@ -24,13 +24,35 @@ import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import com.sun.ts.tests.servlet.common.util.Data; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_protocols_http.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_protocols_http_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_protocols_http_web_war"); | |
| + servlet_spec_protocols_http_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_protocols_http_web_war.addClass(com.sun.ts.tests.servlet.spec.protocols.http.TestServlet.class); | |
| + servlet_spec_protocols_http_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_spec_protocols_http_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_protocols_http_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_spec_protocols_http_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/rdspecialchar/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/rdspecialchar/URLClient.java | |
| index 9dbd5b3f9..6721b9ed8 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/rdspecialchar/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/rdspecialchar/URLClient.java | |
| @@ -23,13 +23,34 @@ package com.sun.ts.tests.servlet.spec.rdspecialchar; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_rdspecialchar.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_rdspecialchar_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_rdspecialchar_web_war"); | |
| + servlet_spec_rdspecialchar_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_rdspecialchar_web_war.addClass(com.sun.ts.tests.servlet.spec.rdspecialchar.IncludedServlet.class); | |
| + servlet_spec_rdspecialchar_web_war.addClass(com.sun.ts.tests.servlet.spec.rdspecialchar.TestServlet.class); | |
| + servlet_spec_rdspecialchar_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + ear.addAsModule(servlet_spec_rdspecialchar_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestdispatcher/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestdispatcher/URLClient.java | |
| index d5afe6e6d..01a1d8cff 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestdispatcher/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestdispatcher/URLClient.java | |
| @@ -22,13 +22,39 @@ package com.sun.ts.tests.servlet.spec.requestdispatcher; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_requestdispatcher.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_requestdispatcher_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_requestdispatcher_web_war"); | |
| + servlet_spec_requestdispatcher_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.spec.requestdispatcher.ForwardedServlet.class); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.spec.requestdispatcher.HttpTestServlet.class); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.spec.requestdispatcher.IncludedServlet.class); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.spec.requestdispatcher.MultiForwardedServlet.class); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.spec.requestdispatcher.TestServlet.class); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.spec.requestdispatcher.WrapServlet.class); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_spec_requestdispatcher_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + ear.addAsModule(servlet_spec_requestdispatcher_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestmap/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestmap/URLClient.java | |
| index 8a08602ad..15cf25247 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestmap/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/requestmap/URLClient.java | |
| @@ -22,12 +22,35 @@ package com.sun.ts.tests.servlet.spec.requestmap; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_requestmap.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_requestmap_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_requestmap_web_war"); | |
| + servlet_js_requestmap_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_requestmap_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet1.class); | |
| + servlet_js_requestmap_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet2.class); | |
| + servlet_js_requestmap_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet3.class); | |
| + servlet_js_requestmap_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet4.class); | |
| + servlet_js_requestmap_web_war.addClass(com.sun.ts.tests.servlet.spec.requestmap.TestServlet5.class); | |
| + ear.addAsModule(servlet_js_requestmap_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/annotations/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/annotations/Client.java | |
| index 75b3cdbfb..479b1348b 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/annotations/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/annotations/Client.java | |
| @@ -19,7 +19,9 @@ package com.sun.ts.tests.servlet.spec.security.annotations; | |
| import com.sun.ts.lib.util.WebUtil; | |
| import com.sun.ts.tests.servlet.common.client.BaseUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -30,6 +32,35 @@ import java.util.Properties; | |
| */ | |
| public class Client extends BaseUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_sec_annotations.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_sec_annotations_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sec_annotations_web_war"); | |
| + servlet_sec_annotations_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.servlet.spec.security.annotations.DenyAllServlet.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.servlet.spec.security.annotations.GuestPageTestServlet.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.servlet.spec.security.annotations.PartialDDServlet.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.servlet.spec.security.annotations.ServletSecTestServlet.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.servlet.spec.security.annotations.UnProtectedTestServlet.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.common.webclient.BaseUrlClient.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.common.webclient.Goldenfile.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.common.webclient.TestCase.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.common.webclient.TestFailureException.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.common.webclient.TestSequence.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.common.webclient.Util.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.common.webclient.WebTestCase.class); | |
| + servlet_sec_annotations_web_war.addClass(com.sun.ts.tests.servlet.spec.security.annotations.Client.class); | |
| + ear.addAsModule(servlet_sec_annotations_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| // TOFIX | |
| // Constants: | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcert/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcert/Client.java | |
| index 01942d8ed..f4c3ee5e7 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcert/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcert/Client.java | |
| @@ -22,7 +22,9 @@ import org.jboss.arquillian.container.test.api.Deployment; | |
| import org.jboss.arquillian.container.test.api.OperateOnDeployment; | |
| import org.jboss.arquillian.container.test.api.TargetsContainer; | |
| import org.jboss.arquillian.test.api.ArquillianResource; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.AfterEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -62,6 +64,23 @@ import static org.junit.jupiter.api.Assertions.assertTrue; | |
| */ | |
| public class Client extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "clientcert.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive clientcert_web_war = ShrinkWrap.create(WebArchive.class, "clientcert_web_war"); | |
| + clientcert_web_war.addAsWebInfResource("web.xml"); | |
| + clientcert_web_war.addClass(com.sun.ts.tests.servlet.spec.security.clientcert.ServletSecTestServlet.class); | |
| + ear.addAsModule(clientcert_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| // TOFIX | |
| private static final Logger LOGGER = LoggerFactory.getLogger(Client.class); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcertanno/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcertanno/Client.java | |
| index 7b277ab9f..166619801 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcertanno/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/clientcertanno/Client.java | |
| @@ -23,7 +23,9 @@ import org.jboss.arquillian.container.test.api.Deployment; | |
| import org.jboss.arquillian.container.test.api.OperateOnDeployment; | |
| import org.jboss.arquillian.container.test.api.TargetsContainer; | |
| import org.jboss.arquillian.test.api.ArquillianResource; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.AfterEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -49,6 +51,23 @@ import java.util.Properties; | |
| */ | |
| public class Client extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "clientcertanno.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive clientcertanno_web_war = ShrinkWrap.create(WebArchive.class, "clientcertanno_web_war"); | |
| + clientcertanno_web_war.addAsWebInfResource("web.xml"); | |
| + clientcertanno_web_war.addClass(com.sun.ts.tests.servlet.spec.security.clientcertanno.ServletSecTestServlet.class); | |
| + ear.addAsModule(clientcertanno_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java | |
| index f451082aa..856529081 100755 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/denyUncovered/Client.java | |
| @@ -24,7 +24,9 @@ import com.sun.ts.lib.util.BASE64Encoder; | |
| import com.sun.ts.lib.util.TestUtil; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -41,6 +43,27 @@ import org.junit.jupiter.api.Test; | |
| * | |
| */ | |
| public class Client extends AbstractUrlClient { | |
| + | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_sec_denyUncovered.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_sec_denyUncovered_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sec_denyUncovered_web_war"); | |
| + servlet_sec_denyUncovered_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_sec_denyUncovered_web_war.addClass(com.sun.ts.tests.servlet.spec.security.denyUncovered.AllMethodsAllowedAnno.class); | |
| + servlet_sec_denyUncovered_web_war.addClass(com.sun.ts.tests.servlet.spec.security.denyUncovered.ExcludeAuthConstraint.class); | |
| + servlet_sec_denyUncovered_web_war.addClass(com.sun.ts.tests.servlet.spec.security.denyUncovered.PartialDDServlet.class); | |
| + servlet_sec_denyUncovered_web_war.addClass(com.sun.ts.tests.servlet.spec.security.denyUncovered.TestServlet.class); | |
| + servlet_sec_denyUncovered_web_war.addClass(com.sun.ts.tests.servlet.spec.security.denyUncovered.Client.class); | |
| + ear.addAsModule(servlet_sec_denyUncovered_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| private Properties props = null; | |
| private String hostname = null; | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/metadatacomplete/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/metadatacomplete/Client.java | |
| index b1d2aa6a4..a1c5ed890 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/metadatacomplete/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/metadatacomplete/Client.java | |
| @@ -18,7 +18,9 @@ package com.sun.ts.tests.servlet.spec.security.metadatacomplete; | |
| import com.sun.ts.tests.servlet.common.client.BaseUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -35,6 +37,35 @@ import java.util.Properties; | |
| public class Client extends BaseUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_sec_metadatacomplete.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_sec_metadatacomplete_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sec_metadatacomplete_web_war"); | |
| + servlet_sec_metadatacomplete_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.servlet.spec.security.metadatacomplete.DenyAllServlet.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.servlet.spec.security.metadatacomplete.GuestPageTestServlet.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.servlet.spec.security.metadatacomplete.ServletSecTestServlet.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.servlet.spec.security.metadatacomplete.UnProtectedTestServlet.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.common.webclient.BaseUrlClient.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.common.webclient.Goldenfile.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.common.webclient.TestCase.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.common.webclient.TestFailureException.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.common.webclient.TestSequence.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.common.webclient.Util.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.common.webclient.WebTestCase.class); | |
| + servlet_sec_metadatacomplete_web_war.addClass(com.sun.ts.tests.servlet.spec.security.metadatacomplete.Client.class); | |
| + ear.addAsModule(servlet_sec_metadatacomplete_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secbasic/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secbasic/Client.java | |
| index 892d8640a..bfd4db49d 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secbasic/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secbasic/Client.java | |
| @@ -20,7 +20,9 @@ package com.sun.ts.tests.servlet.spec.security.secbasic; | |
| import com.sun.ts.tests.servlet.common.request.SecBasicClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -41,6 +43,30 @@ import java.util.Properties; | |
| */ | |
| public class Client extends SecBasicClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_sec_secbasic.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_sec_secbasic_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sec_secbasic_web_war"); | |
| + servlet_sec_secbasic_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.GuestPageAnnoTestServlet.class); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.GuestPageTestServlet.class); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.RoleReverseAnnoTestServlet.class); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.RoleReverseTestServlet.class); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.ServletSecAnnoTestServlet.class); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.ServletSecTestServlet.class); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.UnProtectedAnnoTestServlet.class); | |
| + servlet_sec_secbasic_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secbasic.UnProtectedTestServlet.class); | |
| + ear.addAsModule(servlet_sec_secbasic_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| // TOFIX | |
| /** | |
| * Deployment for the test | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secform/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secform/Client.java | |
| index 61c3501d7..9aced7cd1 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secform/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/security/secform/Client.java | |
| @@ -20,7 +20,9 @@ package com.sun.ts.tests.servlet.spec.security.secform; | |
| import com.sun.ts.tests.servlet.common.request.SecformClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| import java.util.Properties; | |
| @@ -39,6 +41,42 @@ import java.util.Properties; | |
| */ | |
| public class Client extends SecformClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_sec_secform.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_sec_secform_web_war = ShrinkWrap.create(WebArchive.class, "servlet_sec_secform_web_war"); | |
| + servlet_sec_secform_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_sec_secform_web_war.addAsWebResource("error.jsp"); | |
| + servlet_sec_secform_web_war.addAsWebResource("login.jsp"); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.ControlServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.ForwardedServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.GuestPageAnnoTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.GuestPageTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.IncludedServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.OneTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.RoleReverseAnnoTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.RoleReverseTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.SampleTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.ServletProgrammaticAuthen.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.ServletProgrammaticLogin.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.ServletProgrammaticLogout.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.ServletSecAnnoTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.ServletSecTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.TwoTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.UnProtectedAnnoTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.UnProtectedTestServlet.class); | |
| + servlet_sec_secform_web_war.addClass(com.sun.ts.tests.servlet.spec.security.secform.allRolesTestServlet.class); | |
| + ear.addAsModule(servlet_sec_secform_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| // TOFIX | |
| /** | |
| * Deployment for the test | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/serverpush/Client.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/serverpush/Client.java | |
| index 1d5e56854..d7cafddba 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/serverpush/Client.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/serverpush/Client.java | |
| @@ -21,7 +21,9 @@ import com.sun.ts.lib.util.TestUtil; | |
| import com.sun.ts.lib.util.WebUtil; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| @@ -53,6 +55,31 @@ import java.util.stream.Collectors; | |
| public class Client extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_serverpush.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_serverpush_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_serverpush_web_war"); | |
| + servlet_spec_serverpush_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_serverpush_web_war.addAsWebResource("index.html"); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.tests.servlet.spec.serverpush.TestServlet.class); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.tests.servlet.spec.serverpush.TestServlet2.class); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.tests.servlet.spec.serverpush.TestServlet3.class); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.tests.servlet.spec.serverpush.TestServlet4.class); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.tests.servlet.spec.serverpush.TestServlet5.class); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.tests.servlet.spec.serverpush.TestServlet6.class); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.tests.servlet.spec.serverpush.TestServlet7.class); | |
| + servlet_spec_serverpush_web_war.addClass(com.sun.ts.lib.porting.TSURL.class); | |
| + ear.addAsModule(servlet_spec_serverpush_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletcontext/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletcontext/URLClient.java | |
| index 8e85669f5..64018b33f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletcontext/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletcontext/URLClient.java | |
| @@ -19,13 +19,36 @@ package com.sun.ts.tests.servlet.spec.servletcontext; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_servletcontext.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_servletcontext_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_servletcontext_web_war"); | |
| + servlet_spec_servletcontext_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.spec.servletcontext.TestServlet.class); | |
| + servlet_spec_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet.class); | |
| + servlet_spec_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_spec_servletcontext_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_spec_servletcontext_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletmapping/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletmapping/URLClient.java | |
| index 1e5060f58..2b9e9a70f 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletmapping/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletmapping/URLClient.java | |
| @@ -22,12 +22,34 @@ package com.sun.ts.tests.servlet.spec.servletmapping; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_servletmapping.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_servletmapping_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_servletmapping_web_war"); | |
| + servlet_js_servletmapping_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_servletmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.servletmapping.TestServlet1.class); | |
| + servlet_js_servletmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.servletmapping.TestServlet2.class); | |
| + servlet_js_servletmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.servletmapping.TestServlet4.class); | |
| + servlet_js_servletmapping_web_war.addClass(com.sun.ts.tests.servlet.spec.servletmapping.TestServlet5.class); | |
| + ear.addAsModule(servlet_js_servletmapping_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletresponse/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletresponse/URLClient.java | |
| index b0942c22f..b422cfabf 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletresponse/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/servletresponse/URLClient.java | |
| @@ -22,7 +22,9 @@ package com.sun.ts.tests.servlet.spec.servletresponse; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -35,6 +37,25 @@ import java.util.Calendar; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_servletresponse.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_servletresponse_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_servletresponse_web_war"); | |
| + servlet_spec_servletresponse_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.spec.servletresponse.HttpTestServlet.class); | |
| + servlet_spec_servletresponse_web_war.addClass(com.sun.ts.tests.servlet.spec.servletresponse.TestServlet.class); | |
| + ear.addAsModule(servlet_spec_servletresponse_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/srlistener/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/srlistener/URLClient.java | |
| index acecc9a59..6e25da536 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/srlistener/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/srlistener/URLClient.java | |
| @@ -23,13 +23,41 @@ import com.sun.ts.lib.util.TestUtil; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import com.sun.ts.tests.servlet.common.servlets.CommonServlets; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.BeforeEach; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_srlistener.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_srlistener_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_srlistener_web_war"); | |
| + servlet_spec_srlistener_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.spec.srlistener.ForwardedServlet.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.spec.srlistener.IncludedServlet.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.spec.srlistener.SRListener.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.spec.srlistener.SecondForwardedServlet.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.spec.srlistener.SecondIncludedServlet.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.spec.srlistener.TestServlet.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + servlet_spec_srlistener_web_war.addClass(com.sun.ts.tests.servlet.common.util.StaticLog.class); | |
| + ear.addAsModule(servlet_spec_srlistener_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| @BeforeEach | |
| public void setupServletName() throws Exception { | |
| setServletName("TestServlet"); | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/webapps/accesswebinf/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/webapps/accesswebinf/URLClient.java | |
| index 935931ad4..e3eacafef 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/webapps/accesswebinf/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/webapps/accesswebinf/URLClient.java | |
| @@ -22,12 +22,34 @@ package com.sun.ts.tests.servlet.spec.webapps.accesswebinf; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_spec_webapps_accesswebinf.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_spec_webapps_accesswebinf_web_war = ShrinkWrap.create(WebArchive.class, "servlet_spec_webapps_accesswebinf_web_war"); | |
| + servlet_spec_webapps_accesswebinf_web_war.addAsWebInfResource("test.html"); | |
| + servlet_spec_webapps_accesswebinf_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_spec_webapps_accesswebinf_web_war.addClass(com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet.class); | |
| + servlet_spec_webapps_accesswebinf_web_war.addClass(com.sun.ts.tests.servlet.common.util.Data.class); | |
| + servlet_spec_webapps_accesswebinf_web_war.addClass(com.sun.ts.tests.servlet.common.util.ServletTestUtil.class); | |
| + ear.addAsModule(servlet_spec_webapps_accesswebinf_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ | |
| diff --git a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/welcomefiles/URLClient.java b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/welcomefiles/URLClient.java | |
| index 8e8f52dd6..3564f2c53 100644 | |
| --- a/servlet/src/main/java/com/sun/ts/tests/servlet/spec/welcomefiles/URLClient.java | |
| +++ b/servlet/src/main/java/com/sun/ts/tests/servlet/spec/welcomefiles/URLClient.java | |
| @@ -22,7 +22,9 @@ package com.sun.ts.tests.servlet.spec.welcomefiles; | |
| import com.sun.ts.tests.servlet.common.client.AbstractUrlClient; | |
| import org.jboss.arquillian.container.test.api.Deployment; | |
| +import org.jboss.shrinkwrap.api.Archive; | |
| import org.jboss.shrinkwrap.api.ShrinkWrap; | |
| +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; | |
| import org.jboss.shrinkwrap.api.spec.WebArchive; | |
| import org.junit.jupiter.api.Test; | |
| @@ -31,6 +33,28 @@ import java.util.Arrays; | |
| public class URLClient extends AbstractUrlClient { | |
| + @Deployment(testable = false) | |
| + public static Archive<?> deployment() { | |
| + | |
| + final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_js_welcomefiles.ear"); | |
| + // Add ear submodules | |
| + | |
| + { | |
| + | |
| + WebArchive servlet_js_welcomefiles_web_war = ShrinkWrap.create(WebArchive.class, "servlet_js_welcomefiles_web_war"); | |
| + servlet_js_welcomefiles_web_war.addAsWebInfResource("web.xml"); | |
| + servlet_js_welcomefiles_web_war.addAsWebResource("catalog/default.jsp"); | |
| + servlet_js_welcomefiles_web_war.addAsWebResource("default.jsp"); | |
| + servlet_js_welcomefiles_web_war.addAsWebResource("foo/default.jsp"); | |
| + servlet_js_welcomefiles_web_war.addAsWebResource("foo/index.html"); | |
| + servlet_js_welcomefiles_web_war.addAsWebResource("foo/order.jsp"); | |
| + servlet_js_welcomefiles_web_war.addAsWebResource("index.html"); | |
| + ear.addAsModule(servlet_js_welcomefiles_web_war); | |
| + | |
| + } | |
| + return ear; | |
| + } | |
| + | |
| /** | |
| * Deployment for the test | |
| */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment