Skip to content

Replace deprecated glassfish files with payara-* files in WEB-INF #12240

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
qqmyers wants to merge 4 commits into
base: develop
Choose a base branch
from
+9 −9
Open

Replace deprecated glassfish files with payara-* files in WEB-INF #12240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05da125
try WEB-INF/payara* files
qqmyers Mar 20, 2026
3b47e0c
update doctype
qqmyers Mar 20, 2026
a02d797
CHanges per review
qqmyers Jun 22, 2026
4cfd85c
Merge remote-tracking branch 'IQSS/develop' into WEB-INF/payara_files
qqmyers Jun 22, 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
2 changes: 1 addition & 1 deletion src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ FROM $BASE_IMAGE
ENV MP_CONFIG_PROFILE=ct

# Workaround to configure upload directories by default to useful place until we can have variable lookups in
# defaults for glassfish-web.xml and other places.
# defaults for payara-web.xml and other places.
ENV DATAVERSE_FILES_UPLOADS="${STORAGE_DIR}/uploads"
ENV DATAVERSE_FILES_DOCROOT="${STORAGE_DIR}/docroot"

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/microprofile-config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ dataverse.build=

# FILES
# NOTE: The following uses STORAGE_DIR for both containers and classic installations. When defaulting to
# "com.sun.aas.instanceRoot" if not present, it equals the hardcoded default "." in glassfish-web.xml
# "com.sun.aas.instanceRoot" if not present, it equals the hardcoded default "." in payara-web.xml
# (which is relative to the domain root folder).
# Also, be aware that this props file cannot provide any value for lookups in glassfish-web.xml during servlet
# Also, be aware that this props file cannot provide any value for lookups in payara-web.xml during servlet
# initialization, as this file will not have been read yet! The names and their values are in sync here and over
# there to ensure the config checker is able to check for the directories (exist + writeable).
dataverse.files.directory=${STORAGE_DIR:/tmp/dataverse}
Expand Down
6 changes: 3 additions & 3 deletions ...in/webapp/WEB-INF/glassfish-resources.xml → src/main/webapp/WEB-INF/payara-resources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE resources PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Resource Definitions//EN" "http://glassfish.org/dtds/glassfish-resources_1_5.dtd">
<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 7 Resource Definitions//EN" "https://raw.githubusercontent.com/payara/Payara-Documentation/main-7/docs/modules/ROOT/pages/Appendix/Schemas/payara-resources_1_8.dtd">
<resources>
<!-- This executor is used in edu.harvard.iq.dataverse.dataaccess.S3AccessIO to support asynchronous operations -->
<custom-resource res-type="javax.enterprise.concurrent.ManagedExecutorService"
<custom-resource res-type="jakarta.enterprise.concurrent.ManagedExecutorService"
jndi-name="java:app/env/concurrent/s3UploadExecutor"
factory-class="org.glassfish.resources.custom.factory.ManagedExecutorServiceFactory">
<property name="threadPriority" value="5"/>
Expand All @@ -12,7 +12,7 @@
<property name="threadLifeTime" value="3600"/>
</custom-resource>
<!-- Managed Executor Service for Citation Updates -->
<custom-resource res-type="javax.enterprise.concurrent.ManagedExecutorService"
<custom-resource res-type="jakarta.enterprise.concurrent.ManagedExecutorService"
jndi-name="java:app/env/concurrent/CitationUpdateExecutor"
factory-class="org.glassfish.resources.custom.factory.ManagedExecutorServiceFactory">
<property name="corePoolSize" value="1"/>
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/WEB-INF/glassfish-web.xml → 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 error-url="">
<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 7.2026.2//EN" "https://raw.githubusercontent.com/payara/Payara-Documentation/main-7/docs/modules/ROOT/pages/Appendix/Schemas/payara-web-app_6_1-0.dtd">
<payara-web-app error-url="">
<context-root>/</context-root>
<class-loader delegate="true"/>
<jsp-config>
Expand All @@ -24,4 +24,4 @@
<!-- NOTE: As we cannot use variables in defaults of ${MPCONFIG}, there is a workaround for containers necessary;
see src/main/docker/Dockerfile. Once Payara upstream fixes this, we can use STORAGE_DIR here. -->
<property name="tempdir" value="${MPCONFIG=dataverse.files.uploads:./uploads}"/>
</glassfish-web-app>
</payara-web-app>
Loading