Refactor the policy usage in Servlet test somewhat

Rename and provide some extra comment Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
jakartaee · Mar 12, 2024 · 0a255f7 · 0a255f7
1 parent a669613
commit 0a255f7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/tck/app-policy3/pom.xml → tck/app-policy-within-servlet/pom.xml b/tck/app-policy3/pom.xml → tck/app-policy-within-servlet/pom.xml
@@ -27,11 +27,11 @@
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
-	<artifactId>app-mem-policy3</artifactId>
+	<artifactId>app-policy-use-within-servlet</artifactId>
 	<packaging>war</packaging>
 
 	<description>
-        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.
     </description>
 

diff --git a/.../authorization/test/ProtectedServlet.java → .../authorization/test/ProtectedServlet.java b/.../authorization/test/ProtectedServlet.java → .../authorization/test/ProtectedServlet.java
diff --git a/...policy3/src/main/webapp/WEB-INF/beans.xml → ...servlet/src/main/webapp/WEB-INF/beans.xml b/...policy3/src/main/webapp/WEB-INF/beans.xml → ...servlet/src/main/webapp/WEB-INF/beans.xml
diff --git a/...p-policy3/src/main/webapp/WEB-INF/web.xml → ...n-servlet/src/main/webapp/WEB-INF/web.xml b/...p-policy3/src/main/webapp/WEB-INF/web.xml → ...n-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/.../tck/authorization/test/AppPolicy3IT.java → ...zation/test/AppPolicyWithinServletIT.java b/.../tck/authorization/test/AppPolicy3IT.java → ...zation/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
@@ -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
+                
     -->
     <modules>
         <module>common</module>
 
-        <!-- Setting a Jakarta Authorization policy -->
+        <!-- Setting a custom Jakarta Authorization policy -->
         <module>app-custom-policy</module>
         <module>app-custom-policy2</module>
-        <module>app-policy3</module>
+
+
+        <!-- Using the default Jakarta Authorization policy from within a Servlet -->
+        <module>app-policy-within-servlet</module>
     </modules>
 
     <properties>
@@ -62,8 +69,6 @@
         <zipname>${project.artifactId}-${project.version}</zipname>
         <licenseFile>${project.basedir}/LICENSE_EFTL.md</licenseFile>
 
-        <security-api.version>4.0.0-SNAPSHOT</security-api.version>
-
         <buildDirectory>${project.basedir}/target</buildDirectory>
     </properties>
 
@@ -276,6 +281,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
+                        <inherited>false</inherited>
                         <executions>
                             <execution>
                                 <id>unpack</id>
@@ -293,7 +299,7 @@
                                             <artifactId>glassfish</artifactId>
                                             <version>${glassfish.version}</version>
                                             <type>zip</type>
-                                            <overWrite>true</overWrite>
+                                            <overWrite>false</overWrite>
                                             <outputDirectory>${glassfish.root}</outputDirectory>
                                         </artifactItem>
                                     </artifactItems>
@@ -305,6 +311,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>3.0.0</version>
+                        <inherited>false</inherited>
                         <executions>
                             <execution>
                                 <id>set-port</id>