aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-12-02 12:19:57 +0100
committerTor Egge <Tor.Egge@broadpark.no>2019-12-02 12:19:57 +0100
commitbbfab9333631e47a6a8533e31570e193d406ebc0 (patch)
tree8af0a121dfd99103a7f014470fbf672e40ce6bd3
parent4e0290915f15ff1edd530daa5b53217e76b785c6 (diff)
Remove vespa-validate-application.
-rw-r--r--config-model/CMakeLists.txt2
-rwxr-xr-xconfig-model/src/main/sh/vespa-validate-application101
2 files changed, 0 insertions, 103 deletions
diff --git a/config-model/CMakeLists.txt b/config-model/CMakeLists.txt
index e5f8c388613..23be848ea45 100644
--- a/config-model/CMakeLists.txt
+++ b/config-model/CMakeLists.txt
@@ -3,9 +3,7 @@ install_fat_java_artifact(config-model)
vespa_install_script(src/main/perl/vespa-deploy bin)
vespa_install_script(src/main/perl/vespa-expand-config.pl bin)
-vespa_install_script(src/main/sh/vespa-validate-application bin)
install(DIRECTORY src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE)
install(DIRECTORY src/main/resources/schema DESTINATION share/vespa/schema/version/7.x PATTERN ".gitignore" EXCLUDE)
-install_java_artifact(jing)
diff --git a/config-model/src/main/sh/vespa-validate-application b/config-model/src/main/sh/vespa-validate-application
deleted file mode 100755
index 59891706068..00000000000
--- a/config-model/src/main/sh/vespa-validate-application
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-# 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##*/}
- empty_if_start_slash=${mypath%%/*}
- if [ "${empty_if_start_slash}" ]; then
- mypath=$(pwd)/${mypath}
- fi
- 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
-
-ROOT=${VESPA_HOME%/}
-export ROOT
-
-usage () {
- echo "usage: `basename $0` <application-directory>"
- echo " validates the hosts.xml and services.xml in your application"
-}
-
-if [ $# -ne 1 ]; then
- usage
- exit 2
-fi
-
-err=$( cd $1 2>&1 1>/dev/null ) || {
- usage
- echo "SEVERE: $err"
- exit 2
-}
-
-SERVICES="$1/services.xml"
-HOSTS="$1/hosts.xml"
-
-
-java -jar $ROOT/lib/jars/jing.jar -c $ROOT/share/vespa/schema/hosts.rnc $HOSTS && echo "$HOSTS is valid"
-java -jar $ROOT/lib/jars/jing.jar -c $ROOT/share/vespa/schema/services.rnc $SERVICES && echo "$SERVICES is valid"