Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

2016-03-17 22:40:00 +00:00 · 2016-03-17 22:40:00 +00:00 · 14ce41435b
parent 90862b6081 ddea85ff44
commit 14ce41435b
23 changed files with 405 additions and 225 deletions
--- a/3rdParty/OpenSSL/CMakeLists.txt
+++ b/3rdParty/OpenSSL/CMakeLists.txt
@ -35,7 +35,7 @@ set(OPENSSL_INCLUDE_DIR
  "OpenSSL: Include Directory"
 )

-if (WIN32)
+if (WIN32 AND NOT SSL_NUGET)
  if (DEBUG)
    set(OPENSSL_EXT "d")
  else ()
--- a/3rdParty/V8/CMakeLists.txt
+++ b/3rdParty/V8/CMakeLists.txt
@ -33,12 +33,17 @@ endif()

 # detect 32bit or 64bit

-if ("${BITS}" STREQUAL "64")
-  set(V8_PROC_ARCH "x64")
+if ("${CMAKE_TARGET_ARCHITECTURES}" STREQUAL "armv7")
+  set(V8_PROC_ARCH "arm")
+  list(APPEND V8_GYP_ARGS -Darm_version=7 -Darm_fpu=default -Darm_float_abi=default)
 else ()
-  message(ERROR "#### WILLY FIX ME ####")
-  set(V8_PROC_ARCH "ia32")
-endif () # TODO: ARM? Win32?
+  if ("${BITS}" STREQUAL "64")
+    set(V8_PROC_ARCH "x64")
+  else ()
+    set(V8_PROC_ARCH "ia32")
+  endif ()
+endif()
+

 # target architecture

@ -119,7 +124,7 @@ if (${CMAKE_GENERATOR} MATCHES "Ninja")
  # Gyp wants to use its own clang if we don't set this:
  list(APPEND V8_GYP_ARGS
    -Dclang=0)
-#    -Dv8_use_snapshot=true
+
  list(APPEND V8_GYP_ARGS
    -I${V8_DIR}/build/standalone.gypi
    --depth=.
@ -131,6 +136,7 @@ if (${CMAKE_GENERATOR} MATCHES "Ninja")
  )

  set(NINJA_BUILD_DIR "${V8_TARGET_DIR}/${NINJA_TARGET}")
+
  ExternalProject_Add(v8_build
    SOURCE_DIR
      "${V8_DIR}"
@ -323,6 +329,10 @@ else ()

  option(USE_DEBUG_V8 "compile V8 in DEBUG mode" OFF)

+  set(V8_CFLAGS   "")
+  set(V8_CXXFLAGS "")
+  set(V8_LDFLAGS "")
+
  if (USE_DEBUG_V8)
    set(V8_TARGET_ARCH "${V8_PROC_ARCH}.debug")
  else ()
@ -361,6 +371,11 @@ else ()
    -Dwerror=
  )

+  if (APPLE AND CMAKE_COMPILER_IS_CLANG)
+    set(V8_CXXFLAGS "${V8_CXXFLAGS} -stdlib=libc++")
+    set(V8_LDFLAGS  "${V8_LDFLAGS} -stdlib=libc++")
+  endif ()
+
  set(V8_COMPILE_ARGS
    -C ${V8_TARGET_DIR}
    -f Makefile.${V8_TARGET_ARCH}
@ -368,12 +383,11 @@ else ()
    builddir=${V8_TARGET_DIR}/${V8_TARGET_ARCH}
    CC=${CMAKE_C_COMPILER}
    CXX=${CMAKE_CXX_COMPILER}
+    CFLAGS=${V8_CFLAGS}
+    CXXFLAGS=${V8_CXXFLAGS}
+    LDFLAGS=${V8_LDFLAGS}
  )

-  if (APPLE AND CMAKE_COMPILER_IS_CLANG)
-    list(APPEND V8_COMPILE_ARGS CXXFLAGS=-stdlib=libc++ LDFLAGS=-stdlib=libc++)
-  endif ()
-
  list(APPEND V8_COMPILE_ARGS icui18n icuuc icudata)
  list(APPEND V8_COMPILE_ARGS v8)

--- a/3rdParty/V8/V8-4.3.61/build/standalone.gypi
+++ b/3rdParty/V8/V8-4.3.61/build/standalone.gypi
@ -325,6 +325,7 @@
      },
    }],
    ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH']}],
+    ['OS=="solaris"', {'target_defaults': {'cflags': ['-m64']}}],
    ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
       or OS=="netbsd" or OS=="aix"', {
      'target_defaults': {
@ -336,9 +337,8 @@
          '-pthread',
          '-fno-exceptions',
          '-pedantic',
-	  '-m64',
          # Don't warn about the "struct foo f = {0};" initialization pattern.
-          '-Wno-missing-field-initializers',
+          '-Wno-missing-field-initializers'
        ],
        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ],
        'ldflags': [ '-pthread', '-march=x86-64', '-m64'],
--- a/3rdParty/V8/V8-4.3.61/build/toolchain.gypi
+++ b/3rdParty/V8/V8-4.3.61/build/toolchain.gypi
@ -975,12 +975,13 @@
         or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
        'conditions': [
          [ 'v8_no_strict_aliasing==1', {
-            'cflags': [ '-fno-strict-aliasing -m64' ],
+            'cflags': [ '-fno-strict-aliasing' ],
          }],
        ],  # conditions
      }],
      ['OS=="solaris"', {
        'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
+        'cflags': ['-m64']
      }],
      ['OS=="freebsd" or OS=="openbsd"', {
        'cflags': [ '-I/usr/local/include' ],
--- a/Documentation/CMakeLists.txt
+++ b/Documentation/CMakeLists.txt
@ -1,13 +1,14 @@
 # -*- mode: CMAKE; -*-

 # swagger
-add_custom_target (swagger
-  COMMAND ${PYTHON_EXECUTABLE}
-    ${PROJECT_SOURCE_DIR}/Documentation/Scripts/generateSwagger.py
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/api-docs api-docs
-    ${PROJECT_SOURCE_DIR}/Documentation/DocuBlocks/Rest/
-    > ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/api-docs.json)
+add_custom_target(swagger
+  COMMAND ${PROJECT_SOURCE_DIR}/utils/generateSwagger.sh
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+# swagger
+add_custom_target(examples
+  COMMAND ${PROJECT_SOURCE_DIR}/utils/generateExamples.sh
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})

 # manual pages
 if (USE_MAINTAINER_MODE)
--- a/arangod/RestServer/ArangoServer.cpp
+++ b/arangod/RestServer/ArangoServer.cpp
@ -1973,7 +1973,7 @@ int ArangoServer::runScript(TRI_vocbase_t* vocbase) {
      v8::Context::Scope contextScope(localContext);
      for (size_t i = 0; i < _scriptFile.size(); ++i) {
        bool r =
-            TRI_ExecuteGlobalJavaScriptFile(isolate, _scriptFile[i].c_str());
+            TRI_ExecuteGlobalJavaScriptFile(isolate, _scriptFile[i].c_str(), true);

        if (!r) {
          LOG(FATAL) << "cannot load script '" << _scriptFile[i]
--- a/arangosh/Shell/V8ShellFeature.cpp
+++ b/arangosh/Shell/V8ShellFeature.cpp
@ -138,8 +138,8 @@ void V8ShellFeature::stop() {
    v8::Locker locker{_isolate};
    v8::Isolate::Scope isolate_scope{_isolate};

-    TRI_v8_global_t* v8g =                                              \
-      static_cast<TRI_v8_global_t*>(_isolate->GetData(V8DataSlot));
+    TRI_v8_global_t* v8g =
+        static_cast<TRI_v8_global_t*>(_isolate->GetData(V8DataSlot));
    _isolate->SetData(V8DataSlot, nullptr);

    delete v8g;
@ -246,8 +246,7 @@ V8ClientConnection* V8ShellFeature::setup(
      v8connection = std::make_unique<V8ClientConnection>(
          connection, client->databaseName(), client->username(),
          client->password(), client->requestTimeout());
-    }
-    else {
+    } else {
      client = nullptr;
    }
  }
@ -285,8 +284,10 @@ int V8ShellFeature::runShell(std::vector<std::string> const& positionals) {

  V8LineEditor v8LineEditor(_isolate, context, "." + _name + ".history");

-  v8LineEditor.setSignalFunction(
-      [&v8connection]() { v8connection->setInterrupted(true); });
+  if (v8connection != nullptr) {
+    v8LineEditor.setSignalFunction(
+        [&v8connection]() { v8connection->setInterrupted(true); });
+  }

  v8LineEditor.open(_console->autoComplete());

@ -372,7 +373,9 @@ int V8ShellFeature::runShell(std::vector<std::string> const& positionals) {
      promptError = true;
    }

-    v8connection->setInterrupted(false);
+    if (v8connection != nullptr) {
+      v8connection->setInterrupted(false);
+    }

    _console->stopPager();
    _console->printLine("");
@ -442,7 +445,7 @@ bool V8ShellFeature::runScript(std::vector<std::string> const& files,
      current->ForceSet(TRI_V8_ASCII_STRING2(_isolate, "__dirname"),
                        TRI_V8_STD_STRING2(_isolate, dirname));

-      ok = TRI_ExecuteGlobalJavaScriptFile(_isolate, file.c_str());
+      ok = TRI_ExecuteGlobalJavaScriptFile(_isolate, file.c_str(), true);

      // restore old values for __dirname and __filename
      if (oldFilename.IsEmpty() || oldFilename->IsUndefined()) {
@ -465,7 +468,7 @@ bool V8ShellFeature::runScript(std::vector<std::string> const& files,
        ok = false;
      }
    } else {
-      ok = TRI_ParseJavaScriptFile(_isolate, file.c_str());
+      ok = TRI_ParseJavaScriptFile(_isolate, file.c_str(), true);
    }
  }

@ -566,7 +569,7 @@ bool V8ShellFeature::jslint(std::vector<std::string> const& files) {
  TRI_ExecuteJavaScriptString(_isolate, context, input, name, true);

  if (tryCatch.HasCaught()) {
-      LOG(ERR) << TRI_StringifyV8Exception(_isolate, &tryCatch);
+    LOG(ERR) << TRI_StringifyV8Exception(_isolate, &tryCatch);
    ok = false;
  } else {
    bool res = TRI_ObjectToBoolean(context->Global()->Get(
@ -855,8 +858,7 @@ void V8ShellFeature::initMode(ShellFeature::RunMode runMode,

  TRI_AddGlobalVariableVocbase(
      _isolate, context, TRI_V8_ASCII_STRING2(_isolate, "IS_UNIT_TESTS"),
-      v8::Boolean::New(_isolate,
-                       runMode == ShellFeature::RunMode::UNIT_TESTS));
+      v8::Boolean::New(_isolate, runMode == ShellFeature::RunMode::UNIT_TESTS));

  TRI_AddGlobalVariableVocbase(
      _isolate, context, TRI_V8_ASCII_STRING2(_isolate, "IS_JS_LINT"),
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@ -70,23 +70,43 @@ if(OPENSSL_USE_STATIC_LIBS)
 endif()

 if (WIN32)
-  # http://www.slproweb.com/products/Win32OpenSSL.html
-  set(_OPENSSL_ROOT_HINTS
-    ${OPENSSL_ROOT_DIR}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
-    ENV OPENSSL_ROOT_DIR
-    )
-  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
-  set(_OPENSSL_ROOT_PATHS
-    "${_programfiles}/OpenSSL"
-    "${_programfiles}/OpenSSL-Win32"
-    "${_programfiles}/OpenSSL-Win64"
-    "C:/OpenSSL/"
-    "C:/OpenSSL-Win32/"
-    "C:/OpenSSL-Win64/"
-    )
-  unset(_programfiles)
+  if (IS_DIRECTORY "${OPENSSL_ROOT_DIR}/build/native/")
+    set(SSL_NUGET TRUE)
+  else()
+    set(SSL_NUGET FALSE)
+  endif()
+  if (OPENSSL_ROOT_DIR AND SSL_NUGET)
+    message("Found nuGET installation of OpenSSL!")
+    set(SSL_BITS "x64")
+    # its an openssl downloaded via nuget!
+    set(OPENSSL_INCLUDE "${OPENSSL_ROOT_DIR}/build/native/include")
+    set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
+
+    set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/lib/native/v140/windesktop/msvcstl/dyn/rt-dyn/${SSL_BITS}")
+    set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
+
+    set(_OPENSSL_ROOT_PATHS
+      "${OPENSSL_ROOT_DIR}/build/native/include"
+      "${OPENSSL_ROOT_DIR}/lib/native/v140/windesktop/msvcstl/dyn/rt-dyn/${SSL_BITS}/")
+  else()
+    # http://www.slproweb.com/products/Win32OpenSSL.html
+    set(_OPENSSL_ROOT_HINTS
+      ${OPENSSL_ROOT_DIR}
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
+      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+      ENV OPENSSL_ROOT_DIR
+      )
+    file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+    set(_OPENSSL_ROOT_PATHS
+      "${_programfiles}/OpenSSL"
+      "${_programfiles}/OpenSSL-Win32"
+      "${_programfiles}/OpenSSL-Win64"
+      "C:/OpenSSL/"
+      "C:/OpenSSL-Win32/"
+      "C:/OpenSSL-Win64/"
+      )
+    unset(_programfiles)
+  endif()
 else ()
  set(_OPENSSL_ROOT_HINTS
    ${OPENSSL_ROOT_DIR}
@ -110,7 +130,60 @@ find_path(OPENSSL_INCLUDE_DIR
 )

 if(WIN32 AND NOT CYGWIN)
-  if(MSVC)
+  if (SSL_NUGET)
+    # /MD and /MDd are the standard values - if someone wants to use
+    # others, the libnames have to change here too
+    # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
+    # enable OPENSSL_MSVC_STATIC_RT to get the libs build /MT (Multithreaded no-DLL)
+
+    # Implementation details:
+    # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
+    # libeay32MD.lib is identical to ../libeay32.lib, and
+    # ssleay32MD.lib is identical to ../ssleay32.lib
+    # enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static
+
+    #if (OPENSSL_MSVC_STATIC_RT)
+    #  set(_OPENSSL_MSVC_RT_MODE "MT")
+    #else ()
+    #  set(_OPENSSL_MSVC_RT_MODE "MD")
+    #endif ()
+
+    set(LIB_EAY_DEBUG LIB_EAY_DEBUG-NOTFOUND)
+    if (EXISTS "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
+      set(LIB_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/libeay32.lib")
+    endif()
+
+    set(LIB_EAY_RELEASE LIB_EAY_RELEASE-NOTFOUND)
+    if (EXISTS "${OPENSSL_LIB_DIR}/release/libeay32.lib")
+      set(LIB_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/libeay32.lib")
+    endif()
+
+    set(SSL_EAY_DEBUG SSL_EAY_DEBUG-NOTFOUND)
+    if (EXISTS "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
+      set(SSL_EAY_DEBUG "${OPENSSL_LIB_DIR}/debug/ssleay32.lib")
+    endif()
+
+    set(SSL_EAY_RELEASE SSL_EAY_RELEASE-NOTFOUND)
+    if (EXISTS "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
+      set(SSL_EAY_RELEASE "${OPENSSL_LIB_DIR}/release/ssleay32.lib")
+    endif()
+
+    set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
+    set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
+    set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
+    set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
+
+    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+    select_library_configurations(LIB_EAY)
+    select_library_configurations(SSL_EAY)
+
+    mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
+                     SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
+    set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
+    set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
+    set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
+
+  elseif(MSVC)
    # /MD and /MDd are the standard values - if someone wants to use
    # others, the libnames have to change here too
    # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
@ -374,7 +447,6 @@ else ()
 endif ()

 mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
-
 if(OPENSSL_FOUND)
  if(NOT TARGET OpenSSL::Crypto AND
      (EXISTS "${OPENSSL_CRYPTO_LIBRARY}" OR
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@ -122,7 +122,7 @@ const optionsDocumentation = [

 const optionsDefaults = {
  "build": "",
-  "buildType": "",    
+  "buildType": "",
  "cleanup": true,
  "cluster": false,
  "clusterNodes": 2,
@ -2275,15 +2275,18 @@ const benchTodos = [{
  "requests": "500",
  "concurrency": "3",
  "test-case": "aqltrx",
-  "complexity": "1"
+  "complexity": "1",
+  "transaction": true
 }, {
  "requests": "100",
  "concurrency": "3",
-  "test-case": "counttrx"
+  "test-case": "counttrx",
+  "transaction": true
 }, {
  "requests": "500",
  "concurrency": "3",
-  "test-case": "multitrx"
+  "test-case": "multitrx",
+  "transaction": true
 }];

 testFuncs.arangob = function(options) {
@ -2329,9 +2332,7 @@ testFuncs.arangob = function(options) {
    }

    // On the cluster we do not yet have working transaction functionality:
-    if (!options.cluster ||
-      (benchTodo.test !== "counttrx" &&
-        benchTodo.test !== "multitrx")) {
+    if (!options.cluster || !benchTodo.transaction) {

      if (!continueTesting) {
        print("Skipping " + benchTodo + ", server is gone.");
@ -4168,11 +4169,11 @@ function unitTest(cases, options) {
  BIN_DIR = fs.join(TOP_DIR, builddir, "bin");
  UNITTESTS_DIR = fs.join(TOP_DIR, fs.join(builddir, "tests"));

-  if (options.buildType !== "")  {
+  if (options.buildType !== "") {
    BIN_DIR = fs.join(BIN_DIR, options.buildType);
    UNITTESTS_DIR = fs.join(UNITTESTS_DIR, options.buildType);
  }
-	
+
  CONFIG_DIR = fs.join(TOP_DIR, builddir, "etc", "arangodb");
  ARANGOB_BIN = fs.join(BIN_DIR, "arangob");
  ARANGODUMP_BIN = fs.join(BIN_DIR, "arangodump");
--- a/js/common/bootstrap/modules.js
+++ b/js/common/bootstrap/modules.js
@ -375,19 +375,25 @@ Module._resolveDbModule = function (request) {
  if (request.charAt(0) !== '/') {
    request = '/' + request;
  }
+
  var dbModule = Module._dbCache[request];
-  if (!dbModule && internal.db._modules !== undefined) {
+
+  if (!dbModule && internal.db !== undefined && internal.db._modules !== undefined) {
    dbModule = internal.db._modules.firstExample({path: request});
+
    if (!dbModule) {
      // try again, but prefix module with '/db' as some modules seem
      // to have been saved with that prefix...
      dbModule = internal.db._modules.firstExample({path: '/db:' + request});
+
      if (!dbModule) {
        return null;
      }
    }
+
    Module._dbCache[request] = dbModule;
  }
+
  return dbModule;
 };

--- a/js/server/modules/@arangodb/aql.js
+++ b/js/server/modules/@arangodb/aql.js
@ -4989,7 +4989,11 @@ function AQL_DATE_ISO8601 () {
  'use strict';

  try {
-    return MAKE_DATE(arguments, "DATE_ISO8601").toISOString();
+    var dt = MAKE_DATE(arguments, "DATE_ISO8601");
+    if (dt === null) {
+      return dt;
+    }
+    return dt.toISOString();
  }
  catch (err) {
    WARN("DATE_ISO8601", INTERNAL.errors.ERROR_QUERY_INVALID_DATE_VALUE);
--- a/lib/ApplicationFeatures/LoggerFeature.cpp
+++ b/lib/ApplicationFeatures/LoggerFeature.cpp
@ -50,6 +50,12 @@ LoggerFeature::LoggerFeature(application_features::ApplicationServer* server)
 void LoggerFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
  LOG_TOPIC(TRACE, Logger::STARTUP) << name() << "::collectOptions";

+  options->addSection(
+      Section("", "Global configuration", "global options", false, false));
+
+  options->addOption("--log", "the global or topic-specific log level",
+                     new VectorParameter<StringParameter>(&_levels));
+
  options->addSection("log", "Configure the logging");

  options->addOption("--log.output,-o", "log destination(s)",
@ -69,9 +75,6 @@ void LoggerFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
      "--log.prefix", "adds a prefix in case multiple instances are running",
      new StringParameter(&_prefix));

-  options->addOption("--log", "the global or topic-specific log level",
-                     new VectorParameter<StringParameter>(&_levels));
-
  options->addHiddenOption("--log.file",
                           "shortcut for '--log.output file://<filename>'",
                           new StringParameter(&_file));
--- a/lib/Rest/Endpoint.cpp
+++ b/lib/Rest/Endpoint.cpp
@ -219,7 +219,11 @@ Endpoint* Endpoint::factory(const Endpoint::EndpointType type,
      return nullptr;
    }

+#ifndef _WIN32
    return new EndpointSrv(specification.substr(6));
+#else
+    return nullptr;
+#endif
  }

  else if (!StringUtils::isPrefix(domainType, "tcp://")) {
--- a/lib/V8/v8-utils.cpp
+++ b/lib/V8/v8-utils.cpp
@ -150,7 +150,7 @@ static void CreateErrorObject(v8::Isolate* isolate, int errorNumber,
 ////////////////////////////////////////////////////////////////////////////////

 static bool LoadJavaScriptFile(v8::Isolate* isolate, char const* filename,
-                               bool execute, bool useGlobalContext) {
+                               bool stripShebang, bool execute, bool useGlobalContext) {
  v8::HandleScope handleScope(isolate);

  size_t length;
@ -162,17 +162,34 @@ static bool LoadJavaScriptFile(v8::Isolate* isolate, char const* filename,
    return false;
  }

+  // detect shebang
+  size_t bangOffset = 0;
+  if (stripShebang) {
+    if (strncmp(content, "#!", 2) == 0) {
+      // shebang
+      char const* endOfBang = strchr(content, '\n');
+      if (endOfBang != nullptr) {
+        bangOffset = size_t(endOfBang - content + 1);
+        TRI_ASSERT(bangOffset <= length);
+        length -= bangOffset;
+      }
+    }
+  }
+
  if (useGlobalContext) {
    char const* prologue = "(function() { ";
    char const* epilogue = "/* end-of-file */ })()";

    char* contentWrapper = TRI_Concatenate3String(TRI_UNKNOWN_MEM_ZONE,
-                                                  prologue, content, epilogue);
+                                                  prologue, content + bangOffset, epilogue);

    TRI_FreeString(TRI_UNKNOWN_MEM_ZONE, content);

    length += strlen(prologue) + strlen(epilogue);
    content = contentWrapper;
+
+    // shebang already handled here
+    bangOffset = 0;
  }

  if (content == nullptr) {
@ -182,7 +199,7 @@ static bool LoadJavaScriptFile(v8::Isolate* isolate, char const* filename,
  }

  v8::Handle<v8::String> name = TRI_V8_STRING(filename);
-  v8::Handle<v8::String> source = TRI_V8_PAIR_STRING(content, (int)length);
+  v8::Handle<v8::String> source = TRI_V8_PAIR_STRING(content + bangOffset, (int)length);

  TRI_FreeString(TRI_UNKNOWN_MEM_ZONE, content);

@ -225,7 +242,7 @@ static bool LoadJavaScriptFile(v8::Isolate* isolate, char const* filename,
 ////////////////////////////////////////////////////////////////////////////////

 static bool LoadJavaScriptDirectory(v8::Isolate* isolate, char const* path,
-                                    bool execute, bool useGlobalContext) {
+                                    bool stripShebang, bool execute, bool useGlobalContext) {
  v8::HandleScope scope(isolate);
  bool result;

@ -246,7 +263,7 @@ static bool LoadJavaScriptDirectory(v8::Isolate* isolate, char const* path,

    full = TRI_Concatenate2File(path, filename.c_str());

-    ok = LoadJavaScriptFile(isolate, full, execute, useGlobalContext);
+    ok = LoadJavaScriptFile(isolate, full, stripShebang, execute, useGlobalContext);
    TRI_FreeString(TRI_CORE_MEM_ZONE, full);

    result = result && ok;
@ -3828,8 +3845,8 @@ void TRI_LogV8Exception(v8::Isolate* isolate, v8::TryCatch* tryCatch) {
 ////////////////////////////////////////////////////////////////////////////////

 bool TRI_ExecuteGlobalJavaScriptFile(v8::Isolate* isolate,
-                                     char const* filename) {
-  return LoadJavaScriptFile(isolate, filename, true, false);
+                                     char const* filename, bool stripShebang) {
+  return LoadJavaScriptFile(isolate, filename, stripShebang, true, false);
 }

 ////////////////////////////////////////////////////////////////////////////////
@ -3838,7 +3855,7 @@ bool TRI_ExecuteGlobalJavaScriptFile(v8::Isolate* isolate,

 bool TRI_ExecuteGlobalJavaScriptDirectory(v8::Isolate* isolate,
                                          char const* path) {
-  return LoadJavaScriptDirectory(isolate, path, true, false);
+  return LoadJavaScriptDirectory(isolate, path, false, true, false);
 }

 ////////////////////////////////////////////////////////////////////////////////
@ -3847,15 +3864,16 @@ bool TRI_ExecuteGlobalJavaScriptDirectory(v8::Isolate* isolate,

 bool TRI_ExecuteLocalJavaScriptDirectory(v8::Isolate* isolate,
                                         char const* path) {
-  return LoadJavaScriptDirectory(isolate, path, true, true);
+  return LoadJavaScriptDirectory(isolate, path, false, true, true);
 }

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief parses a file
 ////////////////////////////////////////////////////////////////////////////////

-bool TRI_ParseJavaScriptFile(v8::Isolate* isolate, char const* filename) {
-  return LoadJavaScriptFile(isolate, filename, false, false);
+bool TRI_ParseJavaScriptFile(v8::Isolate* isolate, char const* filename,
+                             bool stripShebang) {
+  return LoadJavaScriptFile(isolate, filename, stripShebang, false, false);
 }

 ////////////////////////////////////////////////////////////////////////////////
--- a/lib/V8/v8-utils.h
+++ b/lib/V8/v8-utils.h
@ -114,7 +114,7 @@ void TRI_LogV8Exception(v8::Isolate* isolate, v8::TryCatch*);
 /// @brief reads a file into the current context
 ////////////////////////////////////////////////////////////////////////////////

-bool TRI_ExecuteGlobalJavaScriptFile(v8::Isolate* isolate, char const*);
+bool TRI_ExecuteGlobalJavaScriptFile(v8::Isolate* isolate, char const*, bool);

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief reads all files from a directory into the current context
@ -132,7 +132,7 @@ bool TRI_ExecuteLocalJavaScriptDirectory(v8::Isolate* isolate, char const*);
 /// @brief parses a file
 ////////////////////////////////////////////////////////////////////////////////

-bool TRI_ParseJavaScriptFile(v8::Isolate* isolate, char const*);
+bool TRI_ParseJavaScriptFile(v8::Isolate* isolate, char const*, bool);

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief executes a string within a V8 context, optionally print the result
--- a/utils/generateErrorfile.py
+++ b/utils/generateErrorfile.py
--- a/utils/generateExamples
+++ b/utils/generateExamples
@ -1,60 +0,0 @@
-#!/bin/bash
-export PID=$$
-
-if test -n "$ORIGINAL_PATH"; then
-  # running in cygwin...
-  PS='\'
-  export EXT=".exe"
-else
-  export EXT=""
-  PS='/'
-fi;
-
-SCRIPT="utils${PS}generateExamples.js"
-LOGFILE="out${PS}log-$PID"
-DBDIR="out${PS}data-$PID"
-
-mkdir -p ${DBDIR}
-
-echo Database has its data in ${DBDIR}
-echo Logfile is in ${LOGFILE}
-
-if [ -z "${ARANGOD}" ];  then
-  if [ -x build/bin/arangod ];  then
-    ARANGOD=build/bin/arangod
-  elif [ -x bin/arangosh ];  then
-    ARANGOD=bin/arangod
-  else
-    echo "$0: cannot locate arangod"
-  fi
-fi
-
-${ARANGOD} \
-    --configuration none \
-    --cluster.agent-path bin${PS}etcd-arango${EXT} \
-    --cluster.arangod-path bin${PS}arangod \
-    --cluster.coordinator-config etc${PS}relative${PS}arangod-coordinator.conf \
-    --cluster.dbserver-config etc${PS}relative${PS}arangod-dbserver.conf \
-    --cluster.disable-dispatcher-frontend false \
-    --cluster.disable-dispatcher-kickstarter false \
-    --cluster.data-path cluster \
-    --cluster.log-path cluster \
-    --database.directory ${DBDIR} \
-    --log.file ${LOGFILE} \
-    --server.endpoint tcp://127.0.0.1:$PORT \
-    --javascript.startup-directory js \
-    --javascript.app-path js${PS}apps \
-    --javascript.script $SCRIPT \
-    --no-server \
-    --temp-path ${PS}var${PS}tmp \
-    "${ARGS[@]}" \
-
-if test $? -eq 0; then
-  echo "removing ${LOGFILE} ${DBDIR}"
-  rm -rf ${LOGFILE} ${DBDIR}
-else
-  echo "failed - don't remove ${LOGFILE} ${DBDIR} - here's the logfile:"
-  cat ${LOGFILE}
-fi
-
-echo Server has terminated.
--- a/utils/generateExamples.js
+++ b/utils/generateExamples.js
@ -1,58 +1,93 @@
 /*jshint globalstrict:false, unused:false */
 /*global start_pretty_print */
+'use strict';

-var fs = require("fs");
-var internal = require("internal");
-var executeExternal = require("internal").executeExternal;
-var executeExternalAndWait = internal.executeExternalAndWait;
-var download = require("internal").download;
-var print = internal.print;
-var wait = require("internal").wait;
-var killExternal = require("internal").killExternal;
-var toArgv = require("internal").toArgv;
-var statusExternal = require("internal").statusExternal;
+const fs = require("fs");
+const internal = require("internal");
+const executeExternal = internal.executeExternal;
+const executeExternalAndWait = internal.executeExternalAndWait;
+const download = internal.download;
+const print = internal.print;
+const wait = internal.wait;
+const killExternal = internal.killExternal;
+const toArgv = internal.toArgv;
+const statusExternal = internal.statusExternal;
+const testPort = internal.testPort;

-var yaml = require("js-yaml");
-var endpointToURL = require("@arangodb/cluster/planner").endpointToURL;
-var PortFinder = require("@arangodb/cluster").PortFinder;
+const yaml = require("js-yaml");

-var documentationSourceDirs = [
+const documentationSourceDirs = [
  fs.join(fs.makeAbsolute(''), "Documentation/Examples/setup-arangosh.js"),
-  fs.join(fs.makeAbsolute(''), "Documentation/Books/Users"),
-  fs.join(fs.makeAbsolute(''), "js/actions"),
-  fs.join(fs.makeAbsolute(''), "js/client"),
-  fs.join(fs.makeAbsolute(''), "js/common"),
-  fs.join(fs.makeAbsolute(''), "js/server"),
-  fs.join(fs.makeAbsolute(''), "js/apps/system/_api/gharial/APP")];
+  fs.join(fs.makeAbsolute(''), "Documentation/DocuBlocks"),
+  fs.join(fs.makeAbsolute(''), "Documentation/Books/Users")
+];

-var theScript = 'Documentation/Scripts/generateExamples.py';
+const theScript = 'utils/generateExamples.py';

-var scriptArguments = {
+const scriptArguments = {
  'outputDir': fs.join(fs.makeAbsolute(''), "Documentation/Examples"),
-  'outputFile': '/tmp/arangosh.examples.js'
+  'outputFile': fs.join(fs.makeAbsolute(''), "arangosh.examples.js")
 };

-function main (argv) {
-  "use strict";
-  var thePython = 'python';
-  var test = argv[1];
-  var options = {};
-  var serverEndpoint = '';
-  var startServer = true;
-  var instanceInfo = {};
-  var serverCrashed = false;
-  var protocol = 'tcp';
-  var tmpDataDir = fs.getTempFile();
-  var count = 0;
+let ARANGOD;
+let ARANGOSH;
+
+if (fs.exists("bin")) {
+  ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangod");
+  ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangosh");
+}
+else {
+  ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangod");
+  ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangosh");
+}
+
+function endpointToURL(endpoint) {
+  if (endpoint.substr(0, 6) === "ssl://") {
+    return "https://" + endpoint.substr(6);
+  }
+
+  const pos = endpoint.indexOf("://");
+
+  if (pos === -1) {
+    return "http://" + endpoint;
+  }
+
+  return "http" + endpoint.substr(pos);
+}
+
+function findFreePort() {
+  while (true) {
+    const port = Math.floor(Math.random() * (65536 - 1024)) + 1024;
+    const free = testPort("tcp://0.0.0.0:" + port);
+
+    if (free) {
+      return port;
+    }
+  }
+
+  return 8529;
+}
+
+function main(argv) {
+  let thePython = 'python';
+  let options = {};
+  let serverEndpoint = '';
+  let startServer = true;
+  let instanceInfo = {};
+  let serverCrashed = false;
+  let protocol = 'tcp';
+  let tmpDataDir = fs.getTempFile();
+  let count = 0;

  try {
-    options = internal.parseArgv(argv, 1);
-  }
-  catch (x) {
+    options = internal.parseArgv(argv, 0);
+  } catch (x) {
    print("failed to parse the options: " + x.message);
    return -1;
  }

+  print(options);
+
  if (options.hasOwnProperty('withPython')) {
    thePython = options.withPython;
  }
@ -65,13 +100,13 @@ function main (argv) {
    startServer = false;
    serverEndpoint = options['server.endpoint'];
  }
-  var args = [theScript].concat(internal.toArgv(scriptArguments));
+
+  let args = [theScript].concat(internal.toArgv(scriptArguments));
  args = args.concat(['--arangoshSetup']);
  args = args.concat(documentationSourceDirs);

-  // internal.print(JSON.stringify(args));
+  let res = executeExternalAndWait(thePython, args);

-  var res = executeExternalAndWait(thePython, args);
  if (res.exit !== 0) {
    print("parsing the examples failed - aborting!");
    print(res);
@ -79,36 +114,46 @@ function main (argv) {
  }

  if (startServer) {
-    // We use the PortFinder to find a free port for our subinstance,
-    // to this end, we have to fake a dummy dispatcher:
-    var dispatcher = {endpoint: "tcp://127.0.0.1:", avoidPorts: {}, id: "me"};
-    var pf = new PortFinder([8529],dispatcher);
-    var port = pf.next();
+    let port = findFreePort();
    instanceInfo.port = port;
-    serverEndpoint = protocol+"://127.0.0.1:"+port;
-    
+    serverEndpoint = protocol + "://127.0.0.1:" + port;
+
    instanceInfo.url = endpointToURL(serverEndpoint);

-    var serverArgs = {};
+    fs.makeDirectoryRecursive(fs.join(tmpDataDir, "data"));
+
+    let serverArgs = {};
+
+    serverArgs["configuration"] = "none";
+    serverArgs["database.directory"] = fs.join(tmpDataDir, "data");
+    serverArgs["javascript.app-path"] = fs.join(tmpDataDir, "apps");
+    serverArgs["javascript.startup-directory"] = "js";
+    serverArgs["log.file"] = fs.join(tmpDataDir, "log");
+    serverArgs["server.disable-authentication"] = "true";
    serverArgs["server.endpoint"] = serverEndpoint;
-    serverArgs["database.directory"] = fs.join(tmpDataDir,"data");
-    fs.makeDirectoryRecursive(fs.join(tmpDataDir,"data"));
-    args["log.file"] = fs.join(tmpDataDir,"log");
-    instanceInfo.pid = executeExternal(fs.join("bin","arangod"), toArgv(serverArgs));
+    serverArgs["server.threads"] = "3";
+
+    print("================================================================================");
+    print(toArgv(serverArgs));
+    instanceInfo.pid = executeExternal(ARANGOD, toArgv(serverArgs));
+
    // Wait until the server is up:
    count = 0;
    instanceInfo.endpoint = serverEndpoint;

    while (true) {
      wait(0.5, false);
-      var r = download(instanceInfo.url + "/_api/version", "");
+      let r = download(instanceInfo.url + "/_api/version", "");

-      if (! r.error && r.code === 200) {
+      if (!r.error && r.code === 200) {
        break;
      }
-      count ++;
+
+      count++;
+
      if (count % 60 === 0) {
        res = statusExternal(instanceInfo.pid, false);
+
        if (res.status !== "RUNNING") {
          print("start failed - process is gone: " + yaml.safeDump(res));
          return 1;
@ -116,67 +161,71 @@ function main (argv) {
      }
    }
  }
-  var arangoshArgs = {
+
+  let arangoshArgs = {
    'configuration': fs.join(fs.makeAbsolute(''), 'etc', 'relative', 'arangosh.conf'),
    'server.password': "",
    'server.endpoint': serverEndpoint,
    'javascript.execute': scriptArguments.outputFile
  };

-  res = executeExternalAndWait('bin/arangosh', internal.toArgv(arangoshArgs));
+  res = executeExternalAndWait(ARANGOSH, internal.toArgv(arangoshArgs));

  if (startServer) {
    if (typeof(instanceInfo.exitStatus) === 'undefined') {
-      download(instanceInfo.url+"/_admin/shutdown","");
+      download(instanceInfo.url + "/_admin/shutdown", "");

      print("Waiting for server shut down");
      count = 0;
-      var bar = "[";
+      let bar = "[";
+
      while (1) {
        instanceInfo.exitStatus = statusExternal(instanceInfo.pid, false);
+
        if (instanceInfo.exitStatus.status === "RUNNING") {
-          count ++;
+          count++;
          if (typeof(options.valgrind) === 'string') {
            wait(1);
            continue;
          }
-          if (count % 10 ===0) {
+          if (count % 10 === 0) {
            bar = bar + "#";
          }
          if (count > 600) {
            print("forcefully terminating " + yaml.safeDump(instanceInfo.pid) +
-                  " after 600 s grace period; marking crashy.");
+              " after 600 s grace period; marking crashy.");
            serverCrashed = true;
            killExternal(instanceInfo.pid);
            break;
-          }
-          else {
+          } else {
            wait(1);
          }
-        }
-        else if (instanceInfo.exitStatus.status !== "TERMINATED") {
+        } else if (instanceInfo.exitStatus.status !== "TERMINATED") {
          if (instanceInfo.exitStatus.hasOwnProperty('signal')) {
            print("Server shut down with : " +
-                  yaml.safeDump(instanceInfo.exitStatus) +
-                  " marking build as crashy.");
+              yaml.safeDump(instanceInfo.exitStatus) +
+              " marking build as crashy.");
            serverCrashed = true;
            break;
          }
-          if (require("internal").platform.substr(0,3) === 'win') {
+          if (internal.platform.substr(0, 3) === 'win') {
            // Windows: wait for procdump to do its job...
            statusExternal(instanceInfo.monitor, true);
          }
-        }
-        else {
+        } else {
          print("Server shutdown: Success.");
          break; // Success.
        }
      }
+
      if (count > 10) {
        print("long Server shutdown: " + bar + ']');
      }

    }
  }
+
  return 0;
 }
+
+main(ARGUMENTS);
--- a/Documentation/Scripts/generateExamples.py
+++ b/Documentation/Scripts/generateExamples.py
@ -1,8 +1,4 @@
 ################################################################################
-### @brief creates examples from documentation files
-###
-### @file
-###
 ### DISCLAIMER
 ###
 ### Copyright by triAGENS GmbH - All rights reserved.
@ -128,14 +124,13 @@ OPTION_OUTPUT_DIR = 2
 OPTION_FILTER = 3
 OPTION_OUTPUT_FILE = 4

-fstate = OPTION_NORMAL
-
 escapeBS = re.compile("\\\\")
 doubleBS = "\\\\\\\\"

 ################################################################################
 ### @brief generate arangosh example headers with functions etc. needed later
 ################################################################################
+
 def generateArangoshHeader():
    headerF = open("./Documentation/Scripts/exampleHeader.js", "r")
    print headerF.read()
@ -144,6 +139,7 @@ def generateArangoshHeader():
 ################################################################################
 ### @brief Try to match the start of a command section
 ################################################################################
+
 regularStartLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_OUTPUT{([^}]*)}')
 runLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_RUN{([^}]*)}')
    
@ -160,6 +156,7 @@ def matchStartLine(line, filename):
        if name in ArangoshFiles:
            print >> sys.stderr, "%s\nduplicate test name '%s' in file %s!\n%s\n" % ('#' * 80, name, filename, '#' * 80)
            sys.exit(1)
+
        # if we match for filters, only output these!
        if ((FilterForTestcase != None) and not FilterForTestcase.match(name)):
            filterTestList.append(name)
@ -184,6 +181,7 @@ def matchStartLine(line, filename):

        ArangoshFiles[name] = True
        return (name, STATE_ARANGOSH_RUN)
+
    # Not found, remain in STATE_BEGIN
    return ("", STATE_BEGIN)

@ -194,9 +192,11 @@ TESTLINES="testlines"
 TYPE="type"
 LINE_NO="lineNo"
 STRING="string"
+
 ################################################################################
 ### @brief loop over the lines of one input file
 ################################################################################
+
 def analyzeFile(f, filename): 
    global RunTests, TESTLINES, TYPE, LINE_NO, STRING
    strip = None
@ -294,7 +294,6 @@ def generateSetupFunction():
    print "(function () {\n%s}());" % ArangoshSetup
    print

-
 ################################################################################
 ### @brief generate arangosh example
 ################################################################################
@ -302,6 +301,7 @@ def generateSetupFunction():
 loopDetectRE = re.compile(r'^[ \n]*(while|if|var|throw|for) ')
 expectErrorRE = re.compile(r'.*// *xpError\((.*)\).*')
 #expectErrorRE = re.compile(r'.*//\s*xpError\(([^)]*)\)/')
+
 def generateArangoshOutput(testName):
    value = RunTests[testName]
    #print value
@ -370,7 +370,6 @@ def generateArangoshOutput(testName):
 }());
 '''

-
 ################################################################################
 ### @brief generate arangosh run
 ################################################################################
@ -429,6 +428,7 @@ def generateArangoshRun(testName):
 ################################################################################
 ### @brief generate arangosh run
 ################################################################################
+
 def generateArangoshShutdown():
    print '''
 if (allErrors.length > 0) {
@ -437,29 +437,35 @@ if (allErrors.length > 0) {
 }
 '''

-
 ################################################################################
 ### @brief get file names
 ################################################################################
+
 def loopDirectories():
    global ArangoshSetup, OutputDir, FilterForTestcase
+
    argv = sys.argv
    argv.pop(0)
    filenames = []
+    fstate = OPTION_NORMAL
    
    for filename in argv:
        if filename == "--arangoshSetup":
            fstate = OPTION_ARANGOSH_SETUP
            continue
+
        if filename == "--onlyThisOne": 
            fstate = OPTION_FILTER
            continue
+
        if filename == "--outputDir":
            fstate = OPTION_OUTPUT_DIR
            continue
+
        if filename == "--outputFile":
            fstate = OPTION_OUTPUT_FILE
            continue
+
        if fstate == OPTION_NORMAL:
            if os.path.isdir(filename):
                for root, dirs, files in os.walk(filename):
@ -468,11 +474,12 @@ def loopDirectories():
                            filenames.append(os.path.join(root, file))
            else:
                filenames.append(filename)
+
        elif fstate == OPTION_FILTER:
            fstate = OPTION_NORMAL
            if (len(filename) > 0): 
                FilterForTestcase = re.compile(filename);
-            
+
        elif fstate == OPTION_ARANGOSH_SETUP:
            fstate = OPTION_NORMAL
            f = open(filename, "r")
@ -486,11 +493,11 @@ def loopDirectories():
        elif fstate == OPTION_OUTPUT_DIR:
            fstate = OPTION_NORMAL
            OutputDir = filename
+
        elif fstate == OPTION_OUTPUT_FILE:
            fstate = OPTION_NORMAL
            sys.stdout = open(filename, 'w')

-    print >> sys.stderr, repr(filenames)
    for filename in filenames:
        if (filename.find("#") < 0):
            f = open(filename, "r")
@ -512,10 +519,10 @@ def generateTestCases():
        elif RunTests[thisTest][TYPE] == STATE_ARANGOSH_RUN:
            generateArangoshRun(thisTest)

-
 ################################################################################
 ### @brief main
 ################################################################################
+
 loopDirectories()
 print >> sys.stderr, "filtering test cases %s" %(filterTestList)

--- a/utils/generateExamples.sh
+++ b/utils/generateExamples.sh
@ -0,0 +1,49 @@
+#!/bin/bash
+export PID=$$
+
+if test -n "$ORIGINAL_PATH"; then
+  # running in cygwin...
+  PS='\'
+  export EXT=".exe"
+else
+  export EXT=""
+  PS='/'
+fi;
+
+SCRIPT="utils${PS}generateExamples.js"
+LOGFILE="out${PS}log-$PID"
+DBDIR="out${PS}data-$PID"
+
+mkdir -p ${DBDIR}
+
+echo Database has its data in ${DBDIR}
+echo Logfile is in ${LOGFILE}
+
+if [ -z "${ARANGOSH}" ];  then
+  if [ -x build/bin/arangosh ];  then
+    ARANGOSH=build/bin/arangosh
+  elif [ -x bin/arangosh ];  then
+    ARANGOSH=bin/arangosh
+  else
+    echo "$0: cannot locate arangosh"
+  fi
+fi
+
+${ARANGOSH} \
+    --configuration none \
+    --server.endpoint none \
+    --log.file ${LOGFILE} \
+    --javascript.startup-directory js \
+    --javascript.execute $SCRIPT \
+    --server.password "" \
+    "${ARGS[@]}"
+
+if test $? -eq 0; then
+  echo "removing ${LOGFILE} ${DBDIR}"
+  rm -rf ${LOGFILE} ${DBDIR} arangosh.examples.js
+else
+  echo "failed - don't remove ${LOGFILE} ${DBDIR} - here's the logfile:"
+  cat ${LOGFILE}
+fi
+
+echo Server has terminated.
--- a/utils/generateMimetypes.py
+++ b/utils/generateMimetypes.py
--- a/Documentation/Scripts/generateSwagger.py
+++ b/Documentation/Scripts/generateSwagger.py
@ -1010,7 +1010,7 @@ def example_arangosh_run(cargo, r=Regexen()):
    exampleHeader = brTrim(operation['x-examples'][currentExample]).strip()

    # new examples code TODO should include for each example own object in json file
-    examplefile = open(os.path.join(os.path.dirname(__file__), '../Examples/' + parameters(last) + '.generated'))
+    examplefile = open(os.path.join(os.path.dirname(__file__), '../Documentation/Examples/' + parameters(last) + '.generated'))
    operation['x-examples'][currentExample]= '<details><summary>Example: ' + exampleHeader.strip('\n ') + '</summary><br><br><pre><code class="json">'

    for line in examplefile.readlines():
--- a/utils/generateSwagger.sh
+++ b/utils/generateSwagger.sh
@ -0,0 +1,9 @@
+#!/bin/bash
+
+python \
+  `pwd`/utils/generateSwagger.py \
+  `pwd` \
+  `pwd`/js/apps/system/_admin/aardvark/APP/api-docs \
+  api-docs \
+  `pwd`/Documentation/DocuBlocks/Rest \
+  > `pwd`/js/apps/system/_admin/aardvark/APP/api-docs.json