-
Notifications
You must be signed in to change notification settings - Fork 140
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Windows service install upgrades (#242)
* Add Java 17 to the CI/CD testing. * Enhance the windows service installer to account for file permissions. Update the documentation for windows service install. * Update the maven project support libraries to latest * Remove any quotes around the JAVA env var to avoid failures in the script * Set new version number. * New release notes * New SHA256 certs for testing * Upgrade commons-daemon * Enhance documentation on installing windows service * Remove invalid character * Implement a simpler but moreeffective script to find the installed Java version. * Updated packages * Standardise the ay the resend retry counts are tracked * Make it possible to check the version of OpenAS2 from the command line. * Fix the broken parts of the script. * Fix spelling errors * Java finder script for sharing across other scripts. * Use the common script to find Java * NIX version of find_java * Try to update the cacerts for Maven repo certificate issues * Copy cacwrts to JDK install to overcome Maven repo issues * Fix the use of multiple run statements * Fix windows stuff * More windows shell command fixes * Support searchingfor cacert due to variations on location from JDK to JDK Co-authored-by: Christopher Broderick <chris@umed.org>
- Loading branch information
1 parent
1882f1d
commit 299966a
Showing
30 changed files
with
889 additions
and
1,081 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Apache Commons Daemon | ||
| Copyright 1999-2017 The Apache Software Foundation | ||
| Copyright 1999-2021 The Apache Software Foundation | ||
|
|
||
| This product includes software developed by | ||
| The Apache Software Foundation (http://www.apache.org/). |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| #!/bin/sh | ||
| # ---------------------------------------------------------------------------- | ||
| #!/bin/sh | ||
| # OS specific support. $var _must_ be set to either true or false. | ||
| darwin=false; | ||
| case "`uname`" in | ||
| Darwin*) darwin=true | ||
| # | ||
| # Look for the Apple JDKs first to preserve the existing behaviour, and then look | ||
| # for the new JDKs provided by Oracle. | ||
| # | ||
| if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then | ||
| # | ||
| # Apple JDKs | ||
| # | ||
| export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home | ||
| fi | ||
|
|
||
| if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then | ||
| # | ||
| # Apple JDKs | ||
| # | ||
| export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home | ||
| fi | ||
|
|
||
| if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then | ||
| # | ||
| # Oracle JDKs | ||
| # | ||
| export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home | ||
| fi | ||
|
|
||
| if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then | ||
| # | ||
| # Apple JDKs | ||
| # | ||
| export JAVA_HOME=`/usr/libexec/java_home` | ||
| fi | ||
| ;; | ||
| esac | ||
|
|
||
| if [ -z "$JAVA_HOME" ] ; then | ||
| if [ -r /etc/gentoo-release ] ; then | ||
| JAVA_HOME=`java-config --jre-home` | ||
| fi | ||
| fi | ||
|
|
||
| if [ -z "$JAVA_HOME" ]; then | ||
| javaExecutable="`which javac`" | ||
| if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then | ||
| # readlink(1) is not available as standard on Solaris 10. | ||
| readLink=`which readlink` | ||
| if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then | ||
| if $darwin ; then | ||
| javaHome="`dirname \"$javaExecutable\"`" | ||
| javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" | ||
| else | ||
| javaExecutable="`readlink -f \"$javaExecutable\"`" | ||
| fi | ||
| javaHome="`dirname \"$javaExecutable\"`" | ||
| javaHome=`expr "$javaHome" : '\(.*\)/bin'` | ||
| JAVA_HOME="$javaHome" | ||
| export JAVA_HOME | ||
| fi | ||
| fi | ||
| fi | ||
|
|
||
| if [ -z "$JAVACMD" ] ; then | ||
| if [ -n "$JAVA_HOME" ] ; then | ||
| JAVACMD="$JAVA_HOME/bin/java" | ||
| else | ||
| JAVACMD="`which java`" | ||
| fi | ||
| fi | ||
|
|
||
| if [ ! -x "$JAVACMD" ] ; then | ||
| echo "Error: JAVA_HOME is not defined correctly." >&2 | ||
| echo " We cannot execute $JAVACMD" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ -z "$JAVA_HOME" ] ; then | ||
| echo "Warning: JAVA_HOME environment variable is not set." | ||
| exit 1 | ||
| fi | ||
| export JAVA_HOME | ||
| export JAVA=$JAVACMD |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| @echo off | ||
| rem Purpose: Find a version of Java to run | ||
| rem Use a relatively simplistic but highly effective way by assuming the Java install is in the standard location | ||
| rem Change the below env var if Java is in a different standard location | ||
| set JavaBaseInstallFolder=%ProgramFiles%\Java | ||
|
|
||
| rem Find Java Virtual Machine | ||
| rem Remove any quotes around the JAVA env var if it already is set to avoid failures in the script | ||
| if not "%JAVA%" == "" set JAVA=%JAVA:"=% | ||
| if not "%JAVA%" == "" ( | ||
| echo The JAVA var is already set to: %JAVA% Clear the variable if you want this script to find a different Java | ||
| exit /B 0 | ||
| ) | ||
| if not "%JAVA_HOME%" == "" ( | ||
| echo The JAVA_HOME var is already set to: %JAVA_HOME% Clear the variable if you want this script to find a different Java home | ||
| goto :JavaHomeFound | ||
| ) | ||
| rem Prevent early expansion of the batch variables so that we can accumulate information in the loop | ||
| rem setlocal EnableDelayedExpansion | ||
| set java_list= | ||
| set found_count=0 | ||
| rem Find all folders off the Java folder in program files | ||
| for /d %%i in ("%JavaBaseInstallFolder%\*") do ( | ||
| set /A found_count+=1 | ||
| call set "java_list[%%found_count%%]=%%i" | ||
| ) | ||
| if %found_count% GTR 1 ( | ||
| echo. | ||
| echo More than 1 Java install found: | ||
| for /L %%n in (1,1,%found_count%) do ( | ||
| call echo %%n: %%java_list[%%n]%% | ||
| ) | ||
| echo. | ||
| echo Set JAVA_HOME to one of the above. | ||
| exit /B 1 | ||
| ) | ||
| if %found_count% EQU 0 goto JavaNotFound | ||
| echo Java install found: %java_list[1]% | ||
| set JAVA_HOME=%java_list[1]% | ||
| :JavaHomeFound | ||
| set JAVA=%JAVA_HOME%\bin\java | ||
| echo Set JAVA to: %JAVA% | ||
| echo Set JAVA_HOME to: %JAVA_HOME% | ||
| exit /B 0 | ||
|
|
||
| :JavaNotFound | ||
| echo No Java install found in %JavaBaseInstallFolder% | ||
| echo If you are using a 32-bit system you may want to change %ProgramFiles% to "%ProgramFiles(x86)%" and try again. | ||
| echo If you have installed Java in a non-standard location then set the JAVA_HOME environment variable before running this script. | ||
| exit /B 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.