Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor the policy usage in Servlet test somewhat #147

Merged
merged 1 commit into from Mar 12, 2024
Merged

Refactor the policy usage in Servlet test somewhat #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tck/app-policy3/pom.xml → tck/app-policy-within-servlet/pom.xml
View file
Open in desktop
Expand Up @@ -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>

Expand Down
0 .../authorization/test/ProtectedServlet.java → .../authorization/test/ProtectedServlet.java
View file
Open in desktop
File renamed without changes.
0 ...policy3/src/main/webapp/WEB-INF/beans.xml → ...servlet/src/main/webapp/WEB-INF/beans.xml
View file
Open in desktop
File renamed without changes.
0 ...p-policy3/src/main/webapp/WEB-INF/web.xml → ...n-servlet/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../tck/authorization/test/AppPolicy3IT.java → ...zation/test/AppPolicyWithinServletIT.java
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@


@RunWith(Arquillian.class)
public class AppPolicy3IT extends ArquillianBase {
public class AppPolicyWithinServletIT extends ArquillianBase {

@Deployment(testable = false)
public static Archive<?> createDeployment() {
Expand Down
17 changes: 12 additions & 5 deletions tck/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand All @@ -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>

Expand Down Expand Up @@ -276,6 +281,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>unpack</id>
Expand All @@ -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>
Expand All @@ -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>
Expand Down