diff --git a/tck/app-policy3/pom.xml b/tck/app-policy-within-servlet/pom.xml similarity index 92% rename from tck/app-policy3/pom.xml rename to tck/app-policy-within-servlet/pom.xml index 31665c3..5daada6 100644 --- a/tck/app-policy3/pom.xml +++ b/tck/app-policy-within-servlet/pom.xml @@ -27,11 +27,11 @@ 4.0.0-SNAPSHOT - app-mem-policy3 + app-policy-use-within-servlet war - Access a Servlet, and check from within that Servlet whether the + Access a Servlet (the resource), and check from within that Servlet whether the permission checks from the Policy match with the expectations for that request. diff --git a/tck/app-policy3/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java b/tck/app-policy-within-servlet/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java similarity index 100% rename from tck/app-policy3/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java rename to tck/app-policy-within-servlet/src/main/java/ee/jakarta/tck/authorization/test/ProtectedServlet.java diff --git a/tck/app-policy3/src/main/webapp/WEB-INF/beans.xml b/tck/app-policy-within-servlet/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from tck/app-policy3/src/main/webapp/WEB-INF/beans.xml rename to tck/app-policy-within-servlet/src/main/webapp/WEB-INF/beans.xml diff --git a/tck/app-policy3/src/main/webapp/WEB-INF/web.xml b/tck/app-policy-within-servlet/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from tck/app-policy3/src/main/webapp/WEB-INF/web.xml rename to tck/app-policy-within-servlet/src/main/webapp/WEB-INF/web.xml diff --git a/tck/app-policy3/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy3IT.java b/tck/app-policy-within-servlet/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyWithinServletIT.java similarity index 97% rename from tck/app-policy3/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy3IT.java rename to tck/app-policy-within-servlet/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyWithinServletIT.java index 04b2a88..6313013 100644 --- a/tck/app-policy3/src/test/java/ee/jakarta/tck/authorization/test/AppPolicy3IT.java +++ b/tck/app-policy-within-servlet/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyWithinServletIT.java @@ -30,7 +30,7 @@ @RunWith(Arquillian.class) -public class AppPolicy3IT extends ArquillianBase { +public class AppPolicyWithinServletIT extends ArquillianBase { @Deployment(testable = false) public static Archive createDeployment() { diff --git a/tck/pom.xml b/tck/pom.xml index 5b8db8f..f228a65 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -46,14 +46,21 @@ execute with mvn ... -Dtck.log.response + For a somewhat faster execution using GlassFish use: + + mvn clean install -Dglassfish.keepServerRunning -Dglassfish.keepDeployment -DskipSBOM + --> common - + app-custom-policy app-custom-policy2 - app-policy3 + + + + app-policy-within-servlet @@ -62,8 +69,6 @@ ${project.artifactId}-${project.version} ${project.basedir}/LICENSE_EFTL.md - 4.0.0-SNAPSHOT - ${project.basedir}/target @@ -276,6 +281,7 @@ org.apache.maven.plugins maven-dependency-plugin + false unpack @@ -293,7 +299,7 @@ glassfish ${glassfish.version} zip - true + false ${glassfish.root} @@ -305,6 +311,7 @@ org.apache.maven.plugins maven-antrun-plugin 3.0.0 + false set-port