diff --git a/build/debian/openfire.init.d b/build/debian/openfire.init.d index 5f182a12f0..3fafa06165 100644 --- a/build/debian/openfire.init.d +++ b/build/debian/openfire.init.d @@ -46,6 +46,7 @@ test -x $JAVA || exit 1 DAEMON_OPTS="$DAEMON_OPTS -server -DopenfireHome=${DAEMON_DIR} \ -Dlog4j.configurationFile=${DAEMON_LIB}/log4j2.xml \ + -Dlog4j2.formatMsgNoLookups=true \ -Dopenfire.lib.dir=${DAEMON_LIB} -classpath ${DAEMON_LIB}/startup.jar\ -jar ${DAEMON_LIB}/startup.jar" diff --git a/distribution/src/bin/extra/openfire-launchd-wrapper.sh b/distribution/src/bin/extra/openfire-launchd-wrapper.sh index 9378aeb5f8..60f9391643 100644 --- a/distribution/src/bin/extra/openfire-launchd-wrapper.sh +++ b/distribution/src/bin/extra/openfire-launchd-wrapper.sh @@ -12,7 +12,7 @@ function shutdown() date echo "Starting Openfire" -/usr/bin/java -server -jar "$OPENFIRE_HOME/lib/startup.jar" -Dlog4j.configurationFile=$$OPENFIRE_HOME/lib/log4j2.xml -Dopenfire.lib.dir=/usr/local/openfire/lib& +/usr/bin/java -server -jar "$OPENFIRE_HOME/lib/startup.jar" -Dlog4j.configurationFile=$$OPENFIRE_HOME/lib/log4j2.xml -Dlog4j2.formatMsgNoLookups=true -Dopenfire.lib.dir=/usr/local/openfire/lib& OPENFIRE_PID=`ps auxww | grep -v wrapper | awk '/openfire/ && !/awk/ {print $2}'` diff --git a/distribution/src/bin/extra/redhat/openfire b/distribution/src/bin/extra/redhat/openfire index c8b98dbcc9..cb1b6eef0c 100644 --- a/distribution/src/bin/extra/redhat/openfire +++ b/distribution/src/bin/extra/redhat/openfire @@ -98,7 +98,7 @@ else LOCALCLASSPATH="${OPENFIRE_LIB}/startup.jar:${LOCALCLASSPATH}" fi -JAVACMD="${JAVACMD} -Dlog4j.configurationFile=${OPENFIRE_LIB}/log4j2.xml" +JAVACMD="${JAVACMD} -Dlog4j.configurationFile=${OPENFIRE_LIB}/log4j2.xml -Dlog4j2.formatMsgNoLookups=true" # Export any necessary variables export JAVA_HOME JAVACMD diff --git a/distribution/src/bin/openfire.bat b/distribution/src/bin/openfire.bat index 593e8f169b..ccbbda8e98 100644 --- a/distribution/src/bin/openfire.bat +++ b/distribution/src/bin/openfire.bat @@ -16,7 +16,7 @@ goto end :run SET debug= if "%1" == "-debug" SET debug=-Xdebug -Xint -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -start "Openfire" "%JAVA_HOME%\bin\java" %debug% -server -Djdk.tls.ephemeralDHKeySize=matched -Djsse.SSLEngine.acceptLargeFragments=true -DopenfireHome="%OPENFIRE_HOME%" -Dlog4j.configurationFile="%OPENFIRE_HOME%\lib\log4j2.xml" -Dopenfire.lib.dir="%OPENFIRE_HOME%\lib" -jar "%OPENFIRE_HOME%\lib\startup.jar" +start "Openfire" "%JAVA_HOME%\bin\java" %debug% -server -Djdk.tls.ephemeralDHKeySize=matched -Djsse.SSLEngine.acceptLargeFragments=true -DopenfireHome="%OPENFIRE_HOME%" -Dlog4j.configurationFile="%OPENFIRE_HOME%\lib\log4j2.xml" -Dlog4j2.formatMsgNoLookups=true -Dopenfire.lib.dir="%OPENFIRE_HOME%\lib" -jar "%OPENFIRE_HOME%\lib\startup.jar" goto end :end diff --git a/distribution/src/bin/openfire.sh b/distribution/src/bin/openfire.sh index 4742b671b7..3967124053 100644 --- a/distribution/src/bin/openfire.sh +++ b/distribution/src/bin/openfire.sh @@ -132,7 +132,7 @@ esac done -JAVACMD="${JAVACMD} -Dlog4j.configurationFile=${OPENFIRE_LIB}/log4j2.xml -Djdk.tls.ephemeralDHKeySize=matched -Djsse.SSLEngine.acceptLargeFragments=true" +JAVACMD="${JAVACMD} -Dlog4j.configurationFile=${OPENFIRE_LIB}/log4j2.xml -Dlog4j2.formatMsgNoLookups=true -Djdk.tls.ephemeralDHKeySize=matched -Djsse.SSLEngine.acceptLargeFragments=true" if [ -z "$LOCALCLASSPATH" ] ; then LOCALCLASSPATH=$OPENFIRE_LIB/startup.jar diff --git a/distribution/src/bin/openfirectl b/distribution/src/bin/openfirectl index b865e4669d..9d492a45d0 100644 --- a/distribution/src/bin/openfirectl +++ b/distribution/src/bin/openfirectl @@ -107,7 +107,7 @@ else LOCALCLASSPATH="${OPENFIRE_LIB}/startup.jar:${LOCALCLASSPATH}" fi -JAVACMD="${JAVACMD} -Dlog4j.configurationFile=${OPENFIRE_LIB}/log4j2.xml" +JAVACMD="${JAVACMD} -Dlog4j.configurationFile=${OPENFIRE_LIB}/log4j2.xml -Dlog4j2.formatMsgNoLookups=true" # Export any necessary variables export JAVA_HOME JAVACMD diff --git a/distribution/src/installer/openfire.install4j b/distribution/src/installer/openfire.install4j index 16f2cd12dd..51cf1aca65 100644 --- a/distribution/src/installer/openfire.install4j +++ b/distribution/src/installer/openfire.install4j @@ -1,789 +1,789 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 255 - 255 - 255 - 255 - - - - - - ./images/logo_small.png - - - - - - - - - - - - - - - - - - - - - - - - - context.getBooleanVariable("sys.confirmedUpdateInstallation") - - - - - - ${form:welcomeMessage} - - !context.isConsole() - - - - - - String message = context.getMessage("ConsoleWelcomeLabel", context.getApplicationName()); -return console.askOkCancel(message, true); - - - - - - - - updateCheck - - - - - ${i18n:ClickNext} - - - - - - - - - ${i18n:LicenseLabel3} - - - - - - - - en - - ${compiler:RELEASE_FULL_PATH}/LICENSE.html - - - - - - - - textSource - displayedText - displayedTextFile - variableName - acceptInitiallySelected - readAllRequired - - - - - - !context.getBooleanVariable("sys.confirmedUpdateInstallation") - - - - ${i18n:SelectDirLabel(${compiler:sys.fullName})} - - - - - - - - - suggestAppDir - validateApplicationId - existingDirWarning - checkWritable - manualEntryAllowed - checkFreeSpace - showRequiredDiskSpace - showFreeDiskSpace - allowSpacesOnUnix - validationScript - standardValidation - - - - - - - - - ${i18n:SelectComponentsLabel2} - - !context.isConsole() - - - - - - - selectionChangedScript - - - - - - - ${compiler:sys.fullName} - - !context.getBooleanVariable("sys.confirmedUpdateInstallation") - - - - - - ${i18n:SelectAssociationsLabel} - - - - - - - - showSelectionButtons - selectionButtonPosition - - - - - - - - - - - - - - bin/openfire.sh - - - - 755 - - - - - - ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} - - !context.getBooleanVariable("sys.programGroupDisabled") - - - - ${compiler:sys.fullName} ${compiler:sys.version} - - - - - Openfire Service - 2 - - - - - - - ${i18n:WizardPreparing} - - - - - - - - - - 2 - - context.getBooleanVariable("executeLauncherAction") && (!context.isUnattended()) - - - - http://localhost:9090 - - context.getBooleanVariable("executeLauncherAction") && (!context.isUnattended()) - - - - - - ${form:finishedMessage} - - - - - Start Openfire Service - - executeLauncherAction - - - - - - - - - ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} - - - - - - - - - - 255 - 255 - 255 - 255 - - - - - - ./images/logo_small.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${form:welcomeMessage} - - !context.isConsole() - - - - - - String message = context.getMessage("ConfirmUninstall", context.getApplicationName()); -return console.askYesNo(message, true); - - - - - - - - - - - - 2 - - - - - - - - - lib - - - - - - - - - - - ${i18n:UninstallerPreparing} - - - - - - - - - - ${form:successMessage} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 255 + 255 + 255 + 255 + + + + + + ./images/logo_small.png + + + + + + + + + + + + + + + + + + + + + + + + + context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConsoleWelcomeLabel", context.getApplicationName()); +return console.askOkCancel(message, true); + + + + + + + + updateCheck + + + + + ${i18n:ClickNext} + + + + + + + + + ${i18n:LicenseLabel3} + + + + + + + + en + + ${compiler:RELEASE_FULL_PATH}/LICENSE.html + + + + + + + + textSource + displayedText + displayedTextFile + variableName + acceptInitiallySelected + readAllRequired + + + + + + !context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + ${i18n:SelectDirLabel(${compiler:sys.fullName})} + + + + + + + + + suggestAppDir + validateApplicationId + existingDirWarning + checkWritable + manualEntryAllowed + checkFreeSpace + showRequiredDiskSpace + showFreeDiskSpace + allowSpacesOnUnix + validationScript + standardValidation + + + + + + + + + ${i18n:SelectComponentsLabel2} + + !context.isConsole() + + + + + + + selectionChangedScript + + + + + + + ${compiler:sys.fullName} + + !context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + + ${i18n:SelectAssociationsLabel} + + + + + + + + showSelectionButtons + selectionButtonPosition + + + + + + + + + + + + + + bin/openfire.sh + + + + 755 + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + !context.getBooleanVariable("sys.programGroupDisabled") + + + + ${compiler:sys.fullName} ${compiler:sys.version} + + + + + Openfire Service + 2 + + + + + + + ${i18n:WizardPreparing} + + + + + + + + + + 2 + + context.getBooleanVariable("executeLauncherAction") && (!context.isUnattended()) + + + + http://localhost:9090 + + context.getBooleanVariable("executeLauncherAction") && (!context.isUnattended()) + + + + + + ${form:finishedMessage} + + + + + Start Openfire Service + + executeLauncherAction + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + + + + + + + + + 255 + 255 + 255 + 255 + + + + + + ./images/logo_small.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConfirmUninstall", context.getApplicationName()); +return console.askYesNo(message, true); + + + + + + + + + + + + 2 + + + + + + + + + lib + + + + + + + + + + + ${i18n:UninstallerPreparing} + + + + + + + + + + ${form:successMessage} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +