diff options
3 files changed, 3 insertions, 114 deletions
diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/qr-start.def index 30983b4bcc7..9f92c5001ba 100644 --- a/container-search/src/main/resources/configdefinitions/qr-start.def +++ b/container-search/src/main/resources/configdefinitions/qr-start.def @@ -37,8 +37,8 @@ qrs.env string default="" restart ## Set ulimit -v in start script? this is mainly a safeguard against JNI stuff leaking memory. ulimitv string default="" restart -## Extra class path entries, forwarded to jdisc_start. Overrides the corresponding env setting. +## Extra class path entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. jdisc.classpath_extra string default="" restart -## Extra export packages entries, forwarded to jdisc_start. Overrides the corresponding env setting. +## Extra export packages entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. jdisc.export_packages string default="" restart diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java index c856712e1af..e650dfc6328 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java @@ -80,7 +80,7 @@ void reconfigureApplication() { * It is fairly tricky to get this right during integration testing, since dependencies might be part of the build * tree instead of being installed on the host. To facilitate this, JDisc will prefix any non-schemed location (e.g. * "my_dependency.jar") with the system property "jdisc.bundle.path". This property defaults to the current - * directory when running inside an IDE, but is set to "$VESPA_HOME/lib/jars/" by the jdisc_start script. + * directory when running inside an IDE, but is set to "$VESPA_HOME/lib/jars/" by the jdisc startup scripts. * * One may also reference system properties in a bundle location using the syntax "${propertyName}". If the property * is not found, it defaults to an empty string. @@ -118,16 +118,6 @@ $ set jdisc.application="myapp.jar" $ restart jdisc </pre> * - * For testing and development, the jDISC binary also supports command line parameters to start and stop a local - * application. - * -<pre> -$ install jdisc-dev -$ emacs src/main/java/edu/disc/MyApplication.java -$ mvn install -$ sudo jdisc_start target/myapp.jar -</pre> - * * <p>It is the responsibility of the Application itself to create, configure * and activate a Container instance. Although jDISC offers an API that allows for- and manages the change of an active * Container instance, making the necessary calls to do so is also considered Application logic. When jDISC receives an diff --git a/standalone-container/src/main/sh/jdisc_container_start b/standalone-container/src/main/sh/jdisc_container_start deleted file mode 100755 index 5b4202c9ddc..00000000000 --- a/standalone-container/src/main/sh/jdisc_container_start +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# BEGIN environment bootstrap section -# Do not edit between here and END as this section should stay identical in all scripts - -findpath () { - myname=${0} - mypath=${myname%/*} - myname=${myname##*/} - if [ "$mypath" ] && [ -d "$mypath" ]; then - return - fi - mypath=$(pwd) - if [ -f "${mypath}/${myname}" ]; then - return - fi - echo "FATAL: Could not figure out the path where $myname lives from $0" - exit 1 -} - -COMMON_ENV=libexec/vespa/common-env.sh - -source_common_env () { - if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - export VESPA_HOME - common_env=$VESPA_HOME/$COMMON_ENV - if [ -f "$common_env" ]; then - . $common_env - return - fi - fi - return 1 -} - -findroot () { - source_common_env && return - if [ "$VESPA_HOME" ]; then - echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'" - exit 1 - fi - if [ "$ROOT" ] && [ -d "$ROOT" ]; then - VESPA_HOME="$ROOT" - source_common_env && return - fi - findpath - while [ "$mypath" ]; do - VESPA_HOME=${mypath} - source_common_env && return - mypath=${mypath%/*} - done - echo "FATAL: missing VESPA_HOME environment variable" - echo "Could not locate $COMMON_ENV anywhere" - exit 1 -} - -findhost () { - if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 - fi - validate="${VESPA_HOME}/bin/vespa-validate-hostname" - if [ -f "$validate" ]; then - "$validate" "${VESPA_HOSTNAME}" || exit 1 - fi - export VESPA_HOSTNAME -} - -findroot -findhost - -# END environment bootstrap section - -source $VESPA_HOME/libexec/vespa/container_start.sh - -VESPA_CONFIG_ID="container/standalone" -export APP_LOCATION="standalone-container-jar-with-dependencies.jar" -export WAIT_FOR_JVM_INIT=0 - -if [ "$1" ]; then - export standalone_jdisc_container__app_location=$1 -fi -if [ -z "${standalone_jdisc_container__app_location}" ]; then - echo "Usage: `basename $0` <app-location>" 1>&2 - exit -1 -fi -shift - -export LOGGER_ENABLED="false" -export LOGGER_LEVEL="ALL" -export LOGGER_TAG="${VESPA_CONFIG_ID}" - -if [ -z "$VESPA_LOG_CONTROL_FILE" ]; then - VESPA_LOG_CONTROL_FILE="$VESPA_HOME/var/db/jdisc/logcontrol/jdisc-container.logcontrol" -fi -export VESPA_LOG_CONTROL_FILE - -export CACHE_PATH="$VESPA_HOME/var/vespa/bundlecache/standalone" - -export PRIVILEGED=1 - -start_container "$@" |