-
Notifications
You must be signed in to change notification settings - Fork 394
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
Updating tomcat and java versions for binary package #10446
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
@echo off | ||
rem Licensed to the Apache Software Foundation (ASF) under one or more | ||
rem contributor license agreements. See the NOTICE file distributed with | ||
rem this work for additional information regarding copyright ownership. | ||
rem The ASF licenses this file to You under the Apache License, Version 2.0 | ||
rem (the "License"); you may not use this file except in compliance with | ||
rem the License. You may obtain a copy of the License at | ||
rem | ||
rem http://www.apache.org/licenses/LICENSE-2.0 | ||
rem | ||
rem Unless required by applicable law or agreed to in writing, software | ||
rem distributed under the License is distributed on an "AS IS" BASIS, | ||
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
rem See the License for the specific language governing permissions and | ||
rem limitations under the License. | ||
|
||
rem --------------------------------------------------------------------------- | ||
rem Script to digest password using the algorithm specified | ||
rem --------------------------------------------------------------------------- | ||
|
||
setlocal | ||
|
||
rem Guess CATALINA_HOME if not defined | ||
set "CURRENT_DIR=%cd%" | ||
if not "%CATALINA_HOME%" == "" goto gotHome | ||
set "CATALINA_HOME=%CURRENT_DIR%" | ||
if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome | ||
cd .. | ||
set "CATALINA_HOME=%cd%" | ||
cd "%CURRENT_DIR%" | ||
:gotHome | ||
if exist "%CATALINA_HOME%\bin\tool-wrapper.bat" goto okHome | ||
echo The CATALINA_HOME environment variable is not defined correctly | ||
echo This environment variable is needed to run this program | ||
goto end | ||
:okHome | ||
|
||
set "EXECUTABLE=%CATALINA_HOME%\bin\tool-wrapper.bat" | ||
|
||
rem Check that target executable exists | ||
if exist "%EXECUTABLE%" goto okExec | ||
echo Cannot find "%EXECUTABLE%" | ||
echo This file is needed to run this program | ||
goto end | ||
:okExec | ||
|
||
rem Get remaining unshifted command line arguments and save them in the | ||
set CMD_LINE_ARGS= | ||
:setArgs | ||
if ""%1""=="""" goto doneSetArgs | ||
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 | ||
shift | ||
goto setArgs | ||
:doneSetArgs | ||
|
||
call "%EXECUTABLE%" org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser %CMD_LINE_ARGS% | ||
|
||
:end |
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,60 @@ | ||
#!/bin/sh | ||
|
||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# ----------------------------------------------------------------------------- | ||
# Script to digest password using the algorithm specified | ||
# ----------------------------------------------------------------------------- | ||
|
||
# Better OS/400 detection: see Bugzilla 31132 | ||
os400=false | ||
case "`uname`" in | ||
OS400*) os400=true;; | ||
esac | ||
|
||
# resolve links - $0 may be a softlink | ||
PRG="$0" | ||
|
||
while [ -h "$PRG" ] ; do | ||
ls=`ls -ld "$PRG"` | ||
link=`expr "$ls" : '.*-> \(.*\)$'` | ||
if expr "$link" : '/.*' > /dev/null; then | ||
PRG="$link" | ||
else | ||
PRG=`dirname "$PRG"`/"$link" | ||
fi | ||
done | ||
|
||
PRGDIR=`dirname "$PRG"` | ||
EXECUTABLE=tool-wrapper.sh | ||
|
||
# Check that target executable exists | ||
if $os400; then | ||
# -x will Only work on the os400 if the files are: | ||
# 1. owned by the user | ||
# 2. owned by the PRIMARY group of the user | ||
# this will not work if the user belongs in secondary groups | ||
eval | ||
else | ||
if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then | ||
echo "Cannot find $PRGDIR/$EXECUTABLE" | ||
echo "The file is absent or does not have execute permission" | ||
echo "This file is needed to run this program" | ||
exit 1 | ||
fi | ||
fi | ||
|
||
exec "$PRGDIR"/"$EXECUTABLE" org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser "$@" |
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,58 @@ | ||
@echo off | ||
rem Licensed to the Apache Software Foundation (ASF) under one or more | ||
rem contributor license agreements. See the NOTICE file distributed with | ||
rem this work for additional information regarding copyright ownership. | ||
rem The ASF licenses this file to You under the Apache License, Version 2.0 | ||
rem (the "License"); you may not use this file except in compliance with | ||
rem the License. You may obtain a copy of the License at | ||
rem | ||
rem http://www.apache.org/licenses/LICENSE-2.0 | ||
rem | ||
rem Unless required by applicable law or agreed to in writing, software | ||
rem distributed under the License is distributed on an "AS IS" BASIS, | ||
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
rem See the License for the specific language governing permissions and | ||
rem limitations under the License. | ||
|
||
rem --------------------------------------------------------------------------- | ||
rem Configuration test script for the CATALINA Server | ||
rem --------------------------------------------------------------------------- | ||
|
||
setlocal | ||
|
||
rem Guess CATALINA_HOME if not defined | ||
set "CURRENT_DIR=%cd%" | ||
if not "%CATALINA_HOME%" == "" goto gotHome | ||
set "CATALINA_HOME=%CURRENT_DIR%" | ||
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome | ||
cd .. | ||
set "CATALINA_HOME=%cd%" | ||
cd "%CURRENT_DIR%" | ||
:gotHome | ||
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome | ||
echo The CATALINA_HOME environment variable is not defined correctly | ||
echo This environment variable is needed to run this program | ||
goto end | ||
:okHome | ||
|
||
set "EXECUTABLE=%CATALINA_HOME%\bin\catalina.bat" | ||
|
||
rem Check that target executable exists | ||
if exist "%EXECUTABLE%" goto okExec | ||
echo Cannot find "%EXECUTABLE%" | ||
echo This file is needed to run this program | ||
goto end | ||
:okExec | ||
|
||
rem Get remaining unshifted command line arguments and save them in the | ||
set CMD_LINE_ARGS= | ||
:setArgs | ||
if ""%1""=="""" goto doneSetArgs | ||
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1 | ||
shift | ||
goto setArgs | ||
:doneSetArgs | ||
|
||
call "%EXECUTABLE%" configtest %CMD_LINE_ARGS% | ||
|
||
:end |
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,60 @@ | ||
#!/bin/sh | ||
|
||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# ----------------------------------------------------------------------------- | ||
# Configuration Test Script for the CATALINA Server | ||
# ----------------------------------------------------------------------------- | ||
|
||
# Better OS/400 detection: see Bugzilla 31132 | ||
os400=false | ||
case "`uname`" in | ||
OS400*) os400=true;; | ||
esac | ||
|
||
# resolve links - $0 may be a softlink | ||
PRG="$0" | ||
|
||
while [ -h "$PRG" ] ; do | ||
ls=`ls -ld "$PRG"` | ||
link=`expr "$ls" : '.*-> \(.*\)$'` | ||
if expr "$link" : '/.*' > /dev/null; then | ||
PRG="$link" | ||
else | ||
PRG=`dirname "$PRG"`/"$link" | ||
fi | ||
done | ||
|
||
PRGDIR=`dirname "$PRG"` | ||
EXECUTABLE=catalina.sh | ||
|
||
# Check that target executable exists | ||
if $os400; then | ||
# -x will Only work on the os400 if the files are: | ||
# 1. owned by the user | ||
# 2. owned by the PRIMARY group of the user | ||
# this will not work if the user belongs in secondary groups | ||
eval | ||
else | ||
if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then | ||
echo "Cannot find $PRGDIR/$EXECUTABLE" | ||
echo "The file is absent or does not have execute permission" | ||
echo "This file is needed to run this program" | ||
exit 1 | ||
fi | ||
fi | ||
|
||
exec "$PRGDIR"/"$EXECUTABLE" configtest "$@" |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.