Skip to content

FISH-10759 Deployment Descriptors #112

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

Open
Viii3 wants to merge 2 commits into
base: Payara7
Choose a base branch
from
Open

FISH-10759 Deployment Descriptors #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1610a17
FISH-10759: Replace glassfish-web.xml with payara-web.xml
Viii3 Feb 5, 2026
01b05ca
FISH-10759: Change glassfish-web.xml references in test classes
Viii3 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...src/main/webapp/WEB-INF/glassfish-web.xml → ...ts/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
Expand All @@ -9,4 +9,4 @@

<parameter-encoding default-charset="UTF-8" />

</glassfish-web-app>
</payara-web-app>
6 changes: 3 additions & 3 deletions ...src/main/webapp/WEB-INF/glassfish-web.xml → ...on/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
Expand All @@ -9,4 +9,4 @@

<parameter-encoding default-charset="UTF-8" />

</glassfish-web-app>
</payara-web-app>
6 changes: 3 additions & 3 deletions ...src/main/webapp/WEB-INF/glassfish-web.xml → ...on/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
Expand All @@ -9,4 +9,4 @@

<parameter-encoding default-charset="UTF-8" />

</glassfish-web-app>
</payara-web-app>
2 changes: 1 addition & 1 deletion jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static WebArchive defaultWebArchive() {
.deleteClass(ArquillianBase.class)
.addAsWebInfResource(resource("web.xml"))
.addAsWebInfResource(resource("jboss-web.xml"))
.addAsWebInfResource(resource("glassfish-web.xml"));
.addAsWebInfResource(resource("payara-web.xml"));
}

public static Archive<?> tryWrapEAR(WebArchive webArchive) {
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/webapp/WEB-INF/glassfish-web.xml → ...al/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
Expand All @@ -9,4 +9,4 @@

<parameter-encoding default-charset="UTF-8" />

</glassfish-web-app>
</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/dispatching-jsf-cdi/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/dispatching/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/dispatching/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/ejb-propagation/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/ejb-propagation/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/ejb-register-session/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/ejb-register-session/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/invoke-ejb-cdi/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/jacc-propagation/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/jacc-propagation/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/lifecycle/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/lifecycle/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/programmatic-authentication/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/programmatic-authentication/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/register-session/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/status-codes/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/status-codes/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
12 changes: 0 additions & 12 deletions jaspic/wrapping/src/main/webapp/WEB-INF/glassfish-web.xml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions jaspic/wrapping/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app>

<security-role-mapping>
<role-name>architect</role-name>
<group-name>architect</group-name>
</security-role-mapping>

<parameter-encoding default-charset="UTF-8" />

</payara-web-app>
6 changes: 3 additions & 3 deletions ...src/main/webapp/WEB-INF/glassfish-web.xml → ...ed/src/main/webapp/WEB-INF/payara-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
* holder.
*/
-->
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app error-url="">
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd">
<payara-web-app error-url="">
<security-role-mapping>
<role-name>g1</role-name>
<group-name>g1</group-name>
</security-role-mapping>
</glassfish-web-app>
</payara-web-app>
Loading