Return-Path: X-Original-To: apmail-eagle-commits-archive@minotaur.apache.org Delivered-To: apmail-eagle-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A607718D18 for ; Mon, 14 Mar 2016 19:21:45 +0000 (UTC) Received: (qmail 67884 invoked by uid 500); 14 Mar 2016 19:21:45 -0000 Delivered-To: apmail-eagle-commits-archive@eagle.apache.org Received: (qmail 67851 invoked by uid 500); 14 Mar 2016 19:21:45 -0000 Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.incubator.apache.org Delivered-To: mailing list commits@eagle.incubator.apache.org Received: (qmail 67842 invoked by uid 99); 14 Mar 2016 19:21:45 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2016 19:21:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D7688C16CA for ; Mon, 14 Mar 2016 19:21:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -2.021 X-Spam-Level: X-Spam-Status: No, score=-2.021 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, KAM_MANYCOMMENTS=1.2, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id ZFG-Gpz7lc_a for ; Mon, 14 Mar 2016 19:21:38 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id DD8575FBDF for ; Mon, 14 Mar 2016 19:21:35 +0000 (UTC) Received: (qmail 66591 invoked by uid 99); 14 Mar 2016 19:21:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2016 19:21:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D3EC0DFD40; Mon, 14 Mar 2016 19:21:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hdendukuri@apache.org To: commits@eagle.incubator.apache.org Date: Mon, 14 Mar 2016 19:21:35 -0000 Message-Id: <81e673d8d01d43ebb30b32931c47d8f6@git.apache.org> In-Reply-To: <48b56c4395e140a482ba2b9ad92f982e@git.apache.org> References: <48b56c4395e140a482ba2b9ad92f982e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/11] incubator-eagle git commit: Remove Tomcat from source http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh b/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh deleted file mode 100644 index 2d0a6c3..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/catalina.sh +++ /dev/null @@ -1,551 +0,0 @@ -#!/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. - -# ----------------------------------------------------------------------------- -# Control Script for the CATALINA Server -# -# Environment Variable Prerequisites -# -# Do not set the variables in this script. Instead put them into a script -# setenv.sh in CATALINA_BASE/bin to keep your customizations separate. -# -# CATALINA_HOME May point at your Catalina "build" directory. -# -# CATALINA_BASE (Optional) Base directory for resolving dynamic portions -# of a Catalina installation. If not present, resolves to -# the same directory that CATALINA_HOME points to. -# -# CATALINA_OUT (Optional) Full path to a file where stdout and stderr -# will be redirected. -# Default is $CATALINA_BASE/logs/catalina.out -# -# CATALINA_OPTS (Optional) Java runtime options used when the "start", -# "run" or "debug" command is executed. -# Include here and not in JAVA_OPTS all options, that should -# only be used by Tomcat itself, not by the stop process, -# the version command etc. -# Examples are heap size, GC logging, JMX ports etc. -# -# CATALINA_TMPDIR (Optional) Directory path location of temporary directory -# the JVM should use (java.io.tmpdir). Defaults to -# $CATALINA_BASE/temp. -# -# JAVA_HOME Must point at your Java Development Kit installation. -# Required to run the with the "debug" argument. -# -# JRE_HOME Must point at your Java Runtime installation. -# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME -# are both set, JRE_HOME is used. -# -# JAVA_OPTS (Optional) Java runtime options used when any command -# is executed. -# Include here and not in CATALINA_OPTS all options, that -# should be used by Tomcat and also by the stop process, -# the version command etc. -# Most options should go into CATALINA_OPTS. -# -# JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories -# containing some jars in order to allow replacement of APIs -# created outside of the JCP (i.e. DOM and SAX from W3C). -# It can also be used to update the XML parser implementation. -# Defaults to $CATALINA_HOME/endorsed. -# -# JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start" -# command is executed. The default is "dt_socket". -# -# JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start" -# command is executed. The default is 8000. -# -# JPDA_SUSPEND (Optional) Java runtime options used when the "jpda start" -# command is executed. Specifies whether JVM should suspend -# execution immediately after startup. Default is "n". -# -# JPDA_OPTS (Optional) Java runtime options used when the "jpda start" -# command is executed. If used, JPDA_TRANSPORT, JPDA_ADDRESS, -# and JPDA_SUSPEND are ignored. Thus, all required jpda -# options MUST be specified. The default is: -# -# -agentlib:jdwp=transport=$JPDA_TRANSPORT, -# address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND -# -# CATALINA_PID (Optional) Path of the file which should contains the pid -# of the catalina startup java process, when start (fork) is -# used -# -# LOGGING_CONFIG (Optional) Override Tomcat's logging config file -# Example (all one line) -# LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" -# -# LOGGING_MANAGER (Optional) Override Tomcat's logging manager -# Example (all one line) -# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" -# ----------------------------------------------------------------------------- - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -os400=false -case "`uname`" in -CYGWIN*) cygwin=true;; -Darwin*) darwin=true;; -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 - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# Only set CATALINA_HOME if not already set -[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` - -# Copy CATALINA_BASE from CATALINA_HOME if not already set -[ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME" - -# Ensure that any user defined CLASSPATH variables are not used on startup, -# but allow them to be specified in setenv.sh, in rare case when it is needed. -CLASSPATH= - -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then - . "$CATALINA_BASE/bin/setenv.sh" -elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then - . "$CATALINA_HOME/bin/setenv.sh" -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"` - [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` - [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"` - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For OS400 -if $os400; then - # Set job priority to standard for interactive (interactive - 6) by using - # the interactive priority - 6, the helper threads that respond to requests - # will be running at the same priority as interactive jobs. - COMMAND='chgjob job('$JOBNAME') runpty(6)' - system $COMMAND - - # Enable multi threading - export QIBM_MULTI_THREADED=Y -fi - -# Get standard Java environment variables -if $os400; then - # -r 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 - . "$CATALINA_HOME"/bin/setclasspath.sh -else - if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then - . "$CATALINA_HOME"/bin/setclasspath.sh - else - echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh" - echo "This file is needed to run this program" - exit 1 - fi -fi - -# Add on extra jar files to CLASSPATH -if [ ! -z "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH": -fi -CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar - -if [ -z "$CATALINA_OUT" ] ; then - CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out -fi - -if [ -z "$CATALINA_TMPDIR" ] ; then - # Define the java.io.tmpdir to use for Catalina - CATALINA_TMPDIR="$CATALINA_BASE"/temp -fi - -# Add tomcat-juli.jar to classpath -# tomcat-juli.jar can be over-ridden per instance -if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then - CLASSPATH=$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar -else - CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar -fi - -# Bugzilla 37848: When no TTY is available, don't output to console -have_tty=0 -if [ "`tty`" != "not a tty" ]; then - have_tty=1 -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` - JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` - CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` - CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"` - CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` -fi - -# Set juli LogManager config file if it is present and an override has not been issued -if [ -z "$LOGGING_CONFIG" ]; then - if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then - LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" - else - # Bugzilla 45585 - LOGGING_CONFIG="-Dnop" - fi -fi - -if [ -z "$LOGGING_MANAGER" ]; then - LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" -fi - -# Uncomment the following line to make the umask available when using the -# org.apache.catalina.security.SecurityListener -#JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`" - -# ----- Execute The Requested Command ----------------------------------------- - -# Bugzilla 37848: only output this if we have a TTY -#if [ $have_tty -eq 1 ]; then - #echo "Using CATALINA_BASE: $CATALINA_BASE" - #echo "Using CATALINA_HOME: $CATALINA_HOME" - #echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" - #if [ "$1" = "debug" ] ; then - # echo "Using JAVA_HOME: $JAVA_HOME" - #else - # echo "Using JRE_HOME: $JRE_HOME" - #fi - #echo "Using CLASSPATH: $CLASSPATH" - #if [ ! -z "$CATALINA_PID" ]; then - #echo "Using CATALINA_PID: $CATALINA_PID" - #fi -#fi - -if [ "$1" = "jpda" ] ; then - if [ -z "$JPDA_TRANSPORT" ]; then - JPDA_TRANSPORT="dt_socket" - fi - if [ -z "$JPDA_ADDRESS" ]; then - JPDA_ADDRESS="8000" - fi - if [ -z "$JPDA_SUSPEND" ]; then - JPDA_SUSPEND="n" - fi - if [ -z "$JPDA_OPTS" ]; then - JPDA_OPTS="-agentlib:jdwp=transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND" - fi - CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS" - shift -fi - -if [ "$1" = "debug" ] ; then - if $os400; then - echo "Debug command not available on OS400" - exit 1 - else - shift - if [ "$1" = "-security" ] ; then - if [ $have_tty -eq 1 ]; then - echo "Using Security Manager" - fi - shift - exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -sourcepath "$CATALINA_HOME"/../../java \ - -Djava.security.manager \ - -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - org.apache.catalina.startup.Bootstrap "$@" start - else - exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -sourcepath "$CATALINA_HOME"/../../java \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - org.apache.catalina.startup.Bootstrap "$@" start - fi - fi - -elif [ "$1" = "run" ]; then - - shift - if [ "$1" = "-security" ] ; then - if [ $have_tty -eq 1 ]; then - echo "Using Security Manager" - fi - shift - eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ - -Djava.security.manager \ - -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ - -Dcatalina.base="\"$CATALINA_BASE\"" \ - -Dcatalina.home="\"$CATALINA_HOME\"" \ - -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - org.apache.catalina.startup.Bootstrap "$@" start - else - eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ - -Dcatalina.base="\"$CATALINA_BASE\"" \ - -Dcatalina.home="\"$CATALINA_HOME\"" \ - -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - org.apache.catalina.startup.Bootstrap "$@" start - fi - -elif [ "$1" = "start" ] ; then - - if [ ! -z "$CATALINA_PID" ]; then - if [ -f "$CATALINA_PID" ]; then - if [ -s "$CATALINA_PID" ]; then - echo "Existing PID file found during start." - if [ -r "$CATALINA_PID" ]; then - PID=`cat "$CATALINA_PID"` - ps -p $PID >/dev/null 2>&1 - if [ $? -eq 0 ] ; then - echo "Eagle service appears to still be running with PID $PID. Start aborted." - echo "If the following process is not an eagle service process, remove the PID file and try again:" - ps -f -p $PID - exit 1 - else - echo "Removing/clearing stale PID file." - rm -f "$CATALINA_PID" >/dev/null 2>&1 - if [ $? != 0 ]; then - if [ -w "$CATALINA_PID" ]; then - cat /dev/null > "$CATALINA_PID" - else - echo "Unable to remove or clear stale PID file. Start aborted." - exit 1 - fi - fi - fi - else - echo "Unable to read PID file. Start aborted." - exit 1 - fi - else - rm -f "$CATALINA_PID" >/dev/null 2>&1 - if [ $? != 0 ]; then - if [ ! -w "$CATALINA_PID" ]; then - echo "Unable to remove or write to empty PID file. Start aborted." - exit 1 - fi - fi - fi - fi - fi - - shift - touch "$CATALINA_OUT" - if [ "$1" = "-security" ] ; then - if [ $have_tty -eq 1 ]; then - echo "Using Security Manager" - fi - shift - eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ - -Djava.security.manager \ - -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ - -Dcatalina.base="\"$CATALINA_BASE\"" \ - -Dcatalina.home="\"$CATALINA_HOME\"" \ - -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - org.apache.catalina.startup.Bootstrap "$@" start \ - >> "$CATALINA_OUT" 2>&1 "&" - - else - eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ - -Dcatalina.base="\"$CATALINA_BASE\"" \ - -Dcatalina.home="\"$CATALINA_HOME\"" \ - -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - org.apache.catalina.startup.Bootstrap "$@" start \ - >> "$CATALINA_OUT" 2>&1 "&" - - fi - - if [ ! -z "$CATALINA_PID" ]; then - echo $! > "$CATALINA_PID" - fi - - echo "Eagle service started." - -elif [ "$1" = "stop" ] ; then - - shift - - SLEEP=5 - if [ ! -z "$1" ]; then - echo $1 | grep "[^0-9]" >/dev/null 2>&1 - if [ $? -gt 0 ]; then - SLEEP=$1 - shift - fi - fi - - FORCE=0 - if [ "$1" = "-force" ]; then - shift - FORCE=1 - fi - - if [ ! -z "$CATALINA_PID" ]; then - if [ -f "$CATALINA_PID" ]; then - if [ -s "$CATALINA_PID" ]; then - kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - echo "PID file found but no matching process was found. Stop aborted." - exit 1 - fi - else - echo "PID file is empty and has been ignored." - fi - else - echo "\$CATALINA_PID was set but the specified file does not exist. Is eagle service running? Stop aborted." - exit 1 - fi - fi - - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ - -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ - -Dcatalina.base="\"$CATALINA_BASE\"" \ - -Dcatalina.home="\"$CATALINA_HOME\"" \ - -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - org.apache.catalina.startup.Bootstrap "$@" stop - - # stop failed. Shutdown port disabled? Try a normal kill. - if [ $? != 0 ]; then - if [ ! -z "$CATALINA_PID" ]; then - echo "The stop command failed. Attempting to signal the process to stop through OS signal." - kill -15 `cat "$CATALINA_PID"` >/dev/null 2>&1 - fi - fi - - if [ ! -z "$CATALINA_PID" ]; then - if [ -f "$CATALINA_PID" ]; then - while [ $SLEEP -ge 0 ]; do - kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - rm -f "$CATALINA_PID" >/dev/null 2>&1 - if [ $? != 0 ]; then - if [ -w "$CATALINA_PID" ]; then - cat /dev/null > "$CATALINA_PID" - # If Tomcat has stopped don't try and force a stop with an empty PID file - FORCE=0 - else - echo "The PID file could not be removed or cleared." - fi - fi - echo "Eagle service stopped." - break - fi - if [ $SLEEP -gt 0 ]; then - sleep 1 - fi - if [ $SLEEP -eq 0 ]; then - if [ $FORCE -eq 0 ]; then - echo "Eagle service did not stop in time. PID file was not removed. To aid diagnostics a thread dump has been written to standard out." - kill -3 `cat "$CATALINA_PID"` - fi - fi - SLEEP=`expr $SLEEP - 1 ` - done - fi - fi - - KILL_SLEEP_INTERVAL=5 - if [ $FORCE -eq 1 ]; then - if [ -z "$CATALINA_PID" ]; then - echo "Kill failed: \$CATALINA_PID not set" - else - if [ -f "$CATALINA_PID" ]; then - PID=`cat "$CATALINA_PID"` - echo "Killing eagle service with the PID: $PID" - kill -9 $PID - while [ $KILL_SLEEP_INTERVAL -ge 0 ]; do - kill -0 `cat "$CATALINA_PID"` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - rm -f "$CATALINA_PID" >/dev/null 2>&1 - if [ $? != 0 ]; then - if [ -w "$CATALINA_PID" ]; then - cat /dev/null > "$CATALINA_PID" - else - echo "The PID file could not be removed." - fi - fi - # Set this to zero else a warning will be issued about the process still running - KILL_SLEEP_INTERVAL=0 - echo "The eagle process has been killed." - break - fi - if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then - sleep 1 - fi - KILL_SLEEP_INTERVAL=`expr $KILL_SLEEP_INTERVAL - 1 ` - done - if [ $KILL_SLEEP_INTERVAL -gt 0 ]; then - echo "eagle has not been killed completely yet. The process might be waiting on some system call or might be UNINTERRUPTIBLE." - fi - fi - fi - fi - -elif [ "$1" = "configtest" ] ; then - - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ - -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ - -Dcatalina.base="\"$CATALINA_BASE\"" \ - -Dcatalina.home="\"$CATALINA_HOME\"" \ - -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ - org.apache.catalina.startup.Bootstrap configtest - result=$? - if [ $result -ne 0 ]; then - echo "Configuration error detected!" - fi - exit $result - -elif [ "$1" = "version" ] ; then - - "$_RUNJAVA" \ - -classpath "$CATALINA_HOME/lib/catalina.jar" \ - org.apache.catalina.util.ServerInfo - -else - - echo "Usage: eagle-service.sh " - echo " commands:" - echo " start Start eagle service in a separate window" - echo " stop Stop eagle service, waiting up to 5 seconds for the process to end" - exit 1 - -fi http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar b/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar deleted file mode 100644 index 2b6b9c6..0000000 Binary files a/eagle-assembly/src/main/lib/tomcat/bin/commons-daemon.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh b/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh deleted file mode 100644 index 9a8ebff..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/configtest.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/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 "$@" http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh b/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh deleted file mode 100644 index dee6c77..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/daemon.sh +++ /dev/null @@ -1,252 +0,0 @@ -#!/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. -# -# ----------------------------------------------------------------------------- -# Commons Daemon wrapper script. -# ----------------------------------------------------------------------------- -# -# resolve links - $0 may be a softlink -ARG0="$0" -while [ -h "$ARG0" ]; do - ls=`ls -ld "$ARG0"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - ARG0="$link" - else - ARG0="`dirname $ARG0`/$link" - fi -done -DIRNAME="`dirname $ARG0`" -PROGRAM="`basename $ARG0`" -while [ ".$1" != . ] -do - case "$1" in - --java-home ) - JAVA_HOME="$2" - shift; shift; - continue - ;; - --catalina-home ) - CATALINA_HOME="$2" - shift; shift; - continue - ;; - --catalina-base ) - CATALINA_BASE="$2" - shift; shift; - continue - ;; - --catalina-pid ) - CATALINA_PID="$2" - shift; shift; - continue - ;; - --tomcat-user ) - TOMCAT_USER="$2" - shift; shift; - continue - ;; - --service-start-wait-time ) - SERVICE_START_WAIT_TIME="$2" - shift; shift; - continue - ;; - * ) - break - ;; - esac -done -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; - Darwin*) - darwin=true - ;; -esac - -# Use the maximum available, or set MAX_FD != -1 to use that -test ".$MAX_FD" = . && MAX_FD="maximum" -# Setup parameters for running the jsvc -# -test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat -# Set JAVA_HOME to working JDK or JRE -# JAVA_HOME=/opt/jdk-1.6.0.22 -# If not set we'll try to guess the JAVA_HOME -# from java binary if on the PATH -# -if [ -z "$JAVA_HOME" ]; then - JAVA_BIN="`which java 2>/dev/null || type java 2>&1`" - test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`" - test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd` -else - JAVA_BIN="$JAVA_HOME/bin/java" -fi - -# Only set CATALINA_HOME if not already set -test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` -test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" -test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap -# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME -if [ -z "$JSVC" ]; then - JSVC="$CATALINA_BASE/bin/jsvc" - if [ ! -x "$JSVC" ]; then - JSVC="$CATALINA_HOME/bin/jsvc" - fi -fi -# Set the default service-start wait time if necessary -test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 - -# Ensure that any user defined CLASSPATH variables are not used on startup, -# but allow them to be specified in setenv.sh, in rare case when it is needed. -CLASSPATH= -JAVA_OPTS= -if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then - . "$CATALINA_BASE/bin/setenv.sh" -elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then - . "$CATALINA_HOME/bin/setenv.sh" -fi - -# Add on extra jar files to CLASSPATH -test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:" -CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar" - -test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out" -test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp" - -# Add tomcat-juli.jar to classpath -# tomcat-juli.jar can be over-ridden per instance -if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then - CLASSPATH="$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar" -else - CLASSPATH="$CLASSPATH:$CATALINA_HOME/bin/tomcat-juli.jar" -fi -# Set juli LogManager config file if it is present and an override has not been issued -if [ -z "$LOGGING_CONFIG" ]; then - if [ -r "$CATALINA_BASE/conf/logging.properties" ]; then - LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" - else - # Bugzilla 45585 - LOGGING_CONFIG="-Dnop" - fi -fi - -test ".$LOGGING_MANAGER" = . && LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" -JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER" - -# Set -pidfile -test ".$CATALINA_PID" = . && CATALINA_PID="$CATALINA_BASE/logs/catalina-daemon.pid" - -# Increase the maximum file descriptors if we can -if [ "$cygwin" = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ "$?" -eq 0 ]; then - # Darwin does not allow RLIMIT_INFINITY on file soft limit - if [ "$darwin" = "true" -a "$MAX_FD_LIMIT" = "unlimited" ]; then - MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc` - fi - test ".$MAX_FD" = ".maximum" && MAX_FD="$MAX_FD_LIMIT" - ulimit -n $MAX_FD - if [ "$?" -ne 0 ]; then - echo "$PROGRAM: Could not set maximum file descriptor limit: $MAX_FD" - fi - else - echo "$PROGRAM: Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# ----- Execute The Requested Command ----------------------------------------- -case "$1" in - run ) - shift - "$JSVC" $* \ - $JSVC_OPTS \ - -java-home "$JAVA_HOME" \ - -pidfile "$CATALINA_PID" \ - -wait "$SERVICE_START_WAIT_TIME" \ - -nodetach \ - -outfile "&1" \ - -errfile "&2" \ - -classpath "$CLASSPATH" \ - "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMP" \ - $CATALINA_MAIN - exit $? - ;; - start ) - "$JSVC" $JSVC_OPTS \ - -java-home "$JAVA_HOME" \ - -user $TOMCAT_USER \ - -pidfile "$CATALINA_PID" \ - -wait "$SERVICE_START_WAIT_TIME" \ - -outfile "$CATALINA_OUT" \ - -errfile "&1" \ - -classpath "$CLASSPATH" \ - "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMP" \ - $CATALINA_MAIN - exit $? - ;; - stop ) - "$JSVC" $JSVC_OPTS \ - -stop \ - -pidfile "$CATALINA_PID" \ - -classpath "$CLASSPATH" \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Dcatalina.base="$CATALINA_BASE" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMP" \ - $CATALINA_MAIN - exit $? - ;; - version ) - "$JSVC" \ - -java-home "$JAVA_HOME" \ - -pidfile "$CATALINA_PID" \ - -classpath "$CLASSPATH" \ - -errfile "&2" \ - -version \ - -check \ - $CATALINA_MAIN - if [ "$?" = 0 ]; then - "$JAVA_BIN" \ - -classpath "$CATALINA_HOME/lib/catalina.jar" \ - org.apache.catalina.util.ServerInfo - fi - exit $? - ;; - * ) - echo "Unknown command: \`$1'" - echo "Usage: $PROGRAM ( commands ... )" - echo "commands:" - echo " run Start Tomcat without detaching from console" - echo " start Start Tomcat" - echo " stop Stop Tomcat" - echo " version What version of commons daemon and Tomcat" - echo " are you running?" - exit 1 - ;; -esac http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/digest.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/digest.sh b/eagle-assembly/src/main/lib/tomcat/bin/digest.sh deleted file mode 100644 index 62ed5d0..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/digest.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/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" -server org.apache.catalina.realm.RealmBase "$@" http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh b/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh deleted file mode 100644 index 873fad3..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/setclasspath.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/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. - -# ----------------------------------------------------------------------------- -# Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings -# are valid and consistent with the selected start-up options and set up the -# endorsed directory. -# ----------------------------------------------------------------------------- - -# Make sure prerequisite environment variables are set -if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then - if $darwin; then - # Bugzilla 54390 - if [ -x '/usr/libexec/java_home' ] ; then - export JAVA_HOME=`/usr/libexec/java_home` - # Bugzilla 37284 (reviewed). - elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then - export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" - fi - else - JAVA_PATH=`which java 2>/dev/null` - if [ "x$JAVA_PATH" != "x" ]; then - JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null` - JRE_HOME=`dirname $JAVA_PATH 2>/dev/null` - fi - if [ "x$JRE_HOME" = "x" ]; then - # XXX: Should we try other locations? - if [ -x /usr/bin/java ]; then - JRE_HOME=/usr - fi - fi - fi - if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then - echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" - echo "At least one of these environment variable is needed to run this program" - exit 1 - fi -fi -if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then - echo "JAVA_HOME should point to a JDK in order to run in debug mode." - exit 1 -fi -if [ -z "$JRE_HOME" ]; then - JRE_HOME="$JAVA_HOME" -fi - -# If we're running under jdb, we need a full jdk. -if [ "$1" = "debug" ] ; then - if [ "$os400" = "true" ]; then - if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then - echo "The JAVA_HOME environment variable is not defined correctly" - echo "This environment variable is needed to run this program" - echo "NB: JAVA_HOME should point to a JDK not a JRE" - exit 1 - fi - else - if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then - echo "The JAVA_HOME environment variable is not defined correctly" - echo "This environment variable is needed to run this program" - echo "NB: JAVA_HOME should point to a JDK not a JRE" - exit 1 - fi - fi -fi - -# Don't override the endorsed dir if the user has set it previously -if [ -z "$JAVA_ENDORSED_DIRS" ]; then - # Set the default -Djava.endorsed.dirs argument - JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed -fi - -# Set standard commands for invoking Java, if not already set. -if [ -z "$_RUNJAVA" ]; then - _RUNJAVA="$JRE_HOME"/bin/java -fi -if [ "$os400" != "true" ]; then - if [ -z "$_RUNJDB" ]; then - _RUNJDB="$JAVA_HOME"/bin/jdb - fi -fi \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh b/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh deleted file mode 100644 index cd0c97d..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/shutdown.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/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. - -# ----------------------------------------------------------------------------- -# Stop 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" stop "$@" http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/startup.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/startup.sh b/eagle-assembly/src/main/lib/tomcat/bin/startup.sh deleted file mode 100644 index 7b10287..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/startup.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/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. - -# ----------------------------------------------------------------------------- -# Start 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" start "$@" http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar b/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar deleted file mode 100644 index e1b80ad..0000000 Binary files a/eagle-assembly/src/main/lib/tomcat/bin/tomcat-juli.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh b/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh deleted file mode 100644 index 31cebf6..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/tool-wrapper.sh +++ /dev/null @@ -1,139 +0,0 @@ -#!/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. - -# ----------------------------------------------------------------------------- -# Wrapper script for command line tools -# -# Environment Variable Prerequisites -# -# CATALINA_HOME May point at your Catalina "build" directory. -# -# TOOL_OPTS (Optional) Java runtime options. -# -# JAVA_HOME Must point at your Java Development Kit installation. -# Using JRE_HOME instead works as well. -# -# JRE_HOME Must point at your Java Runtime installation. -# Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME -# are both set, JRE_HOME is used. -# -# JAVA_OPTS (Optional) Java runtime options. -# -# JAVA_ENDORSED_DIRS (Optional) Lists of of colon separated directories -# containing some jars in order to allow replacement of APIs -# created outside of the JCP (i.e. DOM and SAX from W3C). -# It can also be used to update the XML parser implementation. -# Defaults to $CATALINA_HOME/endorsed. -# ----------------------------------------------------------------------------- - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -os400=false -case "`uname`" in -CYGWIN*) cygwin=true;; -Darwin*) darwin=true;; -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 - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# Only set CATALINA_HOME if not already set -[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` - -# Ensure that any user defined CLASSPATH variables are not used on startup, -# but allow them to be specified in setenv.sh, in rare case when it is needed. -CLASSPATH= - -if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then - . "$CATALINA_HOME/bin/setenv.sh" -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"` - [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` - [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For OS400 -if $os400; then - # Set job priority to standard for interactive (interactive - 6) by using - # the interactive priority - 6, the helper threads that respond to requests - # will be running at the same priority as interactive jobs. - COMMAND='chgjob job('$JOBNAME') runpty(6)' - system $COMMAND - - # Enable multi threading - export QIBM_MULTI_THREADED=Y -fi - -# Get standard Java environment variables -if $os400; then - # -r 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 - . "$CATALINA_HOME"/bin/setclasspath.sh -else - if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then - . "$CATALINA_HOME"/bin/setclasspath.sh - else - echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh" - echo "This file is needed to run this program" - exit 1 - fi -fi - -# Add on extra jar files to CLASSPATH -if [ ! -z "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH": -fi -CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/tomcat-juli.jar:"$CATALINA_HOME"/lib/servlet-api.jar - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` - JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` - CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` -fi - -JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" - -# ----- Execute The Requested Command ----------------------------------------- - -exec "$_RUNJAVA" $JAVA_OPTS $TOOL_OPTS \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -Dcatalina.home="$CATALINA_HOME" \ - org.apache.catalina.startup.Tool "$@" http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/bin/version.sh ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/bin/version.sh b/eagle-assembly/src/main/lib/tomcat/bin/version.sh deleted file mode 100644 index 1cb19bd..0000000 --- a/eagle-assembly/src/main/lib/tomcat/bin/version.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/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. - -# ----------------------------------------------------------------------------- -# Version 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" version "$@" http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy b/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy deleted file mode 100644 index 354d7d6..0000000 --- a/eagle-assembly/src/main/lib/tomcat/conf/catalina.policy +++ /dev/null @@ -1,248 +0,0 @@ -// 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. - -// ============================================================================ -// catalina.policy - Security Policy Permissions for Tomcat 7 -// -// This file contains a default set of security policies to be enforced (by the -// JVM) when Catalina is executed with the "-security" option. In addition -// to the permissions granted here, the following additional permissions are -// granted to each web application: -// -// * Read access to the web application's document root directory -// * Read, write and delete access to the web application's working directory -// ============================================================================ - - -// ========== SYSTEM CODE PERMISSIONS ========================================= - - -// These permissions apply to javac -grant codeBase "file:${java.home}/lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions -grant codeBase "file:${java.home}/jre/lib/ext/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/../lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions when -// ${java.home} points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/lib/ext/-" { - permission java.security.AllPermission; -}; - - -// ========== CATALINA CODE PERMISSIONS ======================================= - - -// These permissions apply to the daemon code -grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the logging API -// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home}, -// update this section accordingly. -// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..} -grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { - permission java.io.FilePermission - "${java.home}${file.separator}lib${file.separator}logging.properties", "read"; - - permission java.io.FilePermission - "${catalina.base}${file.separator}conf${file.separator}logging.properties", "read"; - permission java.io.FilePermission - "${catalina.base}${file.separator}logs", "read, write"; - permission java.io.FilePermission - "${catalina.base}${file.separator}logs${file.separator}*", "read, write"; - - permission java.lang.RuntimePermission "shutdownHooks"; - permission java.lang.RuntimePermission "getClassLoader"; - permission java.lang.RuntimePermission "setContextClassLoader"; - - permission java.util.logging.LoggingPermission "control"; - - permission java.util.PropertyPermission "java.util.logging.config.class", "read"; - permission java.util.PropertyPermission "java.util.logging.config.file", "read"; - permission java.util.PropertyPermission "org.apache.juli.ClassLoaderLogManager.debug", "read"; - permission java.util.PropertyPermission "catalina.base", "read"; - - // Note: To enable per context logging configuration, permit read access to - // the appropriate file. Be sure that the logging configuration is - // secure before enabling such access. - // E.g. for the examples web application (uncomment and unwrap - // the following to be on a single line): - // permission java.io.FilePermission "${catalina.base}${file.separator} - // webapps${file.separator}examples${file.separator}WEB-INF - // ${file.separator}classes${file.separator}logging.properties", "read"; -}; - -// These permissions apply to the server startup code -grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the servlet API classes -// and those that are shared across all class loaders -// located in the "lib" directory -grant codeBase "file:${catalina.home}/lib/-" { - permission java.security.AllPermission; -}; - - -// If using a per instance lib directory, i.e. ${catalina.base}/lib, -// then the following permission will need to be uncommented -// grant codeBase "file:${catalina.base}/lib/-" { -// permission java.security.AllPermission; -// }; - - -// ========== WEB APPLICATION PERMISSIONS ===================================== - - -// These permissions are granted by default to all web applications -// In addition, a web application will be given a read FilePermission -// and JndiPermission for all files and directories in its document root. -grant { - // Required for JNDI lookup of named JDBC DataSource's and - // javamail named MimePart DataSource used to send mail - permission java.util.PropertyPermission "java.home", "read"; - permission java.util.PropertyPermission "java.naming.*", "read"; - permission java.util.PropertyPermission "javax.sql.*", "read"; - - // OS Specific properties to allow read access - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "os.version", "read"; - permission java.util.PropertyPermission "os.arch", "read"; - permission java.util.PropertyPermission "file.separator", "read"; - permission java.util.PropertyPermission "path.separator", "read"; - permission java.util.PropertyPermission "line.separator", "read"; - - // JVM properties to allow read access - permission java.util.PropertyPermission "java.version", "read"; - permission java.util.PropertyPermission "java.vendor", "read"; - permission java.util.PropertyPermission "java.vendor.url", "read"; - permission java.util.PropertyPermission "java.class.version", "read"; - permission java.util.PropertyPermission "java.specification.version", "read"; - permission java.util.PropertyPermission "java.specification.vendor", "read"; - permission java.util.PropertyPermission "java.specification.name", "read"; - - permission java.util.PropertyPermission "java.vm.specification.version", "read"; - permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; - permission java.util.PropertyPermission "java.vm.specification.name", "read"; - permission java.util.PropertyPermission "java.vm.version", "read"; - permission java.util.PropertyPermission "java.vm.vendor", "read"; - permission java.util.PropertyPermission "java.vm.name", "read"; - - // Required for OpenJMX - permission java.lang.RuntimePermission "getAttribute"; - - // Allow read of JAXP compliant XML parser debug - permission java.util.PropertyPermission "jaxp.debug", "read"; - - // All JSPs need to be able to read this package - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; - - // Precompiled JSPs need access to these packages. - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; - permission java.lang.RuntimePermission - "accessClassInPackage.org.apache.jasper.runtime.*"; - - // Precompiled JSPs need access to these system properties. - permission java.util.PropertyPermission - "org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read"; - permission java.util.PropertyPermission - "org.apache.el.parser.COERCE_TO_ZERO", "read"; - - // The cookie code needs these. - permission java.util.PropertyPermission - "org.apache.catalina.STRICT_SERVLET_COMPLIANCE", "read"; - permission java.util.PropertyPermission - "org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING", "read"; - permission java.util.PropertyPermission - "org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR", "read"; - - // Applications using Comet need to be able to access this package - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.comet"; - - // Applications using the legacy WebSocket implementation need to be able to access this package - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.websocket"; - - // Applications using the JSR-356 WebSocket implementation need to be able to access these packages - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket.server"; -}; - - -// The Manager application needs access to the following packages to support the -// session display functionality. These settings support the following -// configurations: -// - default CATALINA_HOME == CATALINA_BASE -// - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE -// - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME -grant codeBase "file:${catalina.base}/webapps/manager/-" { - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; -}; -grant codeBase "file:${catalina.home}/webapps/manager/-" { - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager.util"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; -}; - -// You can assign additional permissions to particular web applications by -// adding additional "grant" entries here, based on the code base for that -// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. -// -// Different permissions can be granted to JSP pages, classes loaded from -// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ -// directory, or even to individual jar files in the /WEB-INF/lib/ directory. -// -// For instance, assume that the standard "examples" application -// included a JDBC driver that needed to establish a network connection to the -// corresponding database and used the scrape taglib to get the weather from -// the NOAA web server. You might create a "grant" entries like this: -// -// The permissions granted to the context root directory apply to JSP pages. -// grant codeBase "file:${catalina.base}/webapps/examples/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; -// -// The permissions granted to the context WEB-INF/classes directory -// grant codeBase "file:${catalina.base}/webapps/examples/WEB-INF/classes/-" { -// }; -// -// The permission granted to your JDBC driver -// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar!/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// }; -// The permission granted to the scrape taglib -// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; - http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties b/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties deleted file mode 100644 index ef375e1..0000000 --- a/eagle-assembly/src/main/lib/tomcat/conf/catalina.properties +++ /dev/null @@ -1,133 +0,0 @@ -# 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. - -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageAccess unless the -# corresponding RuntimePermission ("accessClassInPackage."+package) has -# been granted. -package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,\ -org.apache.naming.resources.,org.apache.tomcat. -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageDefinition unless the -# corresponding RuntimePermission ("defineClassInPackage."+package) has -# been granted. -# -# by default, no packages are restricted for definition, and none of -# the class loaders supplied with the JDK call checkPackageDefinition. -# -package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\ -org.apache.jasper.,org.apache.naming.,org.apache.tomcat. - -# -# -# List of comma-separated paths defining the contents of the "common" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank,the JVM system loader will be used as Catalina's "common" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar - -# -# List of comma-separated paths defining the contents of the "server" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank, the "common" loader will be used as Catalina's "server" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -server.loader= - -# -# List of comma-separated paths defining the contents of the "shared" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, -# the "common" loader will be used as Catalina's "shared" loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -# Please note that for single jars, e.g. bar.jar, you need the URL form -# starting with file:. -shared.loader= - -# List of JAR files that should not be scanned using the JarScanner -# functionality. This is typically used to scan JARs for configuration -# information. JARs that do not contain such information may be excluded from -# the scan to speed up the scanning process. This is the default list. JARs on -# this list are excluded from all scans. Scan specific lists (to exclude JARs -# from individual scans) follow this. The list must be a comma separated list of -# JAR file names. -# The JARs listed below include: -# - Tomcat Bootstrap JARs -# - Tomcat API JARs -# - Catalina JARs -# - Jasper JARs -# - Tomcat JARs -# - Common non-Tomcat JARs -# - Test JARs (JUnit, Cobertura and dependencies) -tomcat.util.scan.DefaultJarScanner.jarsToSkip=\ -bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\ -annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\ -catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\ -jasper.jar,jasper-el.jar,ecj-*.jar,\ -tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\ -tomcat-jni.jar,tomcat-spdy.jar,\ -tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\ -tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\ -tomcat-jdbc.jar,\ -tools.jar,\ -commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,\ -commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\ -commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\ -commons-math*.jar,commons-pool*.jar,\ -jstl.jar,\ -geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\ -ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\ -jmx-tools.jar,jta*.jar,log4j.jar,log4j-1*.jar,mail*.jar,slf4j*.jar,\ -xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,\ -junit.jar,junit-*.jar,hamcrest*.jar,org.hamcrest*.jar,ant-launcher.jar,\ -cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar,\ -jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,\ -xom-*.jar - -# Additional JARs (over and above the default JARs listed above) to skip when -# scanning for Servlet 3.0 pluggability features. These features include web -# fragments, annotations, SCIs and classes that match @HandlesTypes. The list -# must be a comma separated list of JAR file names. -org.apache.catalina.startup.ContextConfig.jarsToSkip= - -# Additional JARs (over and above the default JARs listed above) to skip when -# scanning for TLDs. The list must be a comma separated list of JAR file names. -org.apache.catalina.startup.TldConfig.jarsToSkip=tomcat7-websocket.jar - -# -# String cache configuration. -tomcat.util.buf.StringCache.byte.enabled=true -#tomcat.util.buf.StringCache.char.enabled=true -#tomcat.util.buf.StringCache.trainThreshold=500000 -#tomcat.util.buf.StringCache.cacheSize=5000 http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/conf/context.xml ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/conf/context.xml b/eagle-assembly/src/main/lib/tomcat/conf/context.xml deleted file mode 100644 index 745bf95..0000000 --- a/eagle-assembly/src/main/lib/tomcat/conf/context.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - WEB-INF/web.xml - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/conf/logging.properties ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/conf/logging.properties b/eagle-assembly/src/main/lib/tomcat/conf/logging.properties deleted file mode 100644 index 912b193..0000000 --- a/eagle-assembly/src/main/lib/tomcat/conf/logging.properties +++ /dev/null @@ -1,64 +0,0 @@ -# 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. - -handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -1catalina.org.apache.juli.FileHandler.level = FINE -1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs -1catalina.org.apache.juli.FileHandler.prefix = eagle-service. - -2localhost.org.apache.juli.FileHandler.level = FINE -2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs -2localhost.org.apache.juli.FileHandler.prefix = eagle-service. - -3manager.org.apache.juli.FileHandler.level = FINE -3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs -3manager.org.apache.juli.FileHandler.prefix = eagle-service-manager. - -4host-manager.org.apache.juli.FileHandler.level = FINE -4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/../../logs -4host-manager.org.apache.juli.FileHandler.prefix = eagle-service-host-manager. - -java.util.logging.ConsoleHandler.level = FINE -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler - -# For example, set the org.apache.catalina.util.LifecycleBase logger to log -# each component that extends LifecycleBase changing state: -#org.apache.catalina.util.LifecycleBase.level = FINE - -# To see debug messages in TldLocationsCache, uncomment the following line: -#org.apache.jasper.compiler.TldLocationsCache.level = FINE http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/conf/server.xml ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/conf/server.xml b/eagle-assembly/src/main/lib/tomcat/conf/server.xml deleted file mode 100644 index 9ca8e87..0000000 --- a/eagle-assembly/src/main/lib/tomcat/conf/server.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d0a59520/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml ---------------------------------------------------------------------- diff --git a/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml b/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml deleted file mode 100644 index 7f022ff..0000000 --- a/eagle-assembly/src/main/lib/tomcat/conf/tomcat-users.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - -