Merge pull request #1790 from vladak/opengrok_src_root

Opengrok src root

Author: tarzanek

OpenGrok

@@ -18,6 +18,7 @@
 # Supported Environment Variables for configuring the default setup:
 #   - OPENGROK_DISTRIBUTION_BASE  Base Directory of the OpenGrok Distribution
 #   - OPENGROK_INSTANCE_BASE      Base Directory of the OpenGrok User Data Area
+#   - OPENGROK_SRC_ROOT		  directory with files to be indexed
 #   - OPENGROK_CTAGS              Full path to Exuberant or Universal CTags binary
 #   - OPENGROK_CTAGS_OPTIONS_FILE Full path to file with extra command line
 #                                 options for CTags program (for its --options
@@ -104,7 +105,7 @@ Usage()
 
     exec >&2
     echo ""
-    echo "Usage: ${progname} <bootstrap|deploy|derby|update|updateQuietly|usage|help>"
+    echo "Usage: ${progname} <bootstrap|deploy|update|updateQuietly|usage|help>"
     echo "       ${progname} index [<directory>]"
     echo "       ${progname} indexpart <directory_1> [<directory_2> ..]"
     echo "       ${progname} clearHistory <src_root> <repository_name>"
@@ -186,7 +187,11 @@ DefaultInstanceConfiguration()
 
     # REQUIRED: Source Code/Repository Root
     #           (your source code or the root of all repositories)
-    SRC_ROOT="${OPENGROK_INSTANCE_BASE}/src"
+    if [ -n "${OPENGROK_SRC_ROOT}" ]; then
+        SRC_ROOT="${OPENGROK_SRC_ROOT}"
+    else
+        SRC_ROOT="${OPENGROK_INSTANCE_BASE}/src"
+    fi
 
     # REQUIRED: OpenGrok Generate Data Root
     #           (for Lucene index and hypertext cross-references)
@@ -969,30 +974,6 @@ DeployWar()
     Progress
 }
 
-DerbyServer()
-{
-    case "${OS_NAME}:${OS_VERSION}" in
-        SunOS:5.10) Error "unsupported OS" ;;
-        SunOS:5.11)
-                    /sbin/svcadm enable javadb
-                     ;;
-        SunOS:5.12)
-                    echo "Below might need your socket permission setup"
-                    echo "see JDK1.7_51 release notes"
-                    set -x
-                    mkdir -p $DATA_ROOT/derby
-                    java -Dderby.system.home=$DATA_ROOT/derby \
-		        -jar /usr/jdk/instances/jdk1.7.0/db/lib/derbynet.jar start
-                     ;;
-        Linux:*)
-                    mkdir -p $DATA_ROOT/derby
-                    java -Dderby.system.home=$DATA_ROOT/derby \
-		        -jar /usr/lib/jvm/java-6-sun/db/lib/derbynet.jar start
-                     ;;
-        *)          Error "unsupported OS" ;;
-    esac
-}
-
 #
 # Clear history index for given project.
 #
@@ -1020,12 +1001,6 @@ case "${1}" in
         DeployWar
         ;;
 
-    derby)
-        ValidateConfiguration
-        CreateRuntimeRequirements
-        DerbyServer
-        ;;
-
     update)
         ValidateConfiguration
         CreateRuntimeRequirements