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.

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

bump to payara-5.2020.2 per @scolapasta, remove JSF patch #7036

Merged
merged 3 commits into from
Jun 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions doc/sphinx-guides/source/installation/installation-main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ This allows the installer to be run in non-interactive mode (with ``./install -y

All the Payara configuration tasks performed by the installer are isolated in the shell script ``dvinstall/as-setup.sh`` (as ``asadmin`` commands).

The installer patches the app server, copying ``jakarta.faces_dv.jar`` into ``/usr/local/payara5/glassfish/modules``. For details on this patch, see https://github.com/eclipse-ee4j/mojarra/issues/4647

**IMPORTANT:** As a security measure, the ``as-setup.sh`` script stores passwords as "aliases" rather than plaintext. If you change your database password, for example, you will need to update the alias with ``asadmin update-password-alias db_password_alias``, for example. Here is a list of the password aliases that are set by the installation process and entered into Payara's ``domain.xml`` file:

- ``db_password_alias``
Expand Down
6 changes: 3 additions & 3 deletions doc/sphinx-guides/source/installation/prerequisites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ If you don't want to be prompted, here is an example of the non-interactive invo
Payara
------

Payara 5.201 is recommended. Newer versions might work fine.
Payara 5.2020.2 is recommended. Newer versions might work fine.

Installing Payara
=================
Expand All @@ -56,8 +56,8 @@ Installing Payara

- Download and install Payara (installed in ``/usr/local/payara5`` in the example commands below)::

# wget --content-disposition https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/5.201/payara-5.201.zip
# unzip payara-5.201.zip
# wget https://github.com/payara/Payara/releases/download/payara-server-5.2020.2/payara-5.2020.2.zip
# unzip payara-5.2020.2.zip
# mv payara5 /usr/local

If you intend to install and run Payara under a service account (and we hope you do), chown -R the Payara hierarchy to root to protect it but give the service account access to the below directories:
Expand Down
6 changes: 0 additions & 6 deletions scripts/installer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ INSTALLER_ZIP_DIR=dvinstall
DISTRIBUTION_WAR_FILE=${INSTALLER_ZIP_DIR}/dataverse.war
GLASSFISH_SETUP_SCRIPT=${INSTALLER_ZIP_DIR}/as-setup.sh
POSTGRES_DRIVERS=${INSTALLER_ZIP_DIR}/pgdriver
JSF_PATCH_DIR=${INSTALLER_ZIP_DIR}/jsfpatch
API_SCRIPTS=${INSTALLER_ZIP_DIR}/setup-datasetfields.sh ${INSTALLER_ZIP_DIR}/setup-users.sh ${INSTALLER_ZIP_DIR}/setup-builtin-roles.sh ${INSTALLER_ZIP_DIR}/setup-dvs.sh ${INSTALLER_ZIP_DIR}/data ${INSTALLER_ZIP_DIR}/setup-identity-providers.sh ${INSTALLER_ZIP_DIR}/setup-all.sh ${INSTALLER_ZIP_DIR}/post-install-api-block.sh
DB_SCRIPT=${INSTALLER_ZIP_DIR}/reference_data.sql
JHOVE_CONFIG=${INSTALLER_ZIP_DIR}/jhove.conf
Expand Down Expand Up @@ -52,11 +51,6 @@ ${POSTGRES_DRIVERS}: pgdriver/postgresql-42.2.12.jar
@echo copying postgres driver
/bin/cp pgdriver/postgresql-42.2.12.jar ${POSTGRES_DRIVERS}

${JSF_PATCH_DIR}: jsfpatch/jakarta.faces_dv.jar
mkdir -p ${JSF_PATCH_DIR}
@echo copying jsf patch
/bin/cp jsfpatch/jakarta.faces_dv.jar ${JSF_PATCH_DIR}

${API_SCRIPTS}: ../api/setup-datasetfields.sh ../api/setup-users.sh ../api/setup-dvs.sh ../api/setup-identity-providers.sh ../api/setup-all.sh ../api/post-install-api-block.sh ../api/setup-builtin-roles.sh ../api/data ${INSTALLER_ZIP_DIR}
@echo copying api scripts
/bin/cp -R ../api/setup-datasetfields.sh ../api/setup-users.sh ../api/setup-dvs.sh ../api/setup-identity-providers.sh ../api/setup-all.sh ../api/post-install-api-block.sh ../api/setup-builtin-roles.sh ../api/data ${INSTALLER_ZIP_DIR}
Expand Down
14 changes: 0 additions & 14 deletions scripts/installer/install
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ my $API_URL = "http://localhost:8080/api";
# updated drivers may be obtained from
# https://jdbc.postgresql.org/download.html
my $postgres_jdbc = "postgresql-42.2.12.jar";
# JSF patch for Payara5:
# (a temporary measure most likely)
my $jsf_patch = "jsfpatch/jakarta.faces_dv.jar";

# 0. A few preliminary checks:

Expand Down Expand Up @@ -883,17 +880,6 @@ sub setup_appserver {

print "done!\n";

my $jsf_patch_success = copy($jsf_patch, $glassfish_dir . "/glassfish/modules" );

unless ($jsf_patch_success)
{
print "\n*********************\n";
print "ERROR! Failed to copy " . $jsf_patch . " to " . $glassfish_dir . "/glassfish/modules - check the directory permissions!\n";
exit 1;
}

print "done!\n";

print "\n*********************\n";
print "PLEASE NOTE, SOME OF THE ASADMIN COMMANDS ARE GOING TO FAIL,\n";
print "FOR EXAMPLE, IF A CONFIGURATION SETTING THAT WE ARE TRYING\n";
Expand Down
11 changes: 0 additions & 11 deletions scripts/installer/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -461,17 +461,6 @@
except:
print("Couldn't copy "+pgJdbcDriver+" into "+gfJarPath+". Check its permissions?")

# 4b2. JSF patch for Payara:

jsf_patch_path = "jsfpatch/jakarta.faces_dv.jar"

try:
# overwrite the jar file supplied with Payara:
copy2(jsf_patch_path, gfModulePath+"/jakarta.faces.jar")
print("Copied "+jsf_patch_path+" into "+gfModulePath)
except:
print("Couldn't copy "+jsf_patch_path+" into "+gfModulePath+". Check its permissions?")

# 4c. create payara admin credentials file

userHomeDir = pwd.getpwuid(os.getuid())[5]
Expand Down
Binary file removed scripts/installer/jsfpatch/jakarta.faces_dv.jar
Binary file not shown.