From a5e2926ad2d990b7d1fb2c0e889a672d6161bc39 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 23 Dec 2024 15:37:21 -0500 Subject: [PATCH 01/20] Always set a localeCode --- .../iq/dataverse/DataverseSession.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java b/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java index e8d76e1825e..607bc9d5a47 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java @@ -209,19 +209,17 @@ public String getLocaleTitle() { public void initLocale() { - if(FacesContext.getCurrentInstance() == null) { - localeCode = "en"; - } - else if (FacesContext.getCurrentInstance().getViewRoot() == null ) { - localeCode = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale().getLanguage(); - } - else if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage().equals("en_US")) { - localeCode = "en"; - } - else { - localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage(); + + localeCode = "en"; + if (FacesContext.getCurrentInstance() != null) { + if (FacesContext.getCurrentInstance().getViewRoot() == null) { + localeCode = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale().getLanguage(); + } else if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage().equals("en_US")) { + localeCode = "en"; + } else { + localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage(); + } } - logger.fine("init: locale set to "+localeCode); } From ecd642544879a31174ef4d5059611665bcfbbf5a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 24 Dec 2024 08:41:10 -0500 Subject: [PATCH 02/20] stop npe --- src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 33a093c8044..0dc81e2f07c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -6230,6 +6230,11 @@ public List getVocabScripts() { } public String getFieldLanguage(String languages) { + //Prevent NPE in Payara 6-2024-12 with CVoc + logger.info("Languages: " + languages); + if(languages==null) { + languages=""; + } return fieldService.getFieldLanguage(languages,session.getLocaleCode()); } From 11ae8cb9bc807aad0ba421b9f78a5d39c3e6c62f Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 24 Dec 2024 12:48:34 -0500 Subject: [PATCH 03/20] handle null code --- src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 0dc81e2f07c..1cba74e82cf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -6214,7 +6214,7 @@ public String getEffectiveMetadataLanguage(boolean ofParent) { public String getLocaleDisplayName(String code) { String displayName = settingsWrapper.getBaseMetadataLanguageMap(false).get(code); - if(displayName==null && !code.equals(DvObjectContainer.UNDEFINED_CODE)) { + if(displayName==null && code!=null && !code.equals(DvObjectContainer.UNDEFINED_CODE)) { //Default (for cases such as :when a Dataset has a metadatalanguage code but :MetadataLanguages is no longer defined). displayName = new Locale(code).getDisplayName(); } From 401cd8fa9355978aa0e3f20689108ec577011bd5 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 24 Dec 2024 12:48:45 -0500 Subject: [PATCH 04/20] update payara-bom --- modules/dataverse-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index 9612988b3e7..d9b9a4ec137 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -148,7 +148,7 @@ -Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region} - 6.2024.6 + 6.2024.12 42.7.4 9.4.1 1.12.748 From e6249cfec16ab4784dbb02a0fdd16838e5198b64 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 31 Dec 2024 13:28:17 -0500 Subject: [PATCH 05/20] 6-2024-12 domain1 domain --- conf/payara/domain.xml | 593 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 593 insertions(+) create mode 100644 conf/payara/domain.xml diff --git a/conf/payara/domain.xml b/conf/payara/domain.xml new file mode 100644 index 00000000000..5e1fb62b830 --- /dev/null +++ b/conf/payara/domain.xml @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + log-notifier + + + + + + + log-notifier + + + + log-notifier + + + log-notifier + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -server + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED + + --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/sun.nio.ch=ALL-UNNAMED + --add-opens=java.management/sun.management=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED + --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=java.logging/java.util.logging=ALL-UNNAMED + --add-opens=java.management/javax.management=ALL-UNNAMED + --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED + [17|]--add-exports=java.base/sun.net.www=ALL-UNNAMED + [17|]--add-exports=java.base/sun.security.util=ALL-UNNAMED + [17|]--add-opens=java.base/java.lang.invoke=ALL-UNNAMED + [17|]--add-opens=java.desktop/java.beans=ALL-UNNAMED + [17|]--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED + [17|]--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED + [17|]--add-opens=java.base/java.io=ALL-UNNAMED + [21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED + -Xmx512m + -XX:NewRatio=2 + -XX:+UnlockDiagnosticVMOptions + -Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory + -Djava.awt.headless=true + -Djava.security.auth.login.config=${com.sun.aas.instanceRoot}/config/login.conf + -Djava.security.policy=${com.sun.aas.instanceRoot}/config/server.policy + -Djavax.management.builder.initial=com.sun.enterprise.v3.admin.AppServerMBeanServerBuilder + -Dcom.sun.enterprise.security.httpsOutboundKeyAlias=s1as + -Djavax.net.ssl.keyStore=${com.sun.aas.instanceRoot}/config/keystore.p12 + -Djavax.net.ssl.trustStore=${com.sun.aas.instanceRoot}/config/cacerts.p12 + -Djavax.xml.accessExternalSchema=all + -Djdbc.drivers=org.h2.Driver + -Djdk.corba.allowOutputStreamSubclass=true + -Djdk.tls.rejectClientInitiatedRenegotiation=true + -DANTLR_USE_DIRECT_CLASS_LOADING=true + + -Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command,org.apache.felix.shell.remote,org.apache.felix.fileinstall + + + -Dosgi.shell.telnet.port=6666 + + -Dosgi.shell.telnet.maxconn=1 + + -Dosgi.shell.telnet.ip=127.0.0.1 + + -Dgosh.args=--nointeractive + + -Dfelix.fileinstall.dir=${com.sun.aas.installRoot}/modules/autostart/ + + -Dfelix.fileinstall.poll=5000 + + -Dfelix.fileinstall.log.level=2 + + -Dfelix.fileinstall.bundles.new.start=true + + -Dfelix.fileinstall.bundles.startTransient=true + + + -Dfelix.fileinstall.disableConfigSave=false + + + -Dcom.ctc.wstx.returnNullForDefaultNamespace=true + -Dorg.glassfish.grizzly.DEFAULT_MEMORY_MANAGER=org.glassfish.grizzly.memory.HeapMemoryManager + -Dorg.glassfish.grizzly.nio.DefaultSelectorHandler.force-selector-spin-detection=true + -Dorg.jboss.weld.serialization.beanIdentifierIndexOptimization=false + + -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar + + -Djdk.attach.allowAttachSelf=true + + [Dynamic Code Evolution-11.0.10|]-XX:HotswapAgent=core + [Dynamic Code Evolution-11.0.10|]-Xlog:redefine+class*=info + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + log-notifier + + + + + + + log-notifier + + + + log-notifier + + + log-notifier + + + + -server + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED + + --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/sun.nio.ch=ALL-UNNAMED + --add-opens=java.management/sun.management=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED + --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED + --add-opens=java.logging/java.util.logging=ALL-UNNAMED + --add-opens=java.management/javax.management=ALL-UNNAMED + --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED + [17|]--add-exports=java.base/sun.net.www=ALL-UNNAMED + [17|]--add-exports=java.base/sun.security.util=ALL-UNNAMED + [17|]--add-opens=java.base/java.lang.invoke=ALL-UNNAMED + [17|]--add-opens=java.desktop/java.beans=ALL-UNNAMED + [17|]--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED + [17|]--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED + [17|]--add-opens=java.base/java.io=ALL-UNNAMED + [21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED + -Xmx512m + -XX:NewRatio=2 + -XX:+UnlockDiagnosticVMOptions + -Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory + -Djava.awt.headless=true + -Djava.security.auth.login.config=${com.sun.aas.instanceRoot}/config/login.conf + -Djava.security.policy=${com.sun.aas.instanceRoot}/config/server.policy + -Dcom.sun.enterprise.security.httpsOutboundKeyAlias=s1as + -Djavax.net.ssl.keyStore=${com.sun.aas.instanceRoot}/config/keystore.p12 + -Djavax.net.ssl.trustStore=${com.sun.aas.instanceRoot}/config/cacerts.p12 + -Djdbc.drivers=org.h2.Driver + -Djdk.corba.allowOutputStreamSubclass=true + -Djdk.tls.rejectClientInitiatedRenegotiation=true + -DANTLR_USE_DIRECT_CLASS_LOADING=true + + -Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command,org.apache.felix.fileinstall + + -Dosgi.shell.telnet.port=${OSGI_SHELL_TELNET_PORT} + + -Dosgi.shell.telnet.maxconn=1 + + -Dosgi.shell.telnet.ip=127.0.0.1 + + + + -Dgosh.args=--nointeractive + + -Dfelix.fileinstall.dir=${com.sun.aas.installRoot}/modules/autostart/ + + -Dfelix.fileinstall.poll=5000 + + -Dfelix.fileinstall.log.level=3 + + -Dfelix.fileinstall.bundles.new.start=true + + -Dfelix.fileinstall.bundles.startTransient=true + + -Dfelix.fileinstall.disableConfigSave=false + + + -Dorg.glassfish.grizzly.DEFAULT_MEMORY_MANAGER=org.glassfish.grizzly.memory.HeapMemoryManager + -Dorg.glassfish.grizzly.nio.DefaultSelectorHandler.force-selector-spin-detection=true + -Dorg.jboss.weld.serialization.beanIdentifierIndexOptimization=false + + -Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar + + [Dynamic Code Evolution-11.0.10|]-XX:HotswapAgent=core + [Dynamic Code Evolution-11.0.10|]-Xlog:redefine+class*=info + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0feef516270d81df8e431e8c3076db708bc9495b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 31 Dec 2024 16:07:10 -0500 Subject: [PATCH 06/20] domain.xml with standard Dataverse lines --- conf/payara/domain.xml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/conf/payara/domain.xml b/conf/payara/domain.xml index 5e1fb62b830..af528d28ac2 100644 --- a/conf/payara/domain.xml +++ b/conf/payara/domain.xml @@ -77,9 +77,23 @@ + + + + + + + + + + + + + + @@ -135,6 +149,9 @@ log-notifier + + + @@ -222,7 +239,6 @@ [17|]--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED [17|]--add-opens=java.base/java.io=ALL-UNNAMED [21|]--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED - -Xmx512m -XX:NewRatio=2 -XX:+UnlockDiagnosticVMOptions -Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory @@ -278,6 +294,8 @@ [Dynamic Code Evolution-11.0.10|]-XX:HotswapAgent=core [Dynamic Code Evolution-11.0.10|]-Xlog:redefine+class*=info + + From 71a9d17a3d5e6c878401cbdc813dbad208e9618a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 31 Dec 2024 16:07:20 -0500 Subject: [PATCH 07/20] initial release notes --- doc/release-notes/6.2024.12update.md | 181 +++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 doc/release-notes/6.2024.12update.md diff --git a/doc/release-notes/6.2024.12update.md b/doc/release-notes/6.2024.12update.md new file mode 100644 index 00000000000..d5ee047149f --- /dev/null +++ b/doc/release-notes/6.2024.12update.md @@ -0,0 +1,181 @@ +- Payara application server has been upgraded to version 6.2024.12. + +## Installation + +Change Install instructions - tbd + +### Upgrade to Payara 6.2024.12 + +If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user. + + +1. Stop Payara 6, if running. + + `` + sudo -u dataverse /usr/local/payara6/bin/asadmin stop-domain + `` +1. Move it to a backup directory + + `sudo -u dataverse mv /usr/local/payara6 /usr/local/payara6.old` + +1. Download Payara 6.2024.12 + + `curl -L -O https://nexus.payara.fish/repository/payara- community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip` + +1. Unzip it to /usr/local (or your preferred location) + + `sudo unzip payara-6.2024.12.zip -d /usr/local/` + +1. Change ownership of the unzipped Payara to your "service" user ("dataverse" by default) + + `sudo chown -R dataverse /usr/local/payara6` + +1. Create a Dataverse-specific domain.xml file + + i. Move the existing domain.xml file to a backup location + + ``sudo -u dataverse cp /usr/local/payara6/glassfish/domains/domain1/config/domain.xml /usr/local/payara6/glassfish/domains/domain1/config/domain.xml.orig`` + + ii. Retrieve the domain.xml file for this version of Dataverse + + `curl https://github.com/IQSS/dataverse/raw/refs/tags/v6.6/conf/payara/domain.xml` + + + iii. Move it into domain1 of your Payara 6.2024.12 install: + + `sudo -u dataverse cp domain.xml /usr/local/payara6/glassfish/domains/domain1/config/domain.xml` + + + iv. Copy Dataverse-related lines from your existing domain.xml to sections of the new domain.xml highlighted by `Dataverse-instance-specific` comments + + `sudo egrep 'dataverse|doi|Xmx' /usr/local/payara5/glassfish/domains/domain1/config/domain.xml > lines.txt` + + `sudo vi /usr/local/payara6/glassfish/domains/domain1/config/domain.xml` + + + The lines will appear in two sections, examples shown below (but your content will vary) + + + Section 1: system properties (under `` + + + ``` + + + + + + + + + + + ``` + + + Note: if you used the Dataverse installer, you won't have a `dataverse.db.password` property. See "Create password aliases" below + + + Section 2: JVM options (under ``, the one under ``, not under `` + + + Add the remaining lines (starting with `` )from lines.txt created above, e.g. + + + ``` + + -Ddataverse.files.directory=/usr/local/dvn/data-Ddataverse.files.file.type=file-Ddataverse.files.file.label=file-Ddataverse.files.file.directory=/usr/local/dvn/data-Ddataverse.rserve.host=localhost-Ddataverse.rserve.port=6311-Ddataverse.rserve.user=rserve-Ddataverse.rserve.password=rserve-Ddataverse.auth.password-reset-timeout-in-minutes=60-Ddataverse.timerServer=true-Ddataverse.fqdn=dev1.dataverse.org-Ddataverse.siteUrl=https://dev1.dataverse.org-Ddataverse.files.storage-driver-id=file-Ddoi.username=testaccount-Ddoi.password=notmypassword-Ddoi.baseurlstring=https://mds.test.datacite.org/-Ddoi.dataciterestapiurlstring=https://api.test.datacite.org Date: Thu, 2 Jan 2025 10:03:12 -0500 Subject: [PATCH 08/20] update 6.2024.6 -> 6.2024.12 --- doc/sphinx-guides/source/developers/classic-dev-env.rst | 6 +++--- doc/sphinx-guides/source/installation/prerequisites.rst | 6 +++--- doc/sphinx-guides/source/qa/test-automation.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/sphinx-guides/source/developers/classic-dev-env.rst b/doc/sphinx-guides/source/developers/classic-dev-env.rst index d305019004e..17a6f6df4a6 100755 --- a/doc/sphinx-guides/source/developers/classic-dev-env.rst +++ b/doc/sphinx-guides/source/developers/classic-dev-env.rst @@ -93,15 +93,15 @@ On Linux, install ``jq`` from your package manager or download a binary from htt Install Payara ~~~~~~~~~~~~~~ -Payara 6.2024.6 or higher is required. +Payara 6.2024.12 or higher is required. To install Payara, run the following commands: ``cd /usr/local`` -``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.6/payara-6.2024.6.zip`` +``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip`` -``sudo unzip payara-6.2024.6.zip`` +``sudo unzip payara-6.2024.12.zip`` ``sudo chown -R $USER /usr/local/payara6`` diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index f61321ef245..bc6a6d44b89 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -44,7 +44,7 @@ On RHEL/derivative you can make Java 17 the default with the ``alternatives`` co Payara ------ -Payara 6.2024.6 is recommended. Newer versions might work fine. Regular updates are recommended. +Payara 6.2024.12 is recommended. Newer versions might work fine. Regular updates are recommended. Installing Payara ================= @@ -55,8 +55,8 @@ Installing Payara - Download and install Payara (installed in ``/usr/local/payara6`` in the example commands below):: - # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.6/payara-6.2024.6.zip - # unzip payara-6.2024.6.zip + # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip + # unzip payara-6.2024.12.zip # mv payara6 /usr/local If nexus.payara.fish is ever down for maintenance, Payara distributions are also available from https://repo1.maven.org/maven2/fish/payara/distributions/payara/ diff --git a/doc/sphinx-guides/source/qa/test-automation.md b/doc/sphinx-guides/source/qa/test-automation.md index fe0d51f9174..58945de7f91 100644 --- a/doc/sphinx-guides/source/qa/test-automation.md +++ b/doc/sphinx-guides/source/qa/test-automation.md @@ -52,7 +52,7 @@ Go to the end of the log and then scroll up, looking for the failure. A failed A ``` TASK [dataverse : download payara zip] ***************************************** -fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.6/payara-6.2024.6.zip"} +fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip"} ``` In the example above, if Payara can't be downloaded, we're obviously going to have problems deploying Dataverse to it! From 1b8c2dbda5442fdaefcf74493658684b8408ced7 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 2 Jan 2025 15:02:46 -0500 Subject: [PATCH 09/20] convert to /> form --- conf/payara/domain.xml | 96 +++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/conf/payara/domain.xml b/conf/payara/domain.xml index af528d28ac2..d30e530049d 100644 --- a/conf/payara/domain.xml +++ b/conf/payara/domain.xml @@ -45,25 +45,25 @@ - + - - + + - - + + - + @@ -77,20 +77,20 @@ - - - - - - + + + + + + - - - - + + + + @@ -128,20 +128,20 @@ - + log-notifier - + - + log-notifier - + log-notifier @@ -150,7 +150,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -204,10 +204,10 @@ - - - - + + + + @@ -305,34 +305,34 @@ - + - + - + - + - - - + + + - + - - + + @@ -394,7 +394,7 @@ - + @@ -438,13 +438,13 @@ log-notifier - + - + log-notifier - + log-notifier @@ -559,17 +559,17 @@ - + - + - + - - + + @@ -586,7 +586,7 @@ - + @@ -605,7 +605,7 @@ - - + + From 7513bc8894a94ed41facff6d2597f64242db3908 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 2 Jan 2025 15:09:09 -0500 Subject: [PATCH 10/20] match payara formatting --- conf/payara/domain.xml | 74 +++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/conf/payara/domain.xml b/conf/payara/domain.xml index d30e530049d..429b98dab90 100644 --- a/conf/payara/domain.xml +++ b/conf/payara/domain.xml @@ -45,25 +45,25 @@ - + - - + + - - + + - + @@ -128,20 +128,20 @@ - + log-notifier - + - + log-notifier - + log-notifier @@ -164,7 +164,7 @@ - + @@ -204,10 +204,10 @@ - - - - + + + + @@ -305,34 +305,34 @@ - + - + - + - + - - - + + + - + - - + + @@ -394,7 +394,7 @@ - + @@ -438,13 +438,13 @@ log-notifier - + - + log-notifier - + log-notifier @@ -559,17 +559,17 @@ - + - + - + - - + + @@ -586,7 +586,7 @@ - + @@ -605,7 +605,7 @@ - - + + From 1f2ffc6eb3d4cb5eb23d12bb2fb14e78fa06298a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 2 Jan 2025 15:16:36 -0500 Subject: [PATCH 11/20] add jk-connector --- conf/payara/domain.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/payara/domain.xml b/conf/payara/domain.xml index 429b98dab90..1e9cd06d729 100644 --- a/conf/payara/domain.xml +++ b/conf/payara/domain.xml @@ -108,7 +108,7 @@ - + @@ -325,6 +325,7 @@ + From 5e685695cf9ca4cd587f5378bfa28a352a0edce1 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 2 Jan 2025 17:01:37 -0500 Subject: [PATCH 12/20] release note updates/simplify --- doc/release-notes/6.2024.12update.md | 81 ++++++++++++++++++---------- 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/doc/release-notes/6.2024.12update.md b/doc/release-notes/6.2024.12update.md index d5ee047149f..766d6471534 100644 --- a/doc/release-notes/6.2024.12update.md +++ b/doc/release-notes/6.2024.12update.md @@ -2,53 +2,80 @@ ## Installation -Change Install instructions - tbd +The following assumes the standard instructions to undeploy v6.5, stop payara, `export PAYARA=/usr/local/payara6`, etc. have been done already. ### Upgrade to Payara 6.2024.12 -If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user. +Option 1: +The steps below reuse your existing domain directory with the new distribution. You may also want to review the Payara upgrade instructions as it could be helpful during any troubleshooting: +[Payara Release Notes](https://docs.payara.fish/community/docs/Release%20Notes/Release%20Notes%206.2024.12.html). +We also recommend you ensure you followed all update instructions from the past releases regarding Payara. +(The most recent Payara update was for [v6.3](https://github.com/IQSS/dataverse/releases/tag/v6.3).) + +Move the current Payara directory out of the way: + +```shell +mv $PAYARA $PAYARA.6.2024.6 +``` + +Download the new Payara version 6.2024.12 (from https://www.payara.fish/downloads/payara-platform-community-edition/), and unzip it in its place: + +```shell +cd /usr/local +unzip payara-6.2024.12.zip +``` + +Replace the brand new `payara/glassfish/domains/domain1` with your old, preserved domain1: + +```shell +mv payara6/glassfish/domains/domain1 payara6/glassfish/domains/domain1_DIST +mv payara6-2024.6/glassfish/domains/domain1 payara6/glassfish/domains/ +``` + +Deploy/install as normal + +Option2 : Modify the default 6.2024.12 domain1 configuration for your Dataverse instance. (Removes obsolete options, gets updated certificate store, makes tracking your Dataverse-specific changes relative to the the Payara default easier.) 1. Stop Payara 6, if running. `` sudo -u dataverse /usr/local/payara6/bin/asadmin stop-domain `` -1. Move it to a backup directory - - `sudo -u dataverse mv /usr/local/payara6 /usr/local/payara6.old` - -1. Download Payara 6.2024.12 +1. Move your existing payara installation to a backup directory - `curl -L -O https://nexus.payara.fish/repository/payara- community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip` +```shell +mv $PAYARA $PAYARA.6.2024.6 +``` -1. Unzip it to /usr/local (or your preferred location) +1. Download Payara 6.2024.12 and unzip it - `sudo unzip payara-6.2024.12.zip -d /usr/local/` +```shell + cd /usr/local + curl -L -O https://nexus.payara.fish/repository/payara- community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip + unzip payara-6.2024.12.zip +``` 1. Change ownership of the unzipped Payara to your "service" user ("dataverse" by default) `sudo chown -R dataverse /usr/local/payara6` - + 1. Create a Dataverse-specific domain.xml file - i. Move the existing domain.xml file to a backup location + i. Make a copy of the default domain.xml file (to be able to compare against later) ``sudo -u dataverse cp /usr/local/payara6/glassfish/domains/domain1/config/domain.xml /usr/local/payara6/glassfish/domains/domain1/config/domain.xml.orig`` ii. Retrieve the domain.xml file for this version of Dataverse - `curl https://github.com/IQSS/dataverse/raw/refs/tags/v6.6/conf/payara/domain.xml` - - - iii. Move it into domain1 of your Payara 6.2024.12 install: - - `sudo -u dataverse cp domain.xml /usr/local/payara6/glassfish/domains/domain1/config/domain.xml` - +```shell + cd /usr/local + curl https://github.com/IQSS/dataverse/raw/refs/tags/v6.6/conf/payara/domain.xml +``` - iv. Copy Dataverse-related lines from your existing domain.xml to sections of the new domain.xml highlighted by `Dataverse-instance-specific` comments + iii. Copy Dataverse-related lines from your existing domain.xml to sections of the new domain.xml highlighted by `Dataverse-instance-specific` comments - `sudo egrep 'dataverse|doi|Xmx' /usr/local/payara5/glassfish/domains/domain1/config/domain.xml > lines.txt` + `sudo egrep 'dataverse|doi|Xmx' /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/config/domain.xml > lines.txt` `sudo vi /usr/local/payara6/glassfish/domains/domain1/config/domain.xml` @@ -154,12 +181,12 @@ If you are running Payara as a non-root user (and you should be!), **remember no `jhove.conf` and `jhoveConfig.xsd` - `sudo cp /usr/local/payara6.old/glassfish/domains/domain1/config/jhove* /usr/local/payara6/glassfish/domains/domain1/config/` + `sudo cp /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/config/jhove* /usr/local/payara6/glassfish/domains/domain1/config/` ii. Replace the default `domain-passwords` files with yours - `sudo cp /usr/local/payara6.old/glassfish/domains/domain1/config/domain-passwords /usr/local/payara6/glassfish/domains/domain1/config/` + `sudo cp /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/config/domain-passwords /usr/local/payara6/glassfish/domains/domain1/config/` iii. Optional: add any dataverse specific lines in your existing logging.properties file to the default one @@ -172,10 +199,10 @@ If you are running Payara as a non-root user (and you should be!), **remember no 1. Copy/move logos and other files from from your old domain to the new one, e.g. - `sudo -u dataverse mv -r /usr/local/payara6.old/glassfish/domains/domain1/docroot/logos /usr/local/payara6/glassfish/domains/domain1/docroot` + `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/docroot/logos /usr/local/payara6/glassfish/domains/domain1/docroot` - `sudo -u dataverse mv -r /usr/local/payara6.old/glassfish/domains/domain1/docroot/sitemap /usr/local/payara6/glassfish/domains/domain1/docroot` + `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/docroot/sitemap /usr/local/payara6/glassfish/domains/domain1/docroot` - `sudo -u dataverse mv -r /usr/local/payara6.old/glassfish/domains/domain1/files /usr/local/payara6/glassfish/domains/domain1` + `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/files /usr/local/payara6/glassfish/domains/domain1` - `sudo -u dataverse mv -r /usr/local/payara6.old/glassfish/domains/domain1/logs /usr/local/payara6/glassfish/domains/logs` \ No newline at end of file + `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/logs /usr/local/payara6/glassfish/domains/logs` \ No newline at end of file From f9f1bc40cfeca8c27518b2ac7aeefc9ccfea3dcc Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 8 Jan 2025 12:49:46 -0500 Subject: [PATCH 13/20] cp whole docroot in option2 --- doc/release-notes/6.2024.12update.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/release-notes/6.2024.12update.md b/doc/release-notes/6.2024.12update.md index 766d6471534..e929426736c 100644 --- a/doc/release-notes/6.2024.12update.md +++ b/doc/release-notes/6.2024.12update.md @@ -199,10 +199,8 @@ mv $PAYARA $PAYARA.6.2024.6 1. Copy/move logos and other files from from your old domain to the new one, e.g. - `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/docroot/logos /usr/local/payara6/glassfish/domains/domain1/docroot` + `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/docroot /usr/local/payara6/glassfish/domains/domain1` - `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/docroot/sitemap /usr/local/payara6/glassfish/domains/domain1/docroot` - `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/files /usr/local/payara6/glassfish/domains/domain1` `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/logs /usr/local/payara6/glassfish/domains/logs` \ No newline at end of file From c688b928dfedc61b02cce14b52f6e9ae2d7ca7a0 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Wed, 22 Jan 2025 14:41:59 -0500 Subject: [PATCH 14/20] #11126 bump to Payara-6.2025.1 --- ...{6.2024.12update.md => 6.2025.1_update.md} | 20 +++++++++---------- .../source/developers/classic-dev-env.rst | 6 +++--- .../source/installation/prerequisites.rst | 6 +++--- .../source/qa/test-automation.md | 2 +- modules/dataverse-parent/pom.xml | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) rename doc/release-notes/{6.2024.12update.md => 6.2025.1_update.md} (89%) diff --git a/doc/release-notes/6.2024.12update.md b/doc/release-notes/6.2025.1_update.md similarity index 89% rename from doc/release-notes/6.2024.12update.md rename to doc/release-notes/6.2025.1_update.md index e929426736c..91db735132a 100644 --- a/doc/release-notes/6.2024.12update.md +++ b/doc/release-notes/6.2025.1_update.md @@ -1,15 +1,15 @@ -- Payara application server has been upgraded to version 6.2024.12. +- Payara application server has been upgraded to version 6.2025.1. ## Installation The following assumes the standard instructions to undeploy v6.5, stop payara, `export PAYARA=/usr/local/payara6`, etc. have been done already. -### Upgrade to Payara 6.2024.12 +### Upgrade to Payara 6.2025.1 Option 1: The steps below reuse your existing domain directory with the new distribution. You may also want to review the Payara upgrade instructions as it could be helpful during any troubleshooting: -[Payara Release Notes](https://docs.payara.fish/community/docs/Release%20Notes/Release%20Notes%206.2024.12.html). +[Payara Release Notes](https://docs.payara.fish/community/docs/6.2025.1/Release%20Notes/Release%20Notes%206.2025.1.html). We also recommend you ensure you followed all update instructions from the past releases regarding Payara. (The most recent Payara update was for [v6.3](https://github.com/IQSS/dataverse/releases/tag/v6.3).) @@ -19,11 +19,11 @@ Move the current Payara directory out of the way: mv $PAYARA $PAYARA.6.2024.6 ``` -Download the new Payara version 6.2024.12 (from https://www.payara.fish/downloads/payara-platform-community-edition/), and unzip it in its place: +Download the new Payara version 6.2025.1 (from https://www.payara.fish/downloads/payara-platform-community-edition/), and unzip it in its place: ```shell cd /usr/local -unzip payara-6.2024.12.zip +unzip payara-6.2025.1.zip ``` Replace the brand new `payara/glassfish/domains/domain1` with your old, preserved domain1: @@ -35,7 +35,7 @@ mv payara6-2024.6/glassfish/domains/domain1 payara6/glassfish/domains/ Deploy/install as normal -Option2 : Modify the default 6.2024.12 domain1 configuration for your Dataverse instance. (Removes obsolete options, gets updated certificate store, makes tracking your Dataverse-specific changes relative to the the Payara default easier.) +Option2 : Modify the default 6.2025.1 domain1 configuration for your Dataverse instance. (Removes obsolete options, gets updated certificate store, makes tracking your Dataverse-specific changes relative to the the Payara default easier.) 1. Stop Payara 6, if running. @@ -48,12 +48,12 @@ Option2 : Modify the default 6.2024.12 domain1 configuration for your Dataverse mv $PAYARA $PAYARA.6.2024.6 ``` -1. Download Payara 6.2024.12 and unzip it +1. Download Payara 6.2025.1 and unzip it ```shell cd /usr/local - curl -L -O https://nexus.payara.fish/repository/payara- community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip - unzip payara-6.2024.12.zip + curl -L -O https://nexus.payara.fish/repository/payara- community/fish/payara/distributions/payara/6.2025.1/payara-6.2025.1.zip + unzip payara-6.2025.1.zip ``` 1. Change ownership of the unzipped Payara to your "service" user ("dataverse" by default) @@ -203,4 +203,4 @@ mv $PAYARA $PAYARA.6.2024.6 `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/files /usr/local/payara6/glassfish/domains/domain1` - `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/logs /usr/local/payara6/glassfish/domains/logs` \ No newline at end of file + `sudo -u dataverse mv -r /usr/local/$PAYARA.6.2024.6/glassfish/domains/domain1/logs /usr/local/payara6/glassfish/domains/logs` diff --git a/doc/sphinx-guides/source/developers/classic-dev-env.rst b/doc/sphinx-guides/source/developers/classic-dev-env.rst index 17a6f6df4a6..9fc8463219d 100755 --- a/doc/sphinx-guides/source/developers/classic-dev-env.rst +++ b/doc/sphinx-guides/source/developers/classic-dev-env.rst @@ -93,15 +93,15 @@ On Linux, install ``jq`` from your package manager or download a binary from htt Install Payara ~~~~~~~~~~~~~~ -Payara 6.2024.12 or higher is required. +Payara 6.2025.1 or higher is required. To install Payara, run the following commands: ``cd /usr/local`` -``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip`` +``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.1/payara-6.2025.1.zip`` -``sudo unzip payara-6.2024.12.zip`` +``sudo unzip payara-6.2025.1.zip`` ``sudo chown -R $USER /usr/local/payara6`` diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index bc6a6d44b89..400c7c975b0 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -44,7 +44,7 @@ On RHEL/derivative you can make Java 17 the default with the ``alternatives`` co Payara ------ -Payara 6.2024.12 is recommended. Newer versions might work fine. Regular updates are recommended. +Payara 6.2025.1 is recommended. Newer versions might work fine. Regular updates are recommended. Installing Payara ================= @@ -55,8 +55,8 @@ Installing Payara - Download and install Payara (installed in ``/usr/local/payara6`` in the example commands below):: - # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip - # unzip payara-6.2024.12.zip + # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.1/payara-6.2025.1.zip + # unzip payara-6.2025.1.zip # mv payara6 /usr/local If nexus.payara.fish is ever down for maintenance, Payara distributions are also available from https://repo1.maven.org/maven2/fish/payara/distributions/payara/ diff --git a/doc/sphinx-guides/source/qa/test-automation.md b/doc/sphinx-guides/source/qa/test-automation.md index 58945de7f91..0c003979fdc 100644 --- a/doc/sphinx-guides/source/qa/test-automation.md +++ b/doc/sphinx-guides/source/qa/test-automation.md @@ -52,7 +52,7 @@ Go to the end of the log and then scroll up, looking for the failure. A failed A ``` TASK [dataverse : download payara zip] ***************************************** -fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2024.12/payara-6.2024.12.zip"} +fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.1/payara-6.2025.1.zip"} ``` In the example above, if Payara can't be downloaded, we're obviously going to have problems deploying Dataverse to it! diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index d9b9a4ec137..073da72ba8d 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -148,7 +148,7 @@ -Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region} - 6.2024.12 + 6.2025.1 42.7.4 9.4.1 1.12.748 From 2e71bc3eaddaa5467d5a1833a2365568d47641c8 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 22 Jan 2025 15:00:26 -0500 Subject: [PATCH 15/20] updated for 6.2025.1 --- conf/payara/domain.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/payara/domain.xml b/conf/payara/domain.xml index 1e9cd06d729..9971ef5ca39 100644 --- a/conf/payara/domain.xml +++ b/conf/payara/domain.xml @@ -605,8 +605,8 @@ - + - + \ No newline at end of file From de787ba90fb7d319660263dae26be04f5fd03fc4 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Tue, 28 Jan 2025 13:47:10 -0500 Subject: [PATCH 16/20] #11126 per qqmyers we want curl -L -O --- doc/release-notes/6.2025.1_update.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/6.2025.1_update.md b/doc/release-notes/6.2025.1_update.md index 91db735132a..efd9dea902a 100644 --- a/doc/release-notes/6.2025.1_update.md +++ b/doc/release-notes/6.2025.1_update.md @@ -70,7 +70,7 @@ mv $PAYARA $PAYARA.6.2024.6 ```shell cd /usr/local - curl https://github.com/IQSS/dataverse/raw/refs/tags/v6.6/conf/payara/domain.xml + curl -L -O https://github.com/IQSS/dataverse/raw/refs/tags/v6.6/conf/payara/domain.xml ``` iii. Copy Dataverse-related lines from your existing domain.xml to sections of the new domain.xml highlighted by `Dataverse-instance-specific` comments From 522a19cd9f6eadeb19ba18568a87f841f848d304 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 Jan 2025 16:55:38 -0500 Subject: [PATCH 17/20] rearrange f:metadata for dataset, dataverse --- src/main/webapp/dataset.xhtml | 7 +++++-- src/main/webapp/dataverse.xhtml | 6 ++++-- src/main/webapp/dataverse_template.xhtml | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 9426884d349..b60a6fac88c 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -103,7 +103,8 @@ - + + @@ -123,7 +124,9 @@ - + + + diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml index d452f76c9cd..4ffac1c24b3 100644 --- a/src/main/webapp/dataverse.xhtml +++ b/src/main/webapp/dataverse.xhtml @@ -18,8 +18,7 @@ - - + @@ -49,6 +48,9 @@ + + + diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml index a1f22a97642..15f924829be 100644 --- a/src/main/webapp/dataverse_template.xhtml +++ b/src/main/webapp/dataverse_template.xhtml @@ -11,6 +11,7 @@ lang="#{dataverseSession.localeCode}" xml:lang="#{dataverseSession.localeCode}"> + From 9211d8e691b85060ca9ee1a44153105337104d0a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 30 Jan 2025 13:19:12 -0500 Subject: [PATCH 18/20] move f:metadata to be child of view in the rest using dataverse-template --- src/main/webapp/ThemeAndWidgets.xhtml | 4 +++- src/main/webapp/dataset-widgets.xhtml | 4 +++- src/main/webapp/dataverse_homepage.xhtml | 4 +++- src/main/webapp/dataverse_template.xhtml | 4 ++-- src/main/webapp/dataverseuser.xhtml | 21 +++++++++++--------- src/main/webapp/editdatafiles.xhtml | 4 +++- src/main/webapp/file.xhtml | 4 +++- src/main/webapp/guestbook.xhtml | 5 +++-- src/main/webapp/mydata_page.xhtml | 4 +++- src/main/webapp/passwordreset.xhtml | 6 ++++-- src/main/webapp/previewurl.xhtml | 2 +- src/main/webapp/privateurl.xhtml | 2 +- src/main/webapp/role_permission_helper.xhtml | 4 +++- src/main/webapp/superuser.xhtml | 4 +++- src/main/webapp/template.xhtml | 4 +++- 15 files changed, 50 insertions(+), 26 deletions(-) diff --git a/src/main/webapp/ThemeAndWidgets.xhtml b/src/main/webapp/ThemeAndWidgets.xhtml index fd8d7c7cf12..cde8b720aef 100644 --- a/src/main/webapp/ThemeAndWidgets.xhtml +++ b/src/main/webapp/ThemeAndWidgets.xhtml @@ -15,12 +15,14 @@ - + + + diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml index f635099dfdb..ed551a1676f 100644 --- a/src/main/webapp/dataset-widgets.xhtml +++ b/src/main/webapp/dataset-widgets.xhtml @@ -15,13 +15,15 @@ - + + + diff --git a/src/main/webapp/dataverse_homepage.xhtml b/src/main/webapp/dataverse_homepage.xhtml index bbf03ea22ad..f12fb40ae68 100644 --- a/src/main/webapp/dataverse_homepage.xhtml +++ b/src/main/webapp/dataverse_homepage.xhtml @@ -14,12 +14,14 @@ - + + + diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml index 15f924829be..719a59674a9 100644 --- a/src/main/webapp/dataverse_template.xhtml +++ b/src/main/webapp/dataverse_template.xhtml @@ -11,9 +11,9 @@ lang="#{dataverseSession.localeCode}" xml:lang="#{dataverseSession.localeCode}"> - + - + <h:outputText value="#{pageTitle}"/> diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index bcb71733716..32cc5b7492f 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -17,6 +17,17 @@ + + + + + + + + + + +
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml index 835764d9cf5..689b3ec5737 100644 --- a/src/main/webapp/file.xhtml +++ b/src/main/webapp/file.xhtml @@ -25,7 +25,7 @@ - + @@ -36,6 +36,8 @@ + +
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml index 3528ff5f032..04bf30614fe 100644 --- a/src/main/webapp/guestbook.xhtml +++ b/src/main/webapp/guestbook.xhtml @@ -15,7 +15,7 @@ - + @@ -24,7 +24,8 @@ - + + diff --git a/src/main/webapp/mydata_page.xhtml b/src/main/webapp/mydata_page.xhtml index b8c70f16079..084a482f0f7 100644 --- a/src/main/webapp/mydata_page.xhtml +++ b/src/main/webapp/mydata_page.xhtml @@ -15,11 +15,13 @@ - + + + diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml index 4ffbdf21e08..e475f870394 100644 --- a/src/main/webapp/passwordreset.xhtml +++ b/src/main/webapp/passwordreset.xhtml @@ -14,13 +14,15 @@ - + + - + +
diff --git a/src/main/webapp/previewurl.xhtml b/src/main/webapp/previewurl.xhtml index 980d775506b..c9e2ffeedfa 100644 --- a/src/main/webapp/previewurl.xhtml +++ b/src/main/webapp/previewurl.xhtml @@ -12,7 +12,7 @@ - + diff --git a/src/main/webapp/privateurl.xhtml b/src/main/webapp/privateurl.xhtml index 5ca90112a84..a1bac00534e 100644 --- a/src/main/webapp/privateurl.xhtml +++ b/src/main/webapp/privateurl.xhtml @@ -12,7 +12,7 @@ - + diff --git a/src/main/webapp/role_permission_helper.xhtml b/src/main/webapp/role_permission_helper.xhtml index 88430a8ad81..cd2504089cf 100644 --- a/src/main/webapp/role_permission_helper.xhtml +++ b/src/main/webapp/role_permission_helper.xhtml @@ -12,7 +12,7 @@ - + @@ -24,6 +24,8 @@ + +

Related roles for each DvObject type

diff --git a/src/main/webapp/superuser.xhtml b/src/main/webapp/superuser.xhtml index bc7426948b7..3c4212dcf92 100644 --- a/src/main/webapp/superuser.xhtml +++ b/src/main/webapp/superuser.xhtml @@ -13,11 +13,13 @@ - + + +