jacone · modhassan · Nov 3, 2015 · Nov 5, 2015 · Nov 9, 2015 · Nov 9, 2015
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+usr/local/src/unit-tests/shunit2
diff --git a/COPYING b/COPYING
@@ -1,4 +1,4 @@
-   Copyright 2011 Vizrt
+   Copyright 2011-2015 Escenic
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README b/README
@@ -1,10 +1,16 @@
+========
+Note!
+========
+This version of ece-scripts is currently being modified to support java7, tomcat7 and content engine 5.6. During this transition the latest version of ece-scripts will not work correctly for previously released engine versions.
+
+
 ========
 Overview
 ========
 These are scripts to help template developers and administrators
 manage various components of the Escenic Content Engine. The scripts
 are experimental and not yet a part of the official distribution of
-Escenic Content Engine from Vizrt Online.
+Escenic Content Engine.
 
 ========================
 Project directory layout
@@ -13,60 +19,39 @@ The file structure ressembles where you'd typically put the various
 scripts and configuration files. That's all it is, only for
 documentational purposes :-)
 
-==========================
-Features of the ece script
-==========================
-$ ece help
-Usage: /usr/bin/ece [-t <type>] [-i <instance>] <command>
+===================================
+Features of the /usr/bin/ece script
+===================================
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
 
-DESCRIPTION
- -t --type <type>
-      The following types are available:
-      engine  - The Escenic Content Engine, this is the default
-                and is the assumed type if none is specified.
-      search  - A standalone search indexer and solr instance
-      rmi-hub - The RMI hub responsible for the internal 
-                communication between the ECE instances.
-
- -i --instance <instance>
-      The type instance, such as editor1, web1 or search1
-
- -p --publication <publication>
-      Needed only for updating publication resources
-
- -r --resource <resource>
-      Needed only for updating publication resources.
-      Must be one of: content-type, feature, layout, layout-group
-                      image-version, menu
- -v --verbose
-      Prints out debug statements, useful for debugging.
+===================================
+Features of the /usr/bin/ece-import script
+===================================
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/ece-import-guide.org
 
-The following commands are available:
-   applog     the type's app server log
-   assemble   runs the Assembly Tool *)
-   clean      removes temporary files created by /home/torstein/bin/ece *)
-   deploy     deploys the assembled EAR *)
-   help       prints this help screen
-   kill       uses force to stop the type
-   log        the type's Log4J log
-   outlog     the [ece#engine] script log (system out log)
-   restart    restarts the type
-   start      starts the type
-   status     checks if the type is running
-   stop       stops the type
-   threaddump write a thread dump to standard out (system out log)
-   update     update publication resources
-   versions   lists the ECE component versions
+============================================
+Features of the /usr/sbin/ece-install script
+============================================
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/ece-install-guide.org
 
-*) only applicable if type is 'engine'
+===========================================
+Features of the /usr/bin/system-info script
+===========================================
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/system-info-guide.org
 
-==========================
-Feedback
-==========================
+====================================
+Features of the /usr/bin/vosa script
+====================================
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/vizrt/vosa-guide.org
 
+========
+Feedback
+========
 Hope you enjoy the ece /usr/bin and intit.d scripts. All feedback,
 come hither!
 
--torstein@escenic.com
+Escenic Support support(at)escenic.com
 
+(The founder of this repo , Torstein, has move(d) on to other challenges)
 
+Commits to this repo will also show in our vosa hipchat room
diff --git a/TODO.md b/TODO.md
@@ -0,0 +1,65 @@
+
+# Version 3.x aka "akbash"
+
+## /usr/sbin/ece-install
+
+### ✔ Install ECE from APT 
+Support for installing ECE & plugins using the escenic APT
+repositories.
+
+- ✔ Editor profile (Escenic Content Engine) 
+- ✔ Presentation profile (Escenic Content Engine)
+- ✔ Search profile (ECE's indexer-webapp + Solr)
+- ✔ DB profile, ECE
+- ✔ DB profile, ECE plugins
+- ✔ Create publication(s) profile → Move to `/usr/bin/ece`
+- ✔ Analysis profile (Escenic Analysis Engine)
+- ✔ Analysis DB profile
+- ✔ Cache server profile
+- ✔ Assembly Tool
+
+### ✔ Install ECE from RPMs
+Support for installing ECE & plugins using the escenic RPM packages.
+
+- ✔ Editor profile (Escenic Content Engine) 
+- ✔ Presentation profile (Escenic Content Engine)
+- ✔ Search profile (ECE's indexer-webapp + Solr)
+- ✔ DB profile, ECE
+- ✔ DB profile, ECE plugins
+- ✔ Create publication(s) profile → Move to `/usr/bin/ece`
+- ✔ Analysis profile (Escenic Analysis Engine)
+- ✔ Analysis DB profile
+- ✔ Cache server profile
+- ✔ Assembly Tool
+
+### ✔ Support for Varnish 4
+
+Varnish 3 has reached its end of life and Varnish 4 is in the official
+repositories of Debian stable, Ubuntu LTS and CentOS 7 and RedHat 7.
+
+### ✔ YAML configuration file format
+
+See the [unit tests](usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh) for
+configuration examples.
+
+###  ✔ Remove the interactive mode. 
+
+It's rarely used and complicates the source code and configuration
+options unnecessarily.
+
+## ✔ /usr/bin/ece
+
+- ✔ New sub command: /usr/bin/ece create-publication
+
+- ✔ Easy to extend, e.g. put `create-publication.sh` in a directory,
+  e.g.`ece.d`, and get `ece create-publication`. The
+  `create-publication` sub command is then included in TAB completion,
+  help screens and `man` pages.
+
+
+## Version 4.x
+###  Easier to extend `ece-install`
+
+Preferably in any language. Put a file in a directory and
+`ece-install` will execute that file at a predictable point in time.
+
diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
@@ -1,40 +1,129 @@
-# auto completion for the /usr/bin/ece command.
-_ece_commands()
+# auto completion for the /usr/bin/ece command.       Emacs: -*- sh -*- mode
+
+_get_sub_commands_for_ece() {
+  cat <<EOF
+      applog
+      assemble
+      backup
+      clean
+      deploy
+      edit
+      flush
+      help
+      info
+      kill
+      list-deployments
+      list-instances
+      list-logs
+      list-publications
+      log
+      outlog
+      package
+      remove-old-log-files
+      repackage
+      restart start
+      status
+      stop
+      threaddump
+      top
+      update
+      versions
+EOF
+
+  # Dynamic lookup of available sub commands for /usr/bin/ece
+  (
+    local cmd_dir=/usr/share/escenic/ece-scripts/ece.d
+    if [ ! -d "${cmd_dir}" ]; then
+      return
+    fi
+
+    for el in "${cmd_dir}"/*.sh; do
+      source "${el}"
+    done
+    declare -F |
+      awk '{print $3}' |
+      sed -n 's#^cmd_##p' |
+      sed 's#_#-#g'
+  )
+}
+
+_get_completions_for_ece_command()
 {
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble clean deploy help kill log outlog restart start status stop threaddump update versions"
-    resources="content-type feature layout layout-group image-version menu"
+    commands=$(_get_sub_commands_for_ece)
+
+    options="-i --instance -p --publication -r --publication-resource
+             -t --type -u --user -w --password"
+    resources="content-type feature layout layout-group image-version menu
+               section-feed security root-section-parameters"
     types="engine search analysis rmi-hub"
 
     # default completions is the list of commands
-    completions=$commands
-
-    long_options="--help"
-
-    # TODO make educated guesses on these.
-    instances=""
-    publications=""
+    completions=$commands" "$options
 
     case "$prev" in
-        -t)
+        backup)
+            exclude_list="
+              --exclude-binaries
+              --exclude-solr
+              --exclude-init
+              --exclude-conf
+              --exclude-db  
+              --exclude-state
+              --exclude-multimedia
+            "
+            completions="$exclude_list $commands"
+            ;;
+        deploy|repackage)
+            completions="--file --uri $commands"
+            ;;
+        -t|--type)
             completions=$types
             ;;
-        -i)
-            completions=$instances
+        -i|--instance)
+            completions=$(ece -q list-instances)
             ;;
-        -p)
-            completions=$publications
+        -p|--publication)
+            local file=/usr/share/escenic/ece-scripts/common-ece.sh
+            if [ -r $file ]; then
+              source $file
+              completions=$(get_publication_list)
+            else
+              completions=""
+            fi
             ;;
-        -r)
+        -r|--publication-resource)
             completions=$resources
             ;;
+        *)
+          if [[ "${prev}" != "$1" ]]; then
+            completions=${completions}" "$(get_completions_for_cmd "${prev}")
+          fi
+        #   ;;
     esac
 
     COMPREPLY=( $(compgen -W "$completions" -- $cur) )
 }
 
-complete -F _ece_commands ece
+## $1 :: cmd name
+get_completions_for_cmd() {
+  local cmd=$1
+  local cmd_completion_function=complete_${cmd//-/_}
 
+  local cmd_dir=/usr/share/escenic/ece-scripts/ece.d
+  if [ ! -d "${cmd_dir}" ]; then
+    return
+  fi
+
+  for el in "${cmd_dir}"/*.sh; do
+    source "${el}" 2>/dev/null
+  done
+
+  declare -F |
+    grep -q -w "${cmd_completion_function}" &&
+    "${cmd_completion_function}"
+}
 
+complete -F _get_completions_for_ece_command ece
diff --git a/etc/bash_completion.d/ece-deploy b/etc/bash_completion.d/ece-deploy
@@ -0,0 +1,33 @@
+# auto completion for the ece-deploy command.                    -*- sh -*-
+
+_ece-deploy_commands()
+{
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    options="
+      --conf
+      --ear
+      --force
+      --list-deployments
+      --update-publication-resources
+    "
+
+    # default completions is the list of options
+    case "$prev" in
+        --conf)
+        completions="http://"
+        ;;
+        --ear)
+        completions="http://"
+        ;;
+      *)
+        completions="$options"
+        ;;
+    esac
+
+    COMPREPLY=( $(compgen -W "$completions" -- $cur) )
+}
+
+complete -o default -F _ece-deploy_commands ece-deploy
+
diff --git a/etc/bash_completion.d/ece-import b/etc/bash_completion.d/ece-import
@@ -0,0 +1,32 @@
+# auto completion for the ece-import command.                    -*- sh -*-
+
+_ece-import_commands()
+{
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    options="
+      --directories-only
+      --escenic-group
+      --escenic-user
+      --import-archive
+      --name
+      --password
+      --publication
+      --uri
+      --user
+      --version
+      -V
+      -f
+      -n
+      -p
+    "
+
+    # default completions is the list of options
+    completions="$options"
+
+    COMPREPLY=( $(compgen -W "$completions" -- $cur) )
+}
+
+complete -o default -F _ece-import_commands ece-import
+