Merge remote-tracking branch 'origin/1.1' into devel

Conflicts: Documentation/Examples/shell-read-document-bad-handle Makefile.in arangod/Documentation/shell-document.dox configure js/actions/system/api-collection.js js/actions/system/api-index.js js/actions/system/api-system.js js/common/bootstrap/modules.js js/common/bootstrap/print.js js/server/ArangoCollection.js lib/V8/v8-utils.cpp
2013-01-09 15:30:21 +01:00 · 2013-01-09 15:30:21 +01:00 · 128cb67c8b
parent 187d8ecc69 d4c277f36f
commit 128cb67c8b
73 changed files with 3514 additions and 2235 deletions
--- a/Documentation/Examples/shell-read-document
+++ b/Documentation/Examples/shell-read-document
@ -1,2 +0,0 @@
-arango> db.example.document("1432124/2873916");
-{ "_id" : "1432124/2873916", "_rev" : 2873916, "Hallo" : "World" }
--- a/Documentation/Examples/shell-read-document-bad-handle
+++ b/Documentation/Examples/shell-read-document-bad-handle
@ -1,5 +0,0 @@
-arango> db.example.document("12345");
-JavaScript exception in file '(arango)' at 1,12:
-  [ArangoError 10: bad parameter: <document-identifier> must be a document identifier]
-!db.example.document("12345");
-!           ^
--- a/Documentation/Examples/shell-read-document-not-found
+++ b/Documentation/Examples/shell-read-document-not-found
@ -1,5 +0,0 @@
-arango> db.example.document("1432124/123456");
-JavaScript exception in file '(arango)' at 1,12:
-  [ArangoError 1202: document not found: document not found]
-!db.example.document("1432124/123456");
-!           ^
--- a/Documentation/Examples/shell_collection-truncate
+++ b/Documentation/Examples/shell_collection-truncate
@ -1,9 +0,0 @@
-arango> col = db.examples;
-[ArangoCollection 91022, "examples" (status new born)]
-arango> col.save({ "Hallo" : "World" });
-{ "_id" : "91022/1532814", "_rev" : 1532814 }
-arango> col.count();
-1
-arango> col.truncate();
-arango> col.count();
-0
--- a/Documentation/Examples/shell_index-read
+++ b/Documentation/Examples/shell_index-read
@ -1,4 +0,0 @@
-arango> db.example.getIndexes().map(function(x) { return x.id; });
-["93013/0"]
-arango> db.example.index("93013/0");
-{ "id" : "93013/0", "type" : "primary", "fields" : ["_id"] }
--- a/Documentation/Examples/shell_remove-document
+++ b/Documentation/Examples/shell_remove-document
@ -1,10 +0,0 @@
-arango> a1 = db.example.save({ a : 1 });
-{ "_id" : "116308/3449537", "_rev" : 3449537 }
-arango> db.example.document(a1);
-{ "_id" : "116308/3449537", "_rev" : 3449537, "a" : 1 }
-arango> db.example.delete(a1);
-true
-arango> db.example.document(a1);
-JavaScript exception in file '(arango)' at 1,12: [ArangoError 1202: document not found: document not found]
-!db.example.document(a1);
-!           ^
--- a/Documentation/Examples/shell_remove-document-conflict
+++ b/Documentation/Examples/shell_remove-document-conflict
@ -1,14 +0,0 @@
-arango> a1 = db.example.save({ a : 1 });
-{ "_id" : "116308/3857139", "_rev" : 3857139 }
-arango> a2 = db.example.replace(a1, { a : 2 });
-{ "_id" : "116308/3857139", "_rev" : 3922675, "_oldRev" : 3857139 }
-arango> db.example.delete(a1);
-JavaScript exception in file '(arango)' at 1,18: [ArangoError 1200: conflict: cannot delete document]
-!db.example.delete(a1);
-!                 ^
-arango> db.example.delete(a1, true);
-true
-arango> db.example.document(a1);
-JavaScript exception in file '(arango)' at 1,12: [ArangoError 1202: document not found: document not found]
-!db.example.document(a1);
-!           ^
--- a/Documentation/Examples/shell_remove-document-conflict-db
+++ b/Documentation/Examples/shell_remove-document-conflict-db
@ -1,14 +0,0 @@
-arango> a1 = db.example.save({ a : 1 });
-{ "_id" : "116308/4042634", "_rev" : 4042634 }
-arango> a2 = db._replace(a1, { a : 2 });
-{ "_id" : "116308/4042634", "_rev" : 4108170, "_oldRev" : 4042634 }
-arango> db._delete(a1);
-JavaScript exception in file '(arango)' at 1,4: [ArangoError 1200: conflict: cannot delete document]
-!db._delete(a1);
-!   ^
-arango> db._delete(a1, true);
-true
-arango> db._document(a1);
-JavaScript exception in file '(arango)' at 1,4: [ArangoError 1202: document not found: document not found]
-!db._document(a1);
-!   ^
--- a/Documentation/Examples/shell_remove-document-db
+++ b/Documentation/Examples/shell_remove-document-db
@ -1,10 +0,0 @@
-arango> a1 = db.example.save({ a : 1 });
-{ "_id" : "116308/4214943", "_rev" : 4214943 }
-arango> db._delete(a1);
-true
-arango> db._delete(a1);
-JavaScript exception in file '(arango)' at 1,4: [ArangoError 1202: document not found: cannot delete document]
-!db._delete(a1);
-!   ^
-arango> db._delete(a1, true);
-false
--- a/Documentation/Makefile.files
+++ b/Documentation/Makefile.files
@ -28,7 +28,8 @@ DOXYGEN = \
 	Doxygen/js/actions/system/api-simple.c \
 	Doxygen/js/actions/system/api-system.c \
 	Doxygen/js/common/bootstrap/modules.c \
-	Doxygen/js/common/bootstrap/print.c \
+	Doxygen/js/common/bootstrap/module-console.c \
+	Doxygen/js/common/bootstrap/module-fs.c \
 	Doxygen/js/common/modules/graph.c \
 	Doxygen/js/common/modules/jsunity.c \
 	Doxygen/js/common/modules/simple-query-basics.c \
@ -36,6 +37,7 @@ DOXYGEN = \
 	Doxygen/js/common/modules/users.c \
 	Doxygen/js/server/modules/org/arangodb/actions.c \
 	Doxygen/js/server/modules/simple-query.c \
+	Doxygen/js/server/ArangoCollection.c \
 	Doxygen/js/server/server.c

 ################################################################################
--- a/Documentation/RefManual/JSModuleFs.md
+++ b/Documentation/RefManual/JSModuleFs.md
@ -0,0 +1,22 @@
+Module "fs" {#JSModuleFs}
+=========================
+
+@EMBEDTOC{JSModuleFsTOC}
+
+The implementation follows the CommonJS specification 
+@EXTREF{http://wiki.commonjs.org/wiki/Filesystem/A/0,Filesystem/A/0}.
+
+@anchor JSModuleFsExists
+@copydetails JS_Exists
+
+@anchor JSModuleFsIsDirectory
+@copydetails JS_IsDirectory
+
+@anchor JSModuleFsListTree
+@copydetails JS_ListTree
+
+@anchor JSModuleFsMove
+@copydetails JS_Move
+
+@anchor JSModuleFsRemove
+@copydetails JS_Remove
--- a/Documentation/RefManual/JSModuleFsTOC.md
+++ b/Documentation/RefManual/JSModuleFsTOC.md
@ -0,0 +1,9 @@
+TOC {#JSModuleFsTOC}
+====================
+
+- @ref JSModuleFs
+  - @ref JSModuleFsExists "fs.exists"
+  - @ref JSModuleFsIsDirectory "fs.isDirectory"
+  - @ref JSModuleFsListTree "fs.listTree"
+  - @ref JSModuleFsMove "fs.move"
+  - @ref JSModuleFsRemove "fs.remove"
--- a/Documentation/UserManual/Actions.md
+++ b/Documentation/UserManual/Actions.md
@ -305,7 +305,7 @@ A Simple Action {#UserManualActionsContentAction}

 The simplest dynamic action is:

-    { action: { controller: "org/arangodb/actions", do: "echoRequest" } }
+    { action: { do: "org/arangodb/actions/echoRequest" } }

 It is not possible to store functions directly in the routing table, but you can
 call functions defined in modules. In the above example the function can be
@ -324,7 +324,7 @@ For example

    arangosh> db._routing.save({ 
    ........>   url: "/hello/echo",
-    ........>   action: { controller: "org/arangodb/actions", do: "echoRequest" } });
+    ........>   action: { do: "org/arangodb/actions/echoRequest" } });

 Reload the routing and check

@ -645,3 +645,99 @@ should win in this case:
    ........>   ]
    ........> });

+Application Deployment {#UserManualActionsApplicationDeployment}
+================================================================
+
+Using single routes or @ref UserManualActionsAdvancedBundles "bundles" can be
+become a bit messy in large applications. Therefore a deployment tool exists
+inside _arangosh_ to simplify the task. This tool was inspired by the ArangoDB
+deployment tool `https://github.com/kaerus/arangodep` written in node.js by
+kaerus.
+
+An application is a bunch of routes, static pages stored in collections, and
+small scriptlets stored modules.
+
+In order to create an application, chose a suitable name, e. g. reverse domain
+name plus the application name and call `createApp`:
+
+    arangosh> var deploy = require("org/arangodb/deploy");
+    arangosh> var app = deploy.createApp("org.example.simple");
+
+Normally content will either be stored in collections or dynamically
+calculated. But sometimes it is convenient to store the content directly in the
+routing table, e. g. to deliver a version number.
+
+    arangosh> app.mountStaticContent("/version", { 
+    ........>   version: "1.2.3", major: 1, minor: 2, patch: 3 });
+    [ArangoApp "org.example.simple" at ""]
+
+Save the application
+
+    arangosh> app.save();
+    [ArangoApp "org.example.simple" at ""]
+
+and use the browser to check the result
+
+    http://localhost:8529/version
+
+You can also specify the content-type
+
+    arangosh> app.mountStaticContent("/author", 
+    ........>                        "Frank Celler",
+    ........>                        "text/plain").save();
+    [ArangoApp "org.example.simple" at ""]
+
+and check at
+
+    http://localhost:8529/author
+
+If you have more than one application, putting version under `/` might lead to
+conflicts. It is therefore possible to use a common prefix for the application.
+
+    arangosh> app.setPrefix("/example").save();
+    [ArangoApp "org.example.simple" at "/example"]
+
+Now check
+
+    http://localhost:8529/example/version
+    http://localhost:8529/example/author
+
+Deploying Static Pages {#UserManualActionsDeployingStaticPages}
+---------------------------------------------------------------
+
+Most of the time, static html pages and JavaScript content will be delivered by
+your web-server. But sometimes it is convenient to deliver these directly from
+within ArangoDB. For example, to provide a small admin interface for you
+application.
+
+Assume that all data is stored underneath a directory "/tmp/example" and we want
+to store the content in a collection "org_example_simple_content".
+
+First connect the url path to the collection.
+
+    arangosh> app.mountStaticPages("/static", "org_example_simple_content").save();
+    [ArangoApp "org.example.simple" at "/example"]
+
+Next create a file `index.html` at `/tmp/example/index.html".
+
+    <html>
+      <body>
+        Hallo World!
+      </body>
+    </html>
+
+Create the collection and upload this into the collection
+
+    arangosh> require("org/arangodb").db._createDocumentCollection("org_example_simple_content");
+    [ArangoCollection 224910918055, "org_example_simple_content" (type document, status loaded)]
+    
+    arangosh> app.uploadStaticPages("/static", "/tmp/example");
+    imported '/index.html' of type 'text/html; charset=utf-8'
+    [ArangoApp "org.example.simple" at "/example"]
+
+Check the index file
+
+    http://localhost:8529/example/static/index.html
+
+
+
--- a/Documentation/UserManual/ActionsTOC.md
+++ b/Documentation/UserManual/ActionsTOC.md
@ -25,3 +25,5 @@ TOC {#UserManualActionsTOC}
    - @ref UserManualActionsAdvancedRedirects
    - @ref UserManualActionsAdvancedBundles
    - @ref UserManualActionsAdvancedMiddleware
+  - @ref UserManualActionsApplicationDeployment
+    - @ref UserManualActionsDeployingStaticPages
--- a/Documentation/UserManual/HandlingDocuments.md
+++ b/Documentation/UserManual/HandlingDocuments.md
@ -0,0 +1,120 @@
+Handling Documents {#ShellDocument}
+===================================
+
+@NAVIGATE_ShellDocument
+@EMBEDTOC{ShellDocumentTOC}
+
+This is an introduction to ArangoDB's interface for documents and how handle
+documents from the JavaScript shell _arangosh_. For other languages see
+the corresponding language API.
+
+Documents, Identifiers, Handles {#ShellDocumentIntro}
+=====================================================
+
+@copydoc GlossaryDocument
+
+For example:
+
+    {
+      "_id" : "demo/2345678",
+      "_rev" : "3456789",
+      "_key" : "2345678",
+      "firstName" : "Hugo",
+      "lastName" : "Schlonz",
+      "address" : {
+	"street" : "Strasse 1",
+	"city" : "Hier"
+      },
+      "hobbies" : [
+	"swimming",
+	"biking",
+	"programming"
+      ]
+    }
+
+All documents contain special attributes: the document handle in `_id`, the
+document's unique key in `_key` and and the etag aka document revision in
+`_rev`. The value of the `_key` attribute can be specified by the user when
+creating a document.  `_id` and `_key` values are immutable once the document
+has been created. The `_rev` value is maintained by ArangoDB autonomously.
+
+@copydoc GlossaryDocumentHandle
+
+@copydoc GlossaryDocumentIdentifier
+
+@copydoc GlossaryDocumentRevision
+
+@copydoc GlossaryDocumentEtag
+
+Address and ETag of an Document {#ShellDocumentResource}
+========================================================
+
+All documents in ArangoDB have a document handle. This handle uniquely defines a
+document and is managed by ArangoDB. The interface allows you to access the
+documents of a collection as:
+
+    db.@FA{collection}.documet(@FA{document-handle})
+
+For example: Assume that the document handle, which is stored in the `_id` field
+of the document, is `demo/362549` and the document lives in a collection
+named @FA{demo}, then that document can be accessed as:
+
+    db.demo.document("demo/362549736")
+
+Because the document handle is unique within the database, you
+can leave out the @FA{collection} and use the shortcut:
+
+    db._document("demo/362549736")
+
+Each document also has a document revision or etag with is returned in the
+`_rev` field when requesting a document. The document's key is returned in the
+`_key` attribute.
+
+@CLEARPAGE
+Working with Documents {#ShellDocumentShell}
+============================================
+
+Collection Methods {#ShellDocumentCollectionMethods}
+----------------------------------------------------
+
+@anchor ShellDocumentRead
+@copydetails JS_DocumentVocbaseCol
+
+@CLEARPAGE
+@anchor ShellDocumentCreate
+@copydetails JS_SaveVocbaseCol
+
+@CLEARPAGE
+@anchor ShellDocumentReplace
+@copydetails JS_ReplaceVocbaseCol
+
+@CLEARPAGE
+@anchor ShellDocumentUpdate
+@copydetails JS_UpdateVocbaseCol
+
+@CLEARPAGE
+@anchor ShellDocumentRemove
+@copydetails JS_RemoveVocbaseCol
+
+@CLEARPAGE
+@anchor ShellDocumentRemoveByExample
+@copydetails JSF_ArangoCollection_prototype_removeByExample
+
+@CLEARPAGE
+Database Methods {#ShellDocumentDatabaseMethods}
+------------------------------------------------
+
+@anchor ShellDocumentDbRead
+@copydetails JS_DocumentVocbase
+
+@CLEARPAGE
+@anchor ShellDocumentDbReplace
+@copydetails JS_ReplaceVocbase
+
+@CLEARPAGE
+@anchor ShellDocumentDbUpdate
+@copydetails JS_UpdateVocbase
+
+@CLEARPAGE
+@anchor ShellDocumentDbRemove
+@copydetails JS_RemoveVocbase
--- a/Documentation/UserManual/HandlingDocumentsTOC.md
+++ b/Documentation/UserManual/HandlingDocumentsTOC.md
@ -0,0 +1,19 @@
+TOC {#ShellDocumentTOC}
+=======================
+
+- @ref ShellDocument
+  - @ref ShellDocumentIntro
+  - @ref ShellDocumentResource
+   - @ref ShellDocumentShell
+     - @ref ShellDocumentCollectionMethods
+       - @ref ShellDocumentRead "collection.document"
+       - @ref ShellDocumentCreate "collection.save"
+       - @ref ShellDocumentReplace "collection.replace"
+       - @ref ShellDocumentUpdate "collection.update"
+       - @ref ShellDocumentRemove "collection.remove"
+       - @ref ShellDocumentRemoveByExample "collection.removeByExample"
+     - @ref ShellDocumentDatabaseMethods
+       - @ref ShellDocumentDbRead "db._document"
+       - @ref ShellDocumentDbReplace "db._replace"
+       - @ref ShellDocumentDbUpdate "db._update"
+       - @ref ShellDocumentDbRemove "db._remove"
--- a/Documentation/arango.template.in
+++ b/Documentation/arango.template.in
@ -723,7 +723,8 @@ WARN_LOGFILE           =
 INPUT                  = @srcdir@/Documentation/DbaManual \
                         @srcdir@/Documentation/InstallationManual \
                         @srcdir@/Documentation/Manual \
-			 @srcdir@/Documentation/UserManual \
+                         @srcdir@/Documentation/RefManual \
+                         @srcdir@/Documentation/UserManual \
                         @srcdir@/Doxygen/js \
                         @srcdir@/arangod \
                         @srcdir@/lib
--- a/Makefile.am
+++ b/Makefile.am
@ -324,8 +324,7 @@ clean-local:

 built-sources: \
 	build_posix.h \
-	@top_srcdir@/js/common/bootstrap/errors.js \
-	$(JAVASCRIPT_HEADER)
+	@top_srcdir@/js/common/bootstrap/errors.js

 ################################################################################
 ### @brief tags file
--- a/Makefile.files
+++ b/Makefile.files
@ -4,22 +4,6 @@
 ## --SECTION--                                                        JAVASCRIPT
 ## -----------------------------------------------------------------------------

-################################################################################
-### @brief JavaScript source code as header
-################################################################################
-
-JAVASCRIPT_HEADER = \
-	js/common/bootstrap/js-errors.h \
-	js/common/bootstrap/js-modules.h \
-	js/common/bootstrap/js-monkeypatches.h \
-	js/common/bootstrap/js-print.h \
-	js/client/js-client.h \
-	js/server/js-server.h \
-	js/server/js-version-check.h \
-	js/server/js-ahuacatl.h
-
-BUILT_SOURCES += $(JAVASCRIPT_HEADER)
-
 ################################################################################
 ### @brief JavaScript modules for browser
 ################################################################################
--- a/arangod/Documentation/api-collection.dox
+++ b/arangod/Documentation/api-collection.dox
@ -119,37 +119,37 @@
 ///////////////////////////////////////////////////////////////////////////
 ///
 /// @anchor HttpCollectionCreate
-/// @copydetails JSF_POST_api_collection
+/// @copydetails JSF_post_api_collection
 ///
 /// @anchor HttpCollectionDelete
-/// @copydetails JSF_DELETE_api_collection
+/// @copydetails JSF_delete_api_collection
 ///
 /// @anchor HttpCollectionTruncate
-/// @copydetails JSF_PUT_api_collection_truncate
+/// @copydetails JSF_put_api_collection_truncate
 ///
 /// @subsection HttpCollectionReading Getting Information about a Collection
 ////////////////////////////////////////////////////////////////////////////
 ///
 /// @anchor HttpCollectionRead
-/// @copydetails JSF_GET_api_collection
+/// @copydetails JSF_get_api_collection
 ///
 /// @anchor HttpCollectionReadAll
-/// @copydetails JSF_GET_api_collections
+/// @copydetails JSF_get_api_collections
 ///
 /// @subsection HttpCollectionChanging Modifying a Collection
 /////////////////////////////////////////////////////////////
 ///
 /// @anchor HttpCollectionLoad
-/// @copydetails JSF_PUT_api_collection_load
+/// @copydetails JSF_put_api_collection_load
 ///
 /// @anchor HttpCollectionUnload
-/// @copydetails JSF_PUT_api_collection_unload
+/// @copydetails JSF_put_api_collection_unload
 ///
 /// @anchor HttpCollectionProperties
-/// @copydetails JSF_PUT_api_collection_properties
+/// @copydetails JSF_put_api_collection_properties
 ///
 /// @anchor HttpCollectionRename
-/// @copydetails JSF_PUT_api_collection_rename
+/// @copydetails JSF_put_api_collection_rename
 ////////////////////////////////////////////////////////////////////////////////

 // Local Variables:
--- a/arangod/Documentation/module-fs.dox
+++ b/arangod/Documentation/module-fs.dox
@ -1,53 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// @brief module "fs"
-///
-/// @file
-///
-/// DISCLAIMER
-///
-/// Copyright 2012 triAGENS GmbH, Cologne, Germany
-///
-/// Licensed under the Apache License, Version 2.0 (the "License");
-/// you may not use this file except in compliance with the License.
-/// You may obtain a copy of the License at
-///
-///     http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing, software
-/// distributed under the License is distributed on an "AS IS" BASIS,
-/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// See the License for the specific language governing permissions and
-/// limitations under the License.
-///
-/// Copyright holder is triAGENS GmbH, Cologne, Germany
-///
-/// @author Dr. Frank Celler
-/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @page JSModuleFsTOC
-///
-/// <ol>
-///   <li>@ref JSModuleFsExists "fs.exists"</li>
-/// </ol>
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @page JSModuleFs Module "fs"
-///
-/// The implementation follows the CommonJS specification
-/// <a href="http://wiki.commonjs.org/wiki/Filesystem/A/0">Filesystem/A/0</a>.
-///
-/// <hr>
-/// @copydoc JSModuleFsTOC
-/// <hr>
-///
-/// @anchor JSModuleFsExists
-/// @copydetails JS_Exists
-////////////////////////////////////////////////////////////////////////////////
-
-// Local Variables:
-// mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
-// End:
--- a/arangod/Documentation/shell-document.dox
+++ b/arangod/Documentation/shell-document.dox
@ -1,186 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// @brief arango shell
-///
-/// @file
-///
-/// DISCLAIMER
-///
-/// Copyright 2012 triagens GmbH, Cologne, Germany
-///
-/// Licensed under the Apache License, Version 2.0 (the "License");
-/// you may not use this file except in compliance with the License.
-/// You may obtain a copy of the License at
-///
-///     http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing, software
-/// distributed under the License is distributed on an "AS IS" BASIS,
-/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// See the License for the specific language governing permissions and
-/// limitations under the License.
-///
-/// Copyright holder is triAGENS GmbH, Cologne, Germany
-///
-/// @author Dr. Frank Celler
-/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
-////////////////////////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-// --SECTION--                                                HANDLING DOCUMENTS
-// -----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-/// @page ShellDocumentTOC
-///
-/// <ul>
-///  <li>@ref ShellDocument
-///   <ul>
-///    <li>@ref ShellDocumentIntro</li>
-///    <li>@ref ShellDocumentResource</li>
-///    <li>@ref ShellDocumentShell
-///      @copydetails ShellDocumentCallsTOC
-///    </li>
-///   </ul>
-///  </li>
-/// </ul>
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @page ShellDocumentCallsTOC
-///
-/// <ul>
-///  <li>@ref ShellDocumentCollectionMethods
-///   <ul>
-///    <li>@ref ShellDocumentRead "collection.document"</li>
-///    <li>@ref ShellDocumentCreate "collection.save"</li>
-///    <li>@ref ShellDocumentReplace "collection.replace"</li>
-///    <li>@ref ShellDocumentUpdate "collection.update"</li>
-///    <li>@ref ShellDocumentDelete "collection.remove"</li>
-///   </ul>
-///  </li>
-///  <li>@ref ShellDocumentDatabaseMethods
-///   <ul>
-///    <li>@ref ShellDocumentDbRead "db._document"</li>
-///    <li>@ref ShellDocumentDbReplace "db._replace"</li>
-///    <li>@ref ShellDocumentDbUpdate "db._update"</li>
-///    <li>@ref ShellDocumentDbDelete "db._remove"</li>
-///   </ul>
-///  </li>
-/// </ul>
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @page ShellDocument Handling Documents
-///
-/// @NAVIGATE_ShellDocument
-///
-/// This is an introduction to ArangoDB's interface for documents and how handle
-/// documents from the JavaScript shell @LIT{arangosh}. For other languages see
-/// the corresponding language API.
-///
-/// @EMBEDTOC{ShellDocumentTOC}
-///
-/// @section ShellDocumentIntro Documents, Identifiers, Handles
-///////////////////////////////////////////////////////////////
-///
-/// @copydoc GlossaryDocument
-///
-/// For example:
-///
-/// @verbinclude document1
-///
-/// All documents contain special attributes: the document handle in @LIT{_id},
-/// the document's unique key in @LIT{_key} and and the etag aka document 
-/// revision in @LIT{_rev}. The value of the @LIT{_key} attribute can be 
-/// specified by the user when creating a document.
-/// @LIT{_id} and @LIT{_key} values are immutable once the document has been
-/// created. The @LIT{_rev} value is maintained by ArangoDB autonomously.
-///
-/// @copydoc GlossaryDocumentHandle
-///
-/// @copydoc GlossaryDocumentKey
-///
-/// @copydoc GlossaryDocumentRevision
-///
-/// @copydoc GlossaryDocumentEtag
-///
-/// @section ShellDocumentResource Address and ETag of an Document
-//////////////////////////////////////////////////////////////////
-///
-/// All documents in ArangoDB have a document handle. This handle uniquely
-/// defines a document and is managed by ArangoDB. The interface allows
-/// you to access the documents of a collection as:
-///
-/// @LIT{db.@FA{collection}.documet(@FA{document-handle})}
-///
-/// For example: Assume that the document handle, which is stored in
-/// the @LIT{_id} attribute of the document, is @LIT{demo/362549736}
-/// and the document lives in a collection named @FA{demo}, then
-/// that document can be accessed as:
-///
-/// @LIT{db.demo.document("demo/362549736")}
-///
-/// Because the document handle is unique within the database, you
-/// can leave out the @FA{collection} and use the shortcut:
-///
-/// @LIT{db._document("demo/362549736")}
-///
-/// Each document also has a document revision or etag with is returned
-/// in the @LIT{_rev} attribute when requesting a document. The document's
-/// key is returned in the @LIT{_key} attribute.
-///
-/// @CLEARPAGE
-/// @section ShellDocumentShell Working with Documents
-//////////////////////////////////////////////////////
-///
-/// @subsection ShellDocumentCollectionMethods Collection Methods
-/////////////////////////////////////////////////////////////////
-///
-/// @anchor ShellDocumentRead
-/// @copydetails JS_DocumentVocbaseCol
-///
-/// @CLEARPAGE
-/// @anchor ShellDocumentCreate
-/// @copydetails JS_SaveVocbaseCol
-///
-/// @CLEARPAGE
-/// @anchor ShellDocumentReplace
-/// @copydetails JS_ReplaceVocbaseCol
-///
-/// @CLEARPAGE
-/// @anchor ShellDocumentUpdate
-/// @copydetails JS_UpdateVocbaseCol
-///
-/// @CLEARPAGE
-/// @anchor ShellDocumentDelete
-/// @copydetails JS_RemoveVocbaseCol
-///
-/// @CLEARPAGE
-/// @subsection ShellDocumentDatabaseMethods Database Methods
-/////////////////////////////////////////////////////////////
-///
-/// @anchor ShellDocumentDbRead
-/// @copydetails JS_DocumentVocbase
-///
-/// @CLEARPAGE
-/// @anchor ShellDocumentDbReplace
-/// @copydetails JS_ReplaceVocbase
-///
-/// @CLEARPAGE
-/// @anchor ShellDocumentDbUpdate
-/// @copydetails JS_UpdateVocbase
-///
-/// @CLEARPAGE
-/// @anchor ShellDocumentDbDelete
-/// @copydetails JS_RemoveVocbase
-////////////////////////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-// --SECTION--                                                       END-OF-FILE
-// -----------------------------------------------------------------------------
-
-// Local Variables:
-// mode: c++
-// mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
-// End:
--- a/arangod/Documentation/simple-queries.dox
+++ b/arangod/Documentation/simple-queries.dox
@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-/// @brief installation guide
+/// @brief simple queries
 ///
 /// @file
 ///
--- a/arangod/V8Server/ApplicationV8.cpp
+++ b/arangod/V8Server/ApplicationV8.cpp
@ -640,15 +640,18 @@ void ApplicationV8::stop () {
 ////////////////////////////////////////////////////////////////////////////////

 bool ApplicationV8::prepareV8Instance (const size_t i) {
-  static char const* files[] = { "common/bootstrap/modules.js",
-                                 "common/bootstrap/monkeypatches.js",
-                                 "common/bootstrap/print.js",
-                                 "common/bootstrap/errors.js",
-                                 "server/ahuacatl.js",
-                                 "server/server.js",
-                                 "server/ArangoCollection.js",
-                                 "server/ArangoStructure.js"
-  };
+  vector<string> files;
+
+  files.push_back("common/bootstrap/modules.js");
+  files.push_back("common/bootstrap/module-internal.js");
+  files.push_back("common/bootstrap/module-fs.js");
+  files.push_back("common/bootstrap/module-console.js");
+  files.push_back("common/bootstrap/monkeypatches.js");
+  files.push_back("common/bootstrap/errors.js");
+  files.push_back("server/ahuacatl.js");
+  files.push_back("server/server.js");
+  files.push_back("server/ArangoCollection.js");
+  files.push_back("server/ArangoStructure.js");

  LOGGER_TRACE << "initialising V8 context #" << i;

@ -687,7 +690,7 @@ bool ApplicationV8::prepareV8Instance (const size_t i) {
  TRI_InitV8Shell(context->_context);

  // load all init files
-  for (size_t j = 0;  j < sizeof(files) / sizeof(files[0]);  ++j) {
+  for (size_t j = 0;  j < files.size();  ++j) {
    bool ok = _startupLoader.loadScript(context->_context, files[j]);

    if (! ok) {
--- a/arangod/V8Server/v8-vocbase.cpp
+++ b/arangod/V8Server/v8-vocbase.cpp
@ -903,11 +903,11 @@ static v8::Handle<v8::Value> ReplaceVocbaseCol (const bool useCollection,
 /// above. The optional @FA{waitForSync} parameter can be used to force 
 /// synchronisation of the document creation operation to disk even in case
 /// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
+/// Thus, the @FA{waitForSync} parameter can be used to force synchronisation
 /// of just specific operations. To use this, set the @FA{waitForSync} parameter
 /// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
 /// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
@ -984,11 +984,11 @@ static v8::Handle<v8::Value> SaveVocbaseCol (SingleCollectionWriteTransaction<Em
 /// The optional @FA{waitForSync} parameter can be used to force 
 /// synchronisation of the document creation operation to disk even in case
 /// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
+/// Thus, the @FA{waitForSync} parameter can be used to force synchronisation
 /// of just specific operations. To use this, set the @FA{waitForSync} parameter
 /// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
 /// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
@ -3311,10 +3311,7 @@ static v8::Handle<v8::Value> JS_DatafilesVocbaseCol (v8::Arguments const& argv)
 /// An error is thrown if there @LIT{_rev} does not longer match the current
 /// revision of the document.
 ///
-/// An error is thrown if the document does not exist.
-///
-/// The document must be part of the @FA{collection}; otherwise, an error
-/// is thrown.
+/// An error is also thrown if the document does not exist.
 ///
 /// @FUN{@FA{collection}.document(@FA{document-handle})}
 ///
@ -3325,15 +3322,30 @@ static v8::Handle<v8::Value> JS_DatafilesVocbaseCol (v8::Arguments const& argv)
 ///
 /// Returns the document for a document-handle:
 ///
-/// @TINYEXAMPLE{shell-read-document,read document from a collection}
+/// @code
+/// arango> db.example.document("1432124/2873916");
+/// { "_id" : "1432124/2873916", "_rev" : 2873916, "Hallo" : "World" }
+/// @endcode
 ///
 /// An error is raised if the document is unknown:
 ///
-/// @TINYEXAMPLE{shell-read-document-not-found,unknown handle}
+/// @code
+/// arango> db.example.document("1432124/123456");
+/// JavaScript exception in file '(arango)' at 1,12:
+///   [ArangoError 1202: document not found: document not found]
+/// !db.example.document("1432124/123456");
+/// !           ^
+/// @endcode
 ///
 /// An error is raised if the handle is invalid:
 ///
-/// @TINYEXAMPLE{shell-read-document-bad-handle,invalid handle}
+/// @code
+/// arango> db.example.document("12345");
+/// JavaScript exception in file '(arango)' at 1,12:
+///   [ArangoError 10: bad parameter: <document-identifier> must be a document identifier]
+/// !db.example.document("12345");
+/// !           ^
+/// @endcode
 ////////////////////////////////////////////////////////////////////////////////

 static v8::Handle<v8::Value> JS_DocumentVocbaseCol (v8::Arguments const& argv) {
@ -4624,29 +4636,29 @@ static v8::Handle<v8::Value> JS_PropertiesVocbaseCol (v8::Arguments const& argv)
 }

 ////////////////////////////////////////////////////////////////////////////////
-/// @brief deletes a document
+/// @brief removes a document
 ///
 /// @FUN{@FA{collection}.remove(@FA{document})}
 ///
-/// Deletes a document. If there is revision mismatch, then an error is thrown.
+/// Removes a document. If there is revision mismatch, then an error is thrown.
 ///
 /// @FUN{@FA{collection}.remove(@FA{document}, true)}
 ///
-/// Deletes a document. If there is revision mismatch, then mismatch
-/// is ignored and document is deleted. The function returns
-/// @LIT{true} if the document existed and was deleted. It returns
-/// @LIT{false}, if the document was already deleted.
+/// Removes a document. If there is revision mismatch, then mismatch is ignored
+/// and document is deleted. The function returns @LIT{true} if the document
+/// existed and was deleted. It returns @LIT{false}, if the document was already
+/// deleted.
 ///
 /// @FUN{@FA{collection}.remove(@FA{document}, true, @FA{waitForSync})}
 ///
-/// The optional @FA{waitForSync} parameter can be used to force 
-/// synchronisation of the document deletion operation to disk even in case
-/// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
-/// of just specific operations. To use this, set the @FA{waitForSync} parameter
-/// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
-/// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// The optional @FA{waitForSync} parameter can be used to force synchronisation
+/// of the document deletion operation to disk even in case that the
+/// @LIT{waitForSync} flag had been disabled for the entire collection.  Thus,
+/// the @FA{waitForSync} parameter can be used to force synchronisation of just
+/// specific operations. To use this, set the @FA{waitForSync} parameter to
+/// @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to
+/// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
@ -4657,13 +4669,39 @@ static v8::Handle<v8::Value> JS_PropertiesVocbaseCol (v8::Arguments const& argv)
 ///
 /// @EXAMPLES
 ///
-/// Delete a document:
+/// Remove a document:
 ///
-/// @TINYEXAMPLE{shell_remove-document,delete a document}
+/// @code
+/// arango> a1 = db.example.save({ a : 1 });
+/// { "_id" : "116308/3449537", "_rev" : 3449537 }
+/// arango> db.example.document(a1);
+/// { "_id" : "116308/3449537", "_rev" : 3449537, "a" : 1 }
+/// arango> db.example.remove(a1);
+/// true
+/// arango> db.example.document(a1);
+/// JavaScript exception in file '(arango)' at 1,12: [ArangoError 1202: document not found: document not found]
+/// !db.example.document(a1);
+/// !           ^
+/// @endcode
 ///
-/// Delete a document with a conflict:
+/// Remove a document with a conflict:
 ///
-/// @TINYEXAMPLE{shell_remove-document-conflict,delete a document}
+/// @code
+/// arango> a1 = db.example.save({ a : 1 });
+/// { "_id" : "116308/3857139", "_rev" : 3857139 }
+/// arango> a2 = db.example.replace(a1, { a : 2 });
+/// { "_id" : "116308/3857139", "_rev" : 3922675, "_oldRev" : 3857139 }
+/// arango> db.example.remove(a1);
+/// JavaScript exception in file '(arango)' at 1,18: [ArangoError 1200: conflict: cannot remove document]
+/// !db.example.remove(a1);
+/// !                 ^
+/// arango> db.example.remove(a1, true);
+/// true
+/// arango> db.example.document(a1);
+/// JavaScript exception in file '(arango)' at 1,12: [ArangoError 1202: document not found: document not found]
+/// !db.example.document(a1);
+/// !           ^
+/// @endcode
 ////////////////////////////////////////////////////////////////////////////////

 static v8::Handle<v8::Value> JS_RemoveVocbaseCol (v8::Arguments const& argv) {
@ -4743,11 +4781,11 @@ static v8::Handle<v8::Value> JS_RenameVocbaseCol (v8::Arguments const& argv) {
 /// The optional @FA{waitForSync} parameter can be used to force 
 /// synchronisation of the document replacement operation to disk even in case
 /// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
+/// Thus, the @FA{waitForSync} parameter can be used to force synchronisation
 /// of just specific operations. To use this, set the @FA{waitForSync} parameter
 /// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
 /// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
@ -4789,11 +4827,11 @@ static v8::Handle<v8::Value> JS_ReplaceVocbaseCol (v8::Arguments const& argv) {
 /// The optional @FA{waitForSync} parameter can be used to force 
 /// synchronisation of the document update operation to disk even in case
 /// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
+/// Thus, the @FA{waitForSync} parameter can be used to force synchronisation
 /// of just specific operations. To use this, set the @FA{waitForSync} parameter
 /// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
 /// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
@ -5340,7 +5378,7 @@ static v8::Handle<v8::Value> JS_CompletionsVocbase (v8::Arguments const& argv) {
 ///
 /// @FUN{db._create(@FA{collection-name}, @FA{properties})}
 ///
-/// @FA{properties} must be an object, with the following attribues:
+/// @FA{properties} must be an object with the following attributes:
 ///
 /// - @LIT{waitForSync} (optional, default @LIT{false}): If @LIT{true} creating
 ///   a document will only return after the data was synced to disk.
@ -5410,7 +5448,7 @@ static v8::Handle<v8::Value> JS_CreateDocumentCollectionVocbase (v8::Arguments c
 ///
 /// @FUN{db._createEdgeCollection(@FA{collection-name}, @FA{properties})}
 ///
-/// @FA{properties} must be an object, with the following attribues:
+/// @FA{properties} must be an object with the following attributes:
 ///
 /// - @LIT{waitForSync} (optional, default @LIT{false}): If @LIT{true} creating
 ///   a document will only return after the data was synced to disk.
@ -5430,46 +5468,72 @@ static v8::Handle<v8::Value> JS_CreateEdgeCollectionVocbase (v8::Arguments const
 }

 ////////////////////////////////////////////////////////////////////////////////
-/// @brief deletes a document
+/// @brief removes a document
 ///
 /// @FUN{@FA{db}._remove(@FA{document})}
 ///
-/// Deletes a document. If there is revision mismatch, then an error is thrown.
+/// Removes a document. If there is revision mismatch, then an error is thrown.
 ///
 /// @FUN{@FA{db}._remove(@FA{document}, true)}
 ///
-/// Deletes a document. If there is revision mismatch, then mismatch
-/// is ignored and document is deleted. The function returns
-/// @LIT{true} if the document existed and was deleted. It returns
-/// @LIT{false}, if the document was already deleted.
+/// Removes a document. If there is revision mismatch, then mismatch is ignored
+/// and document is deleted. The function returns @LIT{true} if the document
+/// existed and was deleted. It returns @LIT{false}, if the document was already
+/// deleted.
 ///
 /// @FUN{@FA{db}._remove(@FA{document}, true, @FA{waitForSync})}
 ///
-/// The optional @FA{waitForSync} parameter can be used to force 
-/// synchronisation of the document deletion operation to disk even in case
-/// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
-/// of just specific operations. To use this, set the @FA{waitForSync} parameter
-/// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
-/// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// The optional @FA{waitForSync} parameter can be used to force synchronisation
+/// of the document deletion operation to disk even in case that the
+/// @LIT{waitForSync} flag had been disabled for the entire collection.  Thus,
+/// the @FA{waitForSync} parameter can be used to force synchronisation of just
+/// specific operations. To use this, set the @FA{waitForSync} parameter to
+/// @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to
+/// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
 /// @FUN{@FA{db}._remove(@FA{document-handle}, @FA{data})}
 ///
-/// As before. Instead of document a @FA{document-handle} can be passed as
-/// first argument.
+/// As before. Instead of document a @FA{document-handle} can be passed as first
+/// argument.
 ///
 /// @EXAMPLES
 ///
-/// Delete a document:
+/// Remove a document:
 ///
-/// @TINYEXAMPLE{shell_remove-document-db,delete a document}
+/// @code
+/// arango> a1 = db.example.save({ a : 1 });
+/// { "_id" : "116308/4214943", "_rev" : 4214943 }
+/// arango> db._remove(a1);
+/// true
+/// arango> db._remove(a1);
+/// JavaScript exception in file '(arango)' at 1,4: [ArangoError 1202: document not found: cannot remove document]
+/// !db._remove(a1);
+/// !   ^
+/// arango> db._remove(a1, true);
+/// false
+/// @endcode
 ///
-/// Delete a document with a conflict:
+/// Remove a document with a conflict:
 ///
-/// @TINYEXAMPLE{shell_remove-document-conflict-db,delete a document}
+/// @code
+/// arango> a1 = db.example.save({ a : 1 });
+/// { "_id" : "116308/4042634", "_rev" : 4042634 }
+/// arango> a2 = db._replace(a1, { a : 2 });
+/// { "_id" : "116308/4042634", "_rev" : 4108170, "_oldRev" : 4042634 }
+/// arango> db._delete(a1);
+/// JavaScript exception in file '(arango)' at 1,4: [ArangoError 1200: conflict: cannot delete document]
+/// !db._delete(a1);
+/// !   ^
+/// arango> db._delete(a1, true);
+/// true
+/// arango> db._document(a1);
+/// JavaScript exception in file '(arango)' at 1,4: [ArangoError 1202: document not found: document not found]
+/// !db._document(a1);
+/// !   ^
+/// @endcode
 ////////////////////////////////////////////////////////////////////////////////

 static v8::Handle<v8::Value> JS_RemoveVocbase (v8::Arguments const& argv) {
@ -5529,11 +5593,11 @@ static v8::Handle<v8::Value> JS_DocumentVocbase (v8::Arguments const& argv) {
 /// The optional @FA{waitForSync} parameter can be used to force 
 /// synchronisation of the document replacement operation to disk even in case
 /// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
+/// Thus, the @FA{waitForSync} parameter can be used to force synchronisation
 /// of just specific operations. To use this, set the @FA{waitForSync} parameter
 /// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
 /// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
@ -5571,11 +5635,11 @@ static v8::Handle<v8::Value> JS_ReplaceVocbase (v8::Arguments const& argv) {
 /// The optional @FA{waitForSync} parameter can be used to force 
 /// synchronisation of the document update operation to disk even in case
 /// that the @LIT{waitForSync} flag had been disabled for the entire collection.
-/// Thus, the @FA{waitForSync} URL parameter can be used to force synchronisation
+/// Thus, the @FA{waitForSync} parameter can be used to force synchronisation
 /// of just specific operations. To use this, set the @FA{waitForSync} parameter
 /// to @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to 
 /// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is 
-/// applied. The @FA{waitForSync} URL parameter cannot be used to disable
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
 /// synchronisation for collections that have a default @LIT{waitForSync} value
 /// of @LIT{true}.
 ///
--- a/arangosh/V8Client/arangosh.cpp
+++ b/arangosh/V8Client/arangosh.cpp
@ -62,12 +62,6 @@ using namespace triagens::httpclient;
 using namespace triagens::v8client;
 using namespace triagens::arango;

-#include "js/common/bootstrap/js-print.h"
-#include "js/common/bootstrap/js-modules.h"
-#include "js/common/bootstrap/js-monkeypatches.h"
-#include "js/common/bootstrap/js-errors.h"
-#include "js/client/js-client.h"
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 private variables
 // -----------------------------------------------------------------------------
@ -1341,30 +1335,33 @@ int main (int argc, char* argv[]) {

  // load java script from js/bootstrap/*.h files
  if (StartupPath.empty()) {
-    StartupLoader.defineScript("common/bootstrap/modules.js", JS_common_bootstrap_modules);
-    StartupLoader.defineScript("common/bootstrap/monkeypatches.js", JS_common_bootstrap_monkeypatches);
-    StartupLoader.defineScript("common/bootstrap/print.js", JS_common_bootstrap_print);
-    StartupLoader.defineScript("common/bootstrap/errors.js", JS_common_bootstrap_errors);
-    StartupLoader.defineScript("client/client.js", JS_client_client);
-  }
-  else {
-    LOGGER_DEBUG << "using JavaScript startup files at '" << StartupPath << "'";
-    StartupLoader.setDirectory(StartupPath);
+    LOGGER_FATAL << "no 'javascript.startup-directory' has been supplied, giving up";
+    TRI_FlushLogging();
+    exit(EXIT_FAILURE);
  }

+  LOGGER_DEBUG << "using JavaScript startup files at '" << StartupPath << "'";
+  StartupLoader.setDirectory(StartupPath);
+
  context->Global()->Set(v8::String::New("ARANGO_QUIET"), v8::Boolean::New(BaseClient.quiet()), v8::ReadOnly);
  context->Global()->Set(v8::String::New("VALGRIND"), v8::Boolean::New((RUNNING_ON_VALGRIND) > 0));

  // load all init files
-  char const* files[] = {
-    "common/bootstrap/modules.js",
-    "common/bootstrap/monkeypatches.js",
-    "common/bootstrap/print.js",
-    "common/bootstrap/errors.js",
-    "client/client.js"
-  };
+  vector<string> files;
+
+  files.push_back("common/bootstrap/modules.js");
+  files.push_back("common/bootstrap/module-internal.js");
+  files.push_back("common/bootstrap/module-fs.js");
+  files.push_back("common/bootstrap/module-console.js");
+
+  if (JsLint.empty()) {
+    files.push_back("common/bootstrap/monkeypatches.js");
+  }
+
+  files.push_back("common/bootstrap/errors.js");
+  files.push_back("client/client.js");
  
-  for (size_t i = 0;  i < sizeof(files) / sizeof(files[0]);  ++i) {
+  for (size_t i = 0;  i < files.size();  ++i) {
    bool ok = StartupLoader.loadScript(context, files[i]);
    
    if (ok) {
--- a/config/js2c.sh
+++ b/config/js2c.sh
@ -1,11 +0,0 @@
-#!/bin/bash
-NAME=`echo $1 | sed -e 's:^\(.*/\)*js/\(.*\)\.js$:\2:' | tr "/-" "__"`
-
-#cat $1 \
-#  | sed -e 's:\(["\]\):\\\1:g' \
-#  | awk 'BEGIN {print "static string JS_'$NAME' = string(\"\") " } { print " + \"" $0 "\\n\"" } END { print ";"}'
-
-cat $1 \
-  | sed -e 's:\(["\]\):\\\1:g' \
-  | awk 'BEGIN {print "const char* JS_'$NAME'[] = {" } { print " \"" $0 "\"," } END { print " \"//__end__\"\n};"}'
-  
--- a/etc/arangodb/arangosh.conf.in
+++ b/etc/arangodb/arangosh.conf.in
@ -2,4 +2,5 @@
 endpoint = tcp://localhost:8529

 [javascript]
+startup-directory = @PKGDATADIR@/js
 modules-path = @PKGDATADIR@/js/client/modules;@PKGDATADIR@/js/common/modules
--- a/etc/relative/arangosh.conf
+++ b/etc/relative/arangosh.conf
@ -1,2 +1,3 @@
 [javascript]
+startup-directory = ./js
 modules-path = ./js/client/modules;./js/common/modules
--- a/html/admin/index.html
+++ b/html/admin/index.html
@ -27,13 +27,14 @@
      <script type="text/javascript" src="js/jquery.jeditable.js"></script>
      <script type="text/javascript" src="js/jquery.jeditable.autogrow.js"></script>
      <script type="text/javascript" src="js/master.js"></script>
-      <script type="text/javascript" src="js/avocsh1.js"></script>
-      <script type="text/javascript" src="js/print.js"></script>
-      <script type="text/javascript" src="js/errors.js"></script>
+      <script type="text/javascript" src="js/arangodb/browser.js"></script>
+      <script type="text/javascript" src="js/arangodb/errors.js"></script>
+      <script type="text/javascript" src="js/arangodb/module-internal.js"></script>
+      <script type="text/javascript" src="js/arangodb/monkeypatches.js"></script>
      <script type="text/javascript" src="js/modules/simple-query-basics.js"></script>
      <script type="text/javascript" src="js/modules/simple-query.js"></script>
      <script type="text/javascript" src="js/modules/statement-basics.js"></script>
-      <script type="text/javascript" src="js/client.js"></script>
+      <script type="text/javascript" src="js/arangodb/client.js"></script>
    <style>
      a:link {color: #797979; text-decoration: none;}  
      a:visited {color: #797979; text-decoration: none;}
--- a/html/admin/js/arangodb/browser.js
+++ b/html/admin/js/arangodb/browser.js
@ -1,11 +1,5 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
-/*global module, ModuleCache, $ */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
+/*global $ */

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief ArangoDB web browser shell
@ -14,7 +8,7 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright 2012 triagens GmbH, Cologne, Germany
+/// Copyright 2012-2013 triagens GmbH, Cologne, Germany
 ///
 /// Licensed under the Apache License, Version 2.0 (the "License");
 /// you may not use this file except in compliance with the License.
@ -31,7 +25,8 @@
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///
 /// @author Achim Brandt
-/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+/// @author Dr. Frank Celler
+/// @author Copyright 2012-2013, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

 // -----------------------------------------------------------------------------
@ -57,8 +52,31 @@ function Module (id) {
  this.definition = null;
 }

-var ModuleCache = {};
-var module = ModuleCache["/"] = new Module("/");
+////////////////////////////////////////////////////////////////////////////////
+/// @brief module cache
+////////////////////////////////////////////////////////////////////////////////
+
+Module.prototype.ModuleCache = {};
+Module.prototype.ModuleCache["/internal"] = new Module("/internal");
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                  public variables
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoShell
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief global module
+////////////////////////////////////////////////////////////////////////////////
+
+var module = Module.prototype.ModuleCache["/"] = new Module("/");

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
@ -136,6 +154,23 @@ Module.prototype.normalise = function (path) {
 /// @{
 ////////////////////////////////////////////////////////////////////////////////

+////////////////////////////////////////////////////////////////////////////////
+/// @brief sets a new module definition
+////////////////////////////////////////////////////////////////////////////////
+
+Module.prototype.define = function (path, definition) {
+
+  // first get rid of any ".." and "."
+  path = this.normalise(path);
+
+  // check if you already know the module, return the exports
+  if (! Module.prototype.ModuleCache.hasOwnProperty(path)) {
+    Module.prototype.ModuleCache[path] = new Module(path);
+  }
+
+  Module.prototype.ModuleCache[path].definition = definition;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief executes a definition or creates a new module descriptor
 ////////////////////////////////////////////////////////////////////////////////
@ -147,11 +182,11 @@ Module.prototype.require = function (path) {
  path = this.normalise(path);

  // check if you already know the module, return the exports
-  if (ModuleCache.hasOwnProperty(path)) {
-    module = ModuleCache[path];
+  if (Module.prototype.ModuleCache.hasOwnProperty(path)) {
+    module = Module.prototype.ModuleCache[path];
  }
  else {
-    module = ModuleCache[path] = new Module(path);
+    module = Module.prototype.ModuleCache[path] = new Module(path);
  }

  if (module.definition !== null) {
@ -163,21 +198,22 @@ Module.prototype.require = function (path) {
 };

 ////////////////////////////////////////////////////////////////////////////////
-/// @brief sets a new module definition
+/// @brief global require function
 ////////////////////////////////////////////////////////////////////////////////

-Module.prototype.define = function (path, definition) {
+function require (path) {
+  return module.require(path);
+}

-  // first get rid of any ".." and "."
-  path = this.normalise(path);
+////////////////////////////////////////////////////////////////////////////////
+/// @brief global print function
+////////////////////////////////////////////////////////////////////////////////

-  // check if you already know the module, return the exports
-  if (! ModuleCache.hasOwnProperty(path)) {
-    ModuleCache[path] = new Module(path);
-  }
+function print () {
+  var internal = require("internal");

-  ModuleCache[path].definition = definition;
-};
+  internal.print.apply(internal.print, arguments);
+}

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
@ -278,7 +314,6 @@ ArangoConnection.prototype._delete = function (url) {
  return msg;  
 };

-
 ArangoConnection.prototype.DELETE = ArangoConnection.prototype._delete;

 ////////////////////////////////////////////////////////////////////////////////
@ -416,13 +451,8 @@ var arango = new ArangoConnection();
 /// @brief module cache
 ////////////////////////////////////////////////////////////////////////////////

-ModuleCache["/internal"] = new Module("/internal");
-
 (function () {
-  var internal = ModuleCache["/internal"].exports;
-
-  internal.start_pager = function() {};
-  internal.stop_pager = function() {};
+  var internal = Module.prototype.ModuleCache["/internal"].exports;

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief global output buffer
@ -430,6 +460,28 @@ ModuleCache["/internal"] = new Module("/internal");

  internal.browserOutputBuffer = "";

+////////////////////////////////////////////////////////////////////////////////
+/// @brief escapes HTML
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.escapeHTML = (function() {
+    var MAP = {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&#34;',
+      "'": '&#39;',
+      "\n": '<br>',
+      " ": '&nbsp;'
+    };
+
+    var repl = function(c) { return MAP[c]; };
+
+    return function(s) {
+      return s.replace(/[&<>'"\n ]/g, repl); //'
+    };
+  }()); 
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief outputs text to shell window
 ////////////////////////////////////////////////////////////////////////////////
@ -459,7 +511,7 @@ ModuleCache["/internal"] = new Module("/internal");
        text = String(value);
      }

-      internal.browserOutputBuffer += escapeHTML(text);
+      internal.browserOutputBuffer += internal.escapeHTML(text);
    }
  };

@ -484,51 +536,9 @@ ModuleCache["/internal"] = new Module("/internal");
 }());

 // -----------------------------------------------------------------------------
-// --SECTION--                                                  public functions
+// --SECTION--                                                       END-OF-FILE
 // -----------------------------------------------------------------------------

-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoShell
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief escapes HTML
-////////////////////////////////////////////////////////////////////////////////
-
-var escapeHTML = (function() {
-                    var MAP = {
-                      '&': '&amp;',
-                      '<': '&lt;',
-                      '>': '&gt;',
-                      '"': '&#34;',
-                      "'": '&#39;',
-                      "\n": '<br>',
-                      " ": '&nbsp;'
-                    };
-
-                    var repl = function(c) { return MAP[c]; };
-
-                    return function(s) {
-                      return s.replace(/[&<>'"\n ]/g, repl); //'
-                    };
-                  }()); 
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief global require function
-////////////////////////////////////////////////////////////////////////////////
-
-function require (path) {
-  return module.require(path);
-}
-
-function ARANGO_QUIET (path) {
-  return false; 
-}
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
 // Local Variables:
 // mode: outline-minor
 // outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
--- a/html/admin/js/arangodb/client.js
+++ b/html/admin/js/arangodb/client.js
@ -0,0 +1 @@
+../../../../js/client/client.js
--- a/html/admin/js/arangodb/errors.js
+++ b/html/admin/js/arangodb/errors.js
@ -0,0 +1 @@
+../../../../js/common/bootstrap/errors.js
--- a/html/admin/js/arangodb/module-internal.js
+++ b/html/admin/js/arangodb/module-internal.js
@ -0,0 +1 @@
+../../../../js/common/bootstrap/module-internal.js
--- a/html/admin/js/arangodb/monkeypatches.js
+++ b/html/admin/js/arangodb/monkeypatches.js
@ -0,0 +1 @@
+../../../../js/common/bootstrap/monkeypatches.js
--- a/html/admin/js/client.js
+++ b/html/admin/js/client.js
@ -1 +0,0 @@
-../../../js/client/client.js
--- a/html/admin/js/errors.js
+++ b/html/admin/js/errors.js
@ -1 +0,0 @@
-../../../js/common/bootstrap/errors.js
--- a/html/admin/js/master.js
+++ b/html/admin/js/master.js
@ -1190,7 +1190,8 @@ var lastFormatQuestion = true;
      command = data;
    }

-    var client = "arangosh> " + escapeHTML(data) + "<br>";
+    var internal = require("internal");
+    var client = "arangosh> " + internal.escapeHTML(data) + "<br>";
 
    $('#avocshWindow').append('<b class="avocshClient">' + client + '</b>');
    evaloutput(command);
--- a/html/admin/js/print.js
+++ b/html/admin/js/print.js
@ -1 +0,0 @@
-../../../js/common/bootstrap/print.js
--- a/js/Makefile.files
+++ b/js/Makefile.files
@ -9,10 +9,26 @@
 ################################################################################

 JAVASCRIPT_JSLINT = \
+	@srcdir@/html/admin/js/arangodb/browser.js \
 	@srcdir@/js/actions/system/api-collection.js \
 	@srcdir@/js/actions/system/api-structure.js \
+	@srcdir@/js/client/modules/org/arangodb.js \
+	@srcdir@/js/client/modules/org/arangodb/deploy.js \
+	@srcdir@/js/common/bootstrap/errors.js \
+	@srcdir@/js/common/bootstrap/module-console.js \
+	@srcdir@/js/common/bootstrap/module-fs.js \
+	@srcdir@/js/common/bootstrap/module-internal.js \
+	@srcdir@/js/common/bootstrap/modules.js \
+	@srcdir@/js/common/bootstrap/monkeypatches.js \
 	@srcdir@/js/server/ArangoCollection.js \
-	@srcdir@/js/server/ArangoStructure.js
+	@srcdir@/js/server/ArangoStructure.js \
+	@srcdir@/js/server/modules/org/arangodb.js \
+	@srcdir@/js/server/modules/org/arangodb/actions.js \
+	@srcdir@/js/server/modules/org/arangodb/actions/echoController.js \
+	@srcdir@/js/server/modules/org/arangodb/actions/staticContentController.js \
+	@srcdir@/js/server/modules/org/arangodb/formatter.js \
+	@srcdir@/js/server/modules/org/arangodb/parser.js \
+	@srcdir@/js/server/modules/org/arangodb/validator.js

 ################################################################################
 ### @brief executes jslint
@ -39,8 +55,6 @@ BUILT_SOURCES += @builddir@/.setup-js-directories

@builddir@/.setup-js-directories:
 	@test -d html/admin/js/modules || mkdir -p html/admin/js/modules
-	@test -d js/common/bootstrap || mkdir -p js/common/bootstrap
-	@test -d js/client || mkdir -p js/client
 	@touch $@

 ################################################################################
@ -53,15 +67,6 @@ html/admin/js/modules/%.js: @srcdir@/js/common/modules/%.js .setup-js-directorie
 html/admin/js/modules/%.js: @srcdir@/js/client/modules/%.js .setup-js-directories
 	(echo "module.define(\"`basename $< .js`\", function(exports, module) {" && cat $< && echo "});") > $@

-js/js-%.h: @srcdir@/js/%.js .setup-js-directories
-	@top_srcdir@/config/js2c.sh $< > $@
-
-js/client/js-%.h: @srcdir@/js/client/%.js .setup-js-directories
-	@top_srcdir@/config/js2c.sh $< > $@
-
-js/common/bootstrap/js-%.h: @srcdir@/js/common/bootstrap/%.js .setup-js-directories
-	@top_srcdir@/config/js2c.sh $< > $@
-
 ################################################################################
 ### @brief cleanup
 ################################################################################
--- a/js/actions/system/api-blueprints.js
+++ b/js/actions/system/api-blueprints.js
--- a/js/actions/system/api-collection.js
+++ b/js/actions/system/api-collection.js
@ -158,7 +158,7 @@ function post_api_collection (req, res) {
  }

  if (! body.hasOwnProperty("name")) {
-    actions.resultBad(req, res, actions.ERROR_ARANGO_ILLEGAL_NAME,
+    actions.resultBad(req, res, arangodb.ERROR_ARANGO_ILLEGAL_NAME,
 		      "name must be non-empty");
    return;
  }
@ -393,7 +393,7 @@ function get_api_collection (req, res) {
    name = decodeURIComponent(req.suffix[0]);
  }
    
-  var collection = internal.db._collection(name);
+  var collection = arangodb.db._collection(name);

  if (collection === null) {
    actions.collectionNotFound(req, res, name);
@ -670,7 +670,7 @@ function put_api_collection_rename (req, res, collection) {
  }

  if (! body.hasOwnProperty("name")) {
-    actions.resultBad(req, res, actions.ERROR_ARANGO_ILLEGAL_NAME,
+    actions.resultBad(req, res, arangodb.ERROR_ARANGO_ILLEGAL_NAME,
 		      "name must be non-empty");
    return;
  }
@ -701,7 +701,7 @@ function put_api_collection (req, res) {
  }

  var name = decodeURIComponent(req.suffix[0]);
-  var collection = internal.db._collection(name);
+  var collection = arangodb.db._collection(name);

  if (collection === null) {
    actions.collectionNotFound(req, res, name);
@ -769,7 +769,7 @@ function delete_api_collection (req, res) {
  }
  else {
    var name = decodeURIComponent(req.suffix[0]);
-    var collection = internal.db._collection(name);
+    var collection = arangodb.db._collection(name);

    if (collection === null) {
      actions.collectionNotFound(req, res, name);
--- a/js/actions/system/api-cursor.js
+++ b/js/actions/system/api-cursor.js
@ -26,21 +26,22 @@
 /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoAPI
-/// @{
-////////////////////////////////////////////////////////////////////////////////
+var arangodb = require("org/arangodb");
+var actions = require("org/arangodb/actions");

 // -----------------------------------------------------------------------------
 // --SECTION--                                                  global variables
 // -----------------------------------------------------------------------------

-var actions = require("org/arangodb/actions");
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 private functions
 // -----------------------------------------------------------------------------

+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoAPI
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief create a cursor and return the first results
 ///
@ -123,7 +124,7 @@ var actions = require("org/arangodb/actions");

 function POST_api_cursor(req, res) {
  if (req.suffix.length != 0) {
-    actions.resultNotFound(req, res, internal.errors.ERROR_CURSOR_NOT_FOUND.code, internal.errors.ERROR_CURSOR_NOT_FOUND.message);
+    actions.resultNotFound(req, res, arangodb.ERROR_CURSOR_NOT_FOUND);
    return;
  }

@ -143,7 +144,7 @@ function POST_api_cursor(req, res) {
                          (json.batchSize == undefined));  
  }
  else {
-    actions.resultBad(req, res, actions.ERROR_QUERY_EMPTY);
+    actions.resultBad(req, res, arangodb.ERROR_QUERY_EMPTY);
    return;
  }
   
@ -196,9 +197,9 @@ function POST_api_cursor(req, res) {
 /// @verbinclude api-cursor-invalid-cursor-identifier
 ////////////////////////////////////////////////////////////////////////////////

-function PUT_api_cursor(req, res) {
+function PUT_api_cursor (req, res) {
  if (req.suffix.length != 1) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER);
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER);
    return;
  }

@ -206,7 +207,7 @@ function PUT_api_cursor(req, res) {
  var cursor = CURSOR(cursorId);

  if (! (cursor instanceof ArangoCursor)) {
-    actions.resultBad(req, res, actions.ERROR_CURSOR_NOT_FOUND);
+    actions.resultBad(req, res, arangodb.ERROR_CURSOR_NOT_FOUND);
    return;
  }
    
@ -253,13 +254,13 @@ function PUT_api_cursor(req, res) {

 function DELETE_api_cursor(req, res) {
  if (req.suffix.length != 1) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER);
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER);
    return;
  }

  var cursorId = decodeURIComponent(req.suffix[0]);
  if (! DELETE_CURSOR(cursorId)) {
-    actions.resultNotFound(req, res, internal.errors.ERROR_CURSOR_NOT_FOUND.code, internal.errors.ERROR_CURSOR_NOT_FOUND.message);
+    actions.resultNotFound(req, res, arangodb.ERROR_CURSOR_NOT_FOUND);
    return;
  }

--- a/js/actions/system/api-edges.js
+++ b/js/actions/system/api-edges.js
@ -25,8 +25,9 @@
 /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

+var arangodb = require("org/arangodb");
 var actions = require("org/arangodb/actions");
-var internal = require("internal");
+
 var API = "/_api/edges";

 ////////////////////////////////////////////////////////////////////////////////
@ -71,14 +72,14 @@ var API = "/_api/edges";

 function GET_edges (req, res) {
  if (req.suffix.length !== 1) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "expect GET /" + API + "/<collection-identifer>?vertex=<vertex-handle>&direction=<direction>");
    return;
  }

  var name = decodeURIComponent(req.suffix[0]);
  var id = parseInt(name) || name;
-  var collection = internal.db._collection(id);
+  var collection = arangodb.db._collection(id);

  if (collection === null) {
    actions.collectionNotFound(req, res, name);
@ -99,7 +100,7 @@ function GET_edges (req, res) {
    e = collection.outEdges(vertex);
  }
  else {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "<direction> must be any, in, or out, not: " + JSON.stringify(direction));
    return;
  }
--- a/js/actions/system/api-index.js
+++ b/js/actions/system/api-index.js
@ -25,7 +25,9 @@
 /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

+var arangodb = require("org/arangodb");
 var actions = require("org/arangodb/actions");
+
 var API = "_api/index";

 // -----------------------------------------------------------------------------
@ -71,7 +73,7 @@ var API = "_api/index";

 function GET_api_indexes (req, res) {
  var name = req.parameters.collection;
-  var collection = internal.db._collection(name);
+  var collection = arangodb.db._collection(name);
  
  if (collection === null) {
    actions.collectionNotFound(req, res, name);
@ -131,7 +133,7 @@ function GET_api_index (req, res) {

  else if (req.suffix.length === 2) {
    var name = decodeURIComponent(req.suffix[0]);
-    var collection = internal.db._collection(name);
+    var collection = arangodb.db._collection(name);
    
    if (collection === null) {
      actions.collectionNotFound(req, res, name);
@ -149,7 +151,7 @@ function GET_api_index (req, res) {
    actions.resultOk(req, res, actions.HTTP_OK, index);
  }
  else {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "expect GET /" + API + "/<index-handle>");
  }
 }
@ -183,7 +185,7 @@ function GET_api_index (req, res) {

 function POST_api_index_cap (req, res, collection, body) {
  if (! body.hasOwnProperty("size")) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "expecting a size");
  }

@ -260,7 +262,7 @@ function POST_api_index_geo (req, res, collection, body) {
  var fields = body.fields;

  if (! (fields instanceof Array)) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "fields must be a list of attribute paths: " + fields);
  }

@ -316,7 +318,7 @@ function POST_api_index_geo (req, res, collection, body) {

  // something is wrong
  else {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
        "fields must be a list of attribute paths of length 1 or 2: " + fields);
    return;
  }
@ -371,7 +373,7 @@ function POST_api_index_hash (req, res, collection, body) {
  var fields = body.fields;

  if (! (fields instanceof Array)) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "fields must be a list of attribute paths: " + fields);
  }

@ -430,7 +432,7 @@ function POST_api_index_skiplist (req, res, collection, body) {
  var fields = body.fields;

  if (! (fields instanceof Array)) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "fields must be a list of attribute paths: " + fields);
  }

@ -544,7 +546,7 @@ function POST_api_index_bitarray (req, res, collection, body) {
  var fields = body.fields;

  if (! (fields instanceof Array)) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "fields must be a list of attribute paths: " + fields);
  }

@ -618,7 +620,7 @@ function POST_api_index (req, res) {
  }

  var name = req.parameters.collection;
-  var collection = internal.db._collection(name);
+  var collection = arangodb.db._collection(name);

  if (collection === null) {
    actions.collectionNotFound(req, res, name);
@ -650,7 +652,7 @@ function POST_api_index (req, res) {
    POST_api_index_bitarray(req, res, collection, body);
  }
  else {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "unknown index type '" + body.type + "'");
  }
 }
@ -671,13 +673,13 @@ function POST_api_index (req, res) {

 function DELETE_api_index (req, res) {
  if (req.suffix.length !== 2) {
-    actions.resultBad(req, res, actions.ERROR_HTTP_BAD_PARAMETER,
+    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER,
                      "expect DELETE /" + API + "/<index-handle>");
    return;
  }

  var name = decodeURIComponent(req.suffix[0]);
-  var collection = internal.db._collection(name);
+  var collection = arangodb.db._collection(name);

  if (collection === null) {
    actions.collectionNotFound(req, res, name);
--- a/js/actions/system/api-system.js
+++ b/js/actions/system/api-system.js
@ -5,7 +5,7 @@
         vars: true,
         white: true,
         plusplus: true */
-/*global require, exports */
+/*global require, exports, module */

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief administration actions
@ -34,10 +34,9 @@
 /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

-(function() {
-  var actions = require("org/arangodb/actions");
-  var internal = require("internal");
-  var console = require("internal");
+var actions = require("org/arangodb/actions");
+var internal = require("internal");
+var console = require("console");

 // -----------------------------------------------------------------------------
 // --SECTION--                                                  standard routing
@ -52,75 +51,75 @@
 /// @brief routing function
 ////////////////////////////////////////////////////////////////////////////////

-  function Routing (req, res) {
-    var action;
-    var execute;
-    var next;
-    var path = req.suffix.join("/");
+function Routing (req, res) {
+  var action;
+  var execute;
+  var next;
+  var path = req.suffix.join("/");

-    action = actions.firstRouting(req.requestType, req.suffix);
+  action = actions.firstRouting(req.requestType, req.suffix);

-    execute = function () {
-      if (action.route === undefined) {
-	actions.resultNotImplemented(req, res, "unknown path '" + path + "'");
-	return;
-      }
+  execute = function () {
+    if (action.route === undefined) {
+      actions.resultNotImplemented(req, res, "unknown path '" + path + "'");
+      return;
+    }

-      if (action.route.path !== undefined) {
-	req.path = action.route.path;
-      }
-      else {
-	delete req.path;
-      }
+    if (action.route.path !== undefined) {
+      req.path = action.route.path;
+    }
+    else {
+      delete req.path;
+    }

-      if (action.prefix !== undefined) {
-	req.prefix = action.prefix;
-      }
-      else {
-	delete req.prefix;
-      }
+    if (action.prefix !== undefined) {
+      req.prefix = action.prefix;
+    }
+    else {
+      delete req.prefix;
+    }

-      if (action.suffix !== undefined) {
-	req.suffix = action.suffix;
-      }
-      else {
-	delete req.suffix;
-      }
+    if (action.suffix !== undefined) {
+      req.suffix = action.suffix;
+    }
+    else {
+      delete req.suffix;
+    }

-      if (action.urlParameters !== undefined) {
-	req.urlParameters = action.urlParameters;
-      }
-      else {
-	req.urlParameters = {};
-      }
+    if (action.urlParameters !== undefined) {
+      req.urlParameters = action.urlParameters;
+    }
+    else {
+      req.urlParameters = {};
+    }

-      var func = action.route.callback.controller;
-      if (func === null || typeof func !== 'function') {
-        func = actions.errorFunction(action.route, 'Invalid callback definition found for route ' + JSON.stringify(action.route));
-      }
+    var func = action.route.callback.controller;
+    if (func === null || typeof func !== 'function') {
+      func = actions.errorFunction(action.route, 'Invalid callback definition found for route ' + JSON.stringify(action.route));
+    }

-      try {
-        func(req, res, action.route.callback.options, next);
-      }
-      catch (err) {
-        actions.errorFunction(action.route, 'A runtime error occurred while executing an action: ' + String(err))(req, res, action.route.callback.options, next);
-      }
-    };
-
-    next = function () {
-      action = actions.nextRouting(action);
-      execute();
-    };
+    try {
+      func(req, res, action.route.callback.options, next);
+    }
+    catch (err) {
+      actions.errorFunction(action.route, 'A runtime error occurred while executing an action: ' + String(err))(req, res, action.route.callback.options, next);
+    }
+  };

+  next = function () {
+    action = actions.nextRouting(action);
    execute();
-  }
+  };

-  actions.defineHttp({
-    url : "",
-    prefix : true,
-    context : "admin",
-    callback : Routing
-  });
+  execute();
+}
+
+actions.defineHttp({
+  url : "",
+  prefix : true,
+  context : "admin",
+  callback : Routing
+});

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief reloads the server authentication information
@ -140,28 +139,29 @@
 /// @brief reloads the routing information
 ////////////////////////////////////////////////////////////////////////////////

-  actions.defineHttp({
-    url : "_admin/routing/reload",
-    context : "admin",
-    prefix : false,
-    callback : function (req, res) {
-      internal.executeGlobalContextFunction("require(\"org/arangodb/actions\").reloadRouting()");
-      actions.resultOk(req, res, actions.HTTP_OK);
-    }
-  });
+actions.defineHttp({
+  url : "_admin/routing/reload",
+  context : "admin",
+  prefix : false,
+  callback : function (req, res) {
+    internal.executeGlobalContextFunction("require(\"org/arangodb/actions\").reloadRouting()");
+    console.warn("about to flush the routing cache");
+    actions.resultOk(req, res, actions.HTTP_OK);
+  }
+});

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief returns the current routing information 
 ////////////////////////////////////////////////////////////////////////////////

-  actions.defineHttp({
-    url : "_admin/routing/routes",
-    context : "admin",
-    prefix : false,
-    callback : function (req, res) {
-      actions.resultOk(req, res, actions.HTTP_OK, actions.routingCache());
-    }
-  });
+actions.defineHttp({
+  url : "_admin/routing/routes",
+  context : "admin",
+  prefix : false,
+  callback : function (req, res) {
+    actions.resultOk(req, res, actions.HTTP_OK, actions.routingCache());
+  }
+});

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
@ -176,6 +176,21 @@
 /// @{
 ////////////////////////////////////////////////////////////////////////////////

+////////////////////////////////////////////////////////////////////////////////
+/// @brief flushes the modules cache
+////////////////////////////////////////////////////////////////////////////////
+
+actions.defineHttp({
+  url : "_admin/modules/flush",
+  context : "admin",
+  prefix : false,
+  callback : function (req, res) {
+    internal.executeGlobalContextFunction("require(\"internal\").flushModuleCache()");
+    console.warn("about to flush the modules cache");
+    actions.resultOk(req, res, actions.HTTP_OK);
+  }
+});
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @fn JSF_GET_admin_time
 /// @brief returns the system time
@ -188,14 +203,14 @@
 /// current system time as a Unix timestamp with microsecond precision.
 ////////////////////////////////////////////////////////////////////////////////

-  actions.defineHttp({
-    url : "_admin/time",
-    context : "admin",
-    prefix : false,
-    callback : function (req, res) {
-      actions.resultOk(req, res, actions.HTTP_OK, { time : internal.time() });
-    }
-  });
+actions.defineHttp({
+  url : "_admin/time",
+  context : "admin",
+  prefix : false,
+  callback : function (req, res) {
+    actions.resultOk(req, res, actions.HTTP_OK, { time : internal.time() });
+  }
+});

 ////////////////////////////////////////////////////////////////////////////////
 /// @fn JSF_GET_admin_echo
@ -214,16 +229,16 @@
 /// - @LIT{parameters}: list of URL parameters received
 ////////////////////////////////////////////////////////////////////////////////

-  actions.defineHttp({
-    url : "_admin/echo",
-    context : "admin",
-    prefix : true,
-    callback : function (req, res) {
-      res.responseCode = actions.HTTP_OK;
-      res.contentType = "application/json; charset=utf-8";
-      res.body = JSON.stringify(req);
-    }
-  });
+actions.defineHttp({
+  url : "_admin/echo",
+  context : "admin",
+  prefix : true,
+  callback : function (req, res) {
+    res.responseCode = actions.HTTP_OK;
+    res.contentType = "application/json; charset=utf-8";
+    res.body = JSON.stringify(req);
+  }
+});

 ////////////////////////////////////////////////////////////////////////////////
 /// @fn JSF_GET_admin_status
@ -260,24 +275,24 @@
 ///   made which have required loading a memory page from disk.
 ////////////////////////////////////////////////////////////////////////////////

-  actions.defineHttp({
-    url : "_admin/status",
-    context : "admin",
+actions.defineHttp({
+  url : "_admin/status",
+  context : "admin",

-    callback : function (req, res) {
-      var result;
+  callback : function (req, res) {
+    var result;

-      try {
-        result = {};
-        result.system = SYS_PROCESS_STAT();
+    try {
+      result = {};
+      result.system = internal.processStat();

-        actions.resultOk(req, res, actions.HTTP_OK, result);
-      }
-      catch (err) {
-        actions.resultException(req, res, err);
-      }
+      actions.resultOk(req, res, actions.HTTP_OK, result);
    }
-  });
+    catch (err) {
+      actions.resultException(req, res, err);
+    }
+  }
+});

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
@ -292,83 +307,81 @@
 /// @{
 ////////////////////////////////////////////////////////////////////////////////

-    function GET_admin_session (req, res) {
-      var result;
-      var realm;
+function GET_admin_session (req, res) {
+  var result;
+  var realm;

-      if (req.user === null) {
-        realm = "basic realm=\"arangodb\"";
+  if (req.user === null) {
+    realm = "basic realm=\"arangodb\"";

-        res.responseCode = actions.HTTP_UNAUTHORIZED;
-        res.headers = { "www-authenticate" : realm };
-      }
-      else {
-        var user = internal.db._collection("_users").firstExample({ user : req.user });
+    res.responseCode = actions.HTTP_UNAUTHORIZED;
+    res.headers = { "www-authenticate" : realm };
+  }
+  else {
+    var user = internal.db._collection("_users").firstExample({ user : req.user });

-        if (user === null) {
-          actions.resultNotFound(req, res, internal.errors.ERROR_HTTP_NOT_FOUND.code, "unknown user '" + req.user + "'");
-        }
-        else {
-          result = {
-            user : user.user,
-            permissions : user.permissions || []
-          };
-
-          actions.resultOk(req, res, actions.HTTP_OK, result);
-        }
-      }
+    if (user === null) {
+      actions.resultNotFound(req, res, internal.errors.ERROR_HTTP_NOT_FOUND.code, "unknown user '" + req.user + "'");
    }
+    else {
+      result = {
+	user : user.user,
+	permissions : user.permissions || []
+      };

-    function POST_admin_session (req, res) {
-      actions.resultUnsupported(req, res);
+      actions.resultOk(req, res, actions.HTTP_OK, result);
    }
+  }
+}

-    function PUT_admin_session (req, res) {
-      actions.resultUnsupported(req, res);
-    }
+function POST_admin_session (req, res) {
+  actions.resultUnsupported(req, res);
+}

-    function DELETE_admin_session (req, res) {
-      actions.resultUnsupported(req, res);
-    }
+function PUT_admin_session (req, res) {
+  actions.resultUnsupported(req, res);
+}
+
+function DELETE_admin_session (req, res) {
+  actions.resultUnsupported(req, res);
+}

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief session call dispatcher
 ////////////////////////////////////////////////////////////////////////////////

-  actions.defineHttp({
-    url : "_admin/session",
-    context : "admin",
-    prefix : false,
-    callback : function (req, res) {
-      try {
-        if (req.requestType === actions.GET) {
-          GET_admin_session(req, res);
-        }
-        else if (req.requestType === actions.DELETE) {
-          DELETE_admin_session(req, res);
-        }
-        else if (req.requestType === actions.POST) {
-          POST_admin_session(req, res);
-        }
-        else if (req.requestType === actions.PUT) {
-          PUT_admin_session(req, res);
-        }
-        else {
-          actions.resultUnsupported(req, res);
-        }
+actions.defineHttp({
+  url : "_admin/session",
+  context : "admin",
+  prefix : false,
+  callback : function (req, res) {
+    try {
+      if (req.requestType === actions.GET) {
+	GET_admin_session(req, res);
      }
-      catch (err) {
-        actions.resultException(req, res, err);
+      else if (req.requestType === actions.DELETE) {
+	DELETE_admin_session(req, res);
+      }
+      else if (req.requestType === actions.POST) {
+	POST_admin_session(req, res);
+      }
+      else if (req.requestType === actions.PUT) {
+	PUT_admin_session(req, res);
+      }
+      else {
+	actions.resultUnsupported(req, res);
      }
    }
-  });
+    catch (err) {
+      actions.resultException(req, res, err);
+    }
+  }
+});

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////

-})();
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE
 // -----------------------------------------------------------------------------
@ -377,4 +390,3 @@
 // mode: outline-minor
 // outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
 // End:
-
--- a/js/actions/system/key-value.js
+++ b/js/actions/system/key-value.js
@ -118,7 +118,7 @@ function buildDocumentFromReq(req) {

 function postKeyValue(req, res) {
  if (req.suffix.length < 2) {
-    actions.resultBad(req, res, actions.ERROR_KEYVALUE_INVALID_KEY, actions.getErrorMessage(actions.ERROR_KEYVALUE_INVALID_KEY));
+    actions.resultBad(req, res, arangodb.ERROR_KEYVALUE_INVALID_KEY);
    return;
  }

@ -130,7 +130,7 @@ function postKeyValue(req, res) {
  }

  if (req.requestBody == "") {
-    actions.resultError(req, res, actions.HTTP_BAD, actions.ERROR_KEYVALUE_NO_VALUE, actions.getErrorMessage(actions.ERROR_KEYVALUE_NO_VALUE));
+    actions.resultError(req, res, actions.HTTP_BAD, arangodb.ERROR_KEYVALUE_NO_VALUE, actions.getErrorMessage(arangodb.ERROR_KEYVALUE_NO_VALUE));
    return;
  }
  
@ -139,7 +139,7 @@ function postKeyValue(req, res) {
  var oldDoc = internal.db._collection(collection).firstExample("$key", doc["$key"]);
        
  if (oldDoc != undefined) {
-    actions.resultError(req, res, actions.HTTP_BAD, actions.ERROR_KEYVALUE_KEY_EXISTS, actions.getErrorMessage(actions.ERROR_KEYVALUE_KEY_EXISTS));
+    actions.resultError(req, res, actions.HTTP_BAD, arangodb.ERROR_KEYVALUE_KEY_EXISTS, actions.getErrorMessage(arangodb.ERROR_KEYVALUE_KEY_EXISTS));
  }
  else {
    var id = db[collection].save(doc);    
@ -161,7 +161,7 @@ function postKeyValue(req, res) {

 function putKeyValue(req, res) {
  if (req.suffix.length < 2) {
-    actions.resultBad(req, res, actions.ERROR_KEYVALUE_INVALID_KEY, actions.getErrorMessage(actions.ERROR_KEYVALUE_INVALID_KEY));
+    actions.resultBad(req, res, arangodb.ERROR_KEYVALUE_INVALID_KEY);
    return;
  }

@ -186,7 +186,7 @@ function putKeyValue(req, res) {
      actions.resultOk(req, res, actions.HTTP_CREATED, result);      
      return;
    }
-    actions.resultError(req, res, actions.HTTP_NOT_FOUND, actions.ERROR_KEYVALUE_KEY_NOT_FOUND, actions.getErrorMessage(actions.ERROR_KEYVALUE_KEY_NOT_FOUND));
+    actions.resultError(req, res, actions.HTTP_NOT_FOUND, arangodb.ERROR_KEYVALUE_KEY_NOT_FOUND, actions.getErrorMessage(arangodb.ERROR_KEYVALUE_KEY_NOT_FOUND));
  }
  else {
    // get _id
@ -203,7 +203,7 @@ function putKeyValue(req, res) {
      actions.resultOk(req, res, actions.HTTP_ACCEPTED, {"changed" : true});                              
    }
    else {
-      actions.resultError(req, res, actions.HTTP_BAD, actions.ERROR_KEYVALUE_KEY_NOT_CHANGED, actions.getErrorMessage(actions.ERROR_KEYVALUE_KEY_NOT_CHANGED));
+      actions.resultError(req, res, actions.HTTP_BAD, arangodb.ERROR_KEYVALUE_KEY_NOT_CHANGED, actions.getErrorMessage(arangodb.ERROR_KEYVALUE_KEY_NOT_CHANGED));
    }
  }
 }
@ -217,7 +217,7 @@ function putKeyValue(req, res) {

 function deleteKeyValue(req, res) {
  if (req.suffix.length < 2) {
-    actions.resultBad(req, res, actions.ERROR_KEYVALUE_INVALID_KEY, actions.getErrorMessage(actions.ERROR_KEYVALUE_INVALID_KEY));
+    actions.resultBad(req, res, arangodb.ERROR_KEYVALUE_INVALID_KEY);
    return;
  }

@ -237,7 +237,7 @@ function deleteKeyValue(req, res) {
  var doc = internal.db._collection(collection).firstExample("$key", key);
    
  if (doc == undefined) {
-    actions.resultError(req, res, actions.HTTP_NOT_FOUND, actions.ERROR_KEYVALUE_KEY_NOT_FOUND, actions.getErrorMessage(actions.ERROR_KEYVALUE_KEY_NOT_FOUND));
+    actions.resultError(req, res, actions.HTTP_NOT_FOUND, arangodb.ERROR_KEYVALUE_KEY_NOT_FOUND, actions.getErrorMessage(arangodb.ERROR_KEYVALUE_KEY_NOT_FOUND));
  }
  else {
    var id = doc._id;
@ -245,7 +245,7 @@ function deleteKeyValue(req, res) {
      actions.resultOk(req, res, actions.HTTP_ACCEPTED, {"removed" : true});                              
    }
    else {
-      actions.resultError(req, res, actions.HTTP_BAD, actions.ERROR_KEYVALUE_KEY_NOT_REMOVED, actions.getErrorMessage(actions.ERROR_KEYVALUE_KEY_NOT_REMOVED));
+      actions.resultError(req, res, actions.HTTP_BAD, arangodb.ERROR_KEYVALUE_KEY_NOT_REMOVED, actions.getErrorMessage(arangodb.ERROR_KEYVALUE_KEY_NOT_REMOVED));
    }
  }
 }
@ -261,7 +261,7 @@ function deleteKeyValue(req, res) {

 function getKeyValue(req, res) {
  if (req.suffix.length < 2) {
-    actions.resultBad(req, res, actions.ERROR_KEYVALUE_INVALID_KEY, actions.getErrorMessage(actions.ERROR_KEYVALUE_INVALID_KEY));
+    actions.resultBad(req, res, arangodb.ERROR_KEYVALUE_INVALID_KEY);
    return;
  }

@ -281,7 +281,7 @@ function getKeyValue(req, res) {
  var doc = internal.db._collection(collection).firstExample("$key", key); 
        
  if (doc == undefined) {
-    actions.resultError(req, res, actions.HTTP_NOT_FOUND, actions.ERROR_KEYVALUE_KEY_NOT_FOUND, actions.getErrorMessage(actions.ERROR_KEYVALUE_KEY_NOT_FOUND));
+    actions.resultError(req, res, actions.HTTP_NOT_FOUND, arangodb.ERROR_KEYVALUE_KEY_NOT_FOUND, actions.getErrorMessage(arangodb.ERROR_KEYVALUE_KEY_NOT_FOUND));
  }
  else {
    var headers = {};
@ -367,7 +367,7 @@ actions.defineHttp({

 function searchKeyValue(req, res) {
  if (req.suffix.length < 2) {
-    actions.resultBad(req, res, actions.ERROR_KEYVALUE_INVALID_KEY, actions.getErrorMessage(actions.ERROR_KEYVALUE_INVALID_KEY));
+    actions.resultBad(req, res, arangodb.ERROR_KEYVALUE_INVALID_KEY);
    return;
  }

--- a/js/client/client.js
+++ b/js/client/client.js
@ -76,6 +76,8 @@ function ArangoError (error) {
 (function () {
  var internal = require("internal");

+  internal.ArangoError = ArangoError;
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief prints an error
 ////////////////////////////////////////////////////////////////////////////////
@ -386,12 +388,6 @@ function help () {
 (function () {
  var internal = require("internal");

-////////////////////////////////////////////////////////////////////////////////
-/// @brief be quiet
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.ARANGO_QUIET = ARANGO_QUIET;
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief log function
 ////////////////////////////////////////////////////////////////////////////////
@ -400,6 +396,16 @@ function help () {
    internal.output(level, ": ", msg, "\n");
  };

+////////////////////////////////////////////////////////////////////////////////
+/// @brief flushes the module cache of the server
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.flushServerModules = function () {
+    if (typeof arango !== 'undefined') {
+      arango.POST("/_admin/modules/flush", "");
+    }
+  };
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief rebuilds the routing cache
 ////////////////////////////////////////////////////////////////////////////////
@ -1703,7 +1709,7 @@ function ArangoCollection (database, data) {
  };

 ////////////////////////////////////////////////////////////////////////////////
-/// @brief delete a document in the collection, identified by its id
+/// @brief removes a document in the collection, identified by its id
 ////////////////////////////////////////////////////////////////////////////////

  ArangoCollection.prototype.remove = function (id, overwrite) {
@ -1748,7 +1754,26 @@ function ArangoCollection (database, data) {
  };

 ////////////////////////////////////////////////////////////////////////////////
-/// @brief replace a document in the collection, identified by its id
+/// @brief removes documents in the collection, identified by an example
+////////////////////////////////////////////////////////////////////////////////
+
+  // TODO this is not optiomal, there should a HTTP call handling everything on
+  //      the server
+
+  ArangoCollection.prototype.removeByExample = function (example, waitForSync) {
+    var documents;
+
+    documents = this.byExample(example);
+
+    while (documents.hasNext()) {
+      var document = documents.next();
+
+      this.remove(document, true, waitForSync);
+    }
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief replaces a document in the collection, identified by its id
 ////////////////////////////////////////////////////////////////////////////////

  ArangoCollection.prototype.replace = function (id, data, overwrite) { 
--- a/js/client/modules/org/arangodb.js
+++ b/js/client/modules/org/arangodb.js
@ -1,10 +1,4 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
 /*global require, exports */

 ////////////////////////////////////////////////////////////////////////////////
@ -46,6 +40,19 @@ var internal = require("internal");
 ////////////////////////////////////////////////////////////////////////////////

 exports.db = internal.db;
+exports.ArangoCollection = internal.ArangoCollection;
+exports.ArangoError = internal.ArangoError;
+
+// copy error codes
+(function () {
+  var name;
+
+  for (name in internal.errors) {
+    if (internal.errors.hasOwnProperty(name)) {
+      exports[name] = internal.errors[name].code;
+    }
+  }
+}());

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
--- a/js/client/modules/org/arangodb/deploy.js
+++ b/js/client/modules/org/arangodb/deploy.js
@ -0,0 +1,512 @@
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true, regexp: true, continue: true */
+/*global require, exports */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief deployment tools
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2013 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Dr. Frank Celler
+/// @author Copyright 2013, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+var arangodb = require("org/arangodb");
+var fs = require("fs");
+var internal = require("internal");
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                         ArangoApp
+// -----------------------------------------------------------------------------
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                      constructors and destructors
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoDeployment
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief application
+////////////////////////////////////////////////////////////////////////////////
+
+function ArangoApp (routing, description) {
+  this._name = description.application;
+  this._routing = routing;
+  this._description = description;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                 private functions
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoDeployment
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief guesses the content type
+////////////////////////////////////////////////////////////////////////////////
+
+function guessContentType (filename, content) {
+  var re = /.*\.([^\.]*)$/;
+  var match = re.exec(filename);
+  var extension;
+
+  if (match === null) {
+    return "text/plain; charset=utf-8";
+  }
+
+  extension = match[1];
+
+  if (extension === "html") {
+    return "text/html; charset=utf-8";
+  }
+
+  if (extension === "xml") {
+    return "application/xml; charset=utf-8";
+  }
+
+  if (extension === "json") {
+    return "application/json; charset=utf-8";
+  }
+
+  if (extension === "js") {
+    return "application/x-javascript; charset=utf-8";
+  }
+
+  return "text/plain; charset=utf-8";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief normalizes a path
+////////////////////////////////////////////////////////////////////////////////
+
+function normalizePath (url) {
+  if (url === "") {
+    url = "/";
+  }
+  else if (url[0] !== '/') {
+    url = "/" + url;
+  }
+
+  return url;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief updates a routing entry
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.updateRoute = function (route) {
+  var routes;
+  var i;
+
+  routes = this._description.routes;
+
+  for (i = 0;  i < routes.length;  ++i) {
+    if (routes[i].type === route.type && routes[i].key === route.key) {
+      routes[i] = route;
+      return;
+    }
+  }
+
+  routes.push(route);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief prints an application
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype._PRINT = function (route) {
+  internal.output('[ArangoApp "', this._name, '" at "', this._description.urlPrefix, '"]');
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                  public functions
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoDeployment
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief mounts one page directly
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.mountStaticContent = function (url, content, contentType) {
+  var pages;
+  var name;
+
+  if (url === "") {
+    url = "/";
+  }
+  else if (url[0] !== '/') {
+    url = "/" + url;
+  }
+
+  if (typeof content !== "string") {
+    content = JSON.stringify(content);
+
+    if (contentType === undefined) {
+      contentType = "application/json; charset=utf-8";
+    }
+  }
+
+  if (contentType === undefined) {
+    contentType = "text/html; charset=utf-8";
+  }
+
+  pages = {
+    type: "StaticContent",
+    key: url,
+    url: { match: url },
+    content: {
+      contentType: contentType,
+      body: content,
+      methods: [ "GET", "HEAD" ]
+    }
+  };
+
+  this.updateRoute(pages);
+
+  return this;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief mounts a bunch of static pages
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.mountStaticPages = function (url, collection) {
+  var pages;
+  var name;
+
+  if (typeof collection !== "string") {
+    name = collection.name();
+  }
+  else {
+    name = collection;
+  }
+
+  url = normalizePath(url);
+
+  pages = {
+    type: "StaticPages",
+    key: url,
+    url: { match: url + "/*" },
+    action: { 
+      controller: "org/arangodb/actions/staticContentController",
+      methods: [ "GET", "HEAD" ],
+      options: {
+	contentCollection: name,
+	prefix: url,
+	application: this._name
+      }
+    }
+  };
+
+  this.updateRoute(pages);
+
+  return this;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief mounts a simple action
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.mountAction = function (url, func, methods) {
+  var pages;
+  var name;
+
+  url = normalizePath(url);
+
+  if (methods === undefined) {
+    methods = [ "GET", "HEAD" ];
+  }
+
+  if (! (methods instanceof Array)) {
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_BAD_PARAMETER;
+    error.errorMessage = "methods must be a list of HTTP methods, i. e. [\"GET\"]";
+
+    throw error;
+  }
+
+  pages = {
+    type: "Action",
+    key: url,
+    url: { match: url },
+    action: { 
+      'do': func,
+      methods: methods,
+      options: {
+	path: url,
+	application: this._name
+      }
+    }
+  };
+
+  this.updateRoute(pages);
+
+  return this;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief changes the common prefix
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.setPrefix = function (prefix) {
+  if (prefix !== "" && prefix[prefix.length - 1] === '/') {
+    prefix = prefix.slice(0, prefix.length - 1);
+  }
+
+  if (prefix !== "" && prefix[0] !== '/') {
+    prefix = "/" + prefix;
+  }
+
+  if (prefix === "/") {
+    prefix = "";
+  }
+
+  this._description.urlPrefix = prefix;
+
+  return this;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief gets the common prefix
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.prefix = function () {
+  return this._description.urlPrefix;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief saves and reloads
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.save = function () {
+  var doc;
+
+  doc = this._routing.replace(this._description, this._description);
+  this._description = this._routing.document(doc);
+
+  internal.reloadRouting();
+
+  return this;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief uploads content from filesystem
+////////////////////////////////////////////////////////////////////////////////
+
+ArangoApp.prototype.uploadStaticPages = function (prefix, path) {
+  var doc;
+  var files;
+  var i;
+  var route;
+  var routes;
+  var collection;
+  var error;
+  var name;
+  var re = /.*\/([^\/]*)$/;
+
+  routes = this._description.routes;
+  prefix = normalizePath(prefix);
+
+  for (i = 0;  i < routes.length;  ++i) {
+    route = routes[i];
+
+    if (route.type === "StaticPages" && route.key === prefix) {
+      break;
+    }
+  }
+
+  if (routes.length <= i) {
+    error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_HTTP_NOT_FOUND;
+    error.errorMessage = "cannot find path '" + prefix + "' in routing table";
+
+    throw error;
+  }
+
+  files = fs.listTree(path);
+
+  name = route.action.options.contentCollection;
+  collection = arangodb.db._collection(name);
+
+  if (collection === null) {
+    arangodb.db._createDocumentCollection(name);
+    collection = arangodb.db._collection(name);
+  }
+
+  collection.ensureHashIndex("application", "prefix", "path");
+
+  collection.removeByExample({ application: this._name, prefix: prefix });
+
+  for (i = 0;  i < files.length;  ++i) {
+    var content;
+    var contentType;
+    var file = path + "/" + files[i];
+    var subpath = "/" + files[i];
+    var filename;
+
+    if (fs.isDirectory(file)) {
+      continue;
+    }
+
+    content = internal.read(file);
+
+    if (content === null) {
+      continue;
+    }
+
+    filename = re.exec(files[i]);
+
+    if (filename !== null) {
+      filename = filename[1];
+    }
+    else {
+      filename = files[i];
+    }
+
+    contentType = guessContentType(file, content);
+
+    collection.save({
+      application: this._name,
+      prefix: prefix,
+      path: subpath,
+      content: content,
+      contentType: contentType,
+      filename: filename
+    });
+
+    internal.print("imported '" + subpath + "' of type '" + contentType + "'");
+  }
+
+  return this;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief creates a new app
+////////////////////////////////////////////////////////////////////////////////
+
+exports.createApp = function (name) {
+  var routing = arangodb.db._collection("_routing");
+  var doc = routing.firstExample({ application: name });
+
+  if (doc !== null) {
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_DUPLICATE_IDENTIFIER;
+    error.errorMessage = "application name must be unique";
+
+    throw error;
+  }
+
+  doc = routing.save({ application: name,
+		       urlPrefix: "",
+		       routes: [],
+		       middleware: [] });
+
+  return new ArangoApp(routing, routing.document(doc));
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief loads an existing app
+////////////////////////////////////////////////////////////////////////////////
+
+exports.readApp = function (name) {
+  var routing = arangodb.db._collection("_routing");
+  var doc = routing.firstExample({ application: name });
+
+  if (doc === null) {
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_DOCUMENT_NOT_FOUND;
+    error.errorMessage = "application unknown";
+
+    throw error;
+  }
+
+  return new ArangoApp(routing, doc);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief loads a module directory into the database
+////////////////////////////////////////////////////////////////////////////////
+
+exports.uploadModules = function (prefix, path) {
+  var i;
+  var files;
+  var re = /^(.*)\.js$/;
+
+  prefix = normalizePath(prefix);
+  files = fs.listTree(path);
+
+  for (i = 0;  i < files.length;  ++i) {
+    var content;
+    var mpath;
+    var file = path + "/" + files[i];
+  
+    if (fs.isDirectory(file)) {
+      continue;
+    }
+
+    mpath = re.exec(files[i]);
+
+    if (mpath === null) {
+      internal.print("skipping file '" + files[i] + "' of unknown type, expecting .js");
+      continue;
+    }
+    
+    mpath = prefix + "/" + mpath[1];
+
+    internal.defineModule(mpath, file);
+
+    internal.print("imported '" + mpath + "'");
+  }
+
+  internal.flushServerModules();
+  internal.wait(1);
+  internal.reloadRouting();
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       END-OF-FILE
+// -----------------------------------------------------------------------------
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
+// End:
--- a/js/common/bootstrap/module-console.js
+++ b/js/common/bootstrap/module-console.js
@ -0,0 +1,180 @@
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
+/*global Module */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief module "console"
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2010-2013 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Dr. Frank Celler
+/// @author Copyright 2010-2013, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                  Module "console"
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup V8ModuleConsole
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief console module
+////////////////////////////////////////////////////////////////////////////////
+
+(function () {
+  var internal = Module.prototype.ModuleCache["/internal"].exports;
+  var console = Module.prototype.ModuleCache["/console"].exports;
+
+  console.getline = internal.getline;
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief logs debug message
+///
+/// @FUN{console.debug(@FA{format}, @FA{argument1}, ...)}
+///
+/// Formats the arguments according to @FA{format} and logs the result as
+/// debug message.
+///
+/// String substitution patterns, which can be used in @FA{format}.
+///
+/// - @LIT{\%s} string
+/// - @LIT{\%d}, @LIT{\%i} integer
+/// - @LIT{\%f} floating point number
+/// - @LIT{\%o} object hyperlink
+////////////////////////////////////////////////////////////////////////////////
+
+  console.debug = function () {
+    var msg;
+
+    try {
+      msg = internal.sprintf.apply(internal.sprintf, arguments);
+    }
+    catch (err) {
+      msg = err + ": " + arguments;
+    }
+
+    internal.log("debug", msg);
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief logs error message
+///
+/// @FUN{console.error(@FA{format}, @FA{argument1}, ...)}
+///
+/// Formats the arguments according to @FA{format} and logs the result as
+/// error message.
+////////////////////////////////////////////////////////////////////////////////
+
+  console.error = function () {
+    var msg;
+
+    try {
+      msg = internal.sprintf.apply(internal.sprintf, arguments);
+    }
+    catch (err) {
+      msg = err + ": " + arguments;
+    }
+
+    internal.log("error", msg);
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief logs info message
+///
+/// @FUN{console.info(@FA{format}, @FA{argument1}, ...)}
+///
+/// Formats the arguments according to @FA{format} and logs the result as
+/// info message.
+////////////////////////////////////////////////////////////////////////////////
+
+  console.info = function () {
+    var msg;
+
+    try {
+      msg = internal.sprintf.apply(internal.sprintf, arguments);
+    }
+    catch (err) {
+      msg = err + ": " + arguments;
+    }
+
+    internal.log("info", msg);
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief logs log message
+///
+/// @FUN{console.log(@FA{format}, @FA{argument1}, ...)}
+///
+/// Formats the arguments according to @FA{format} and logs the result as
+/// log message.
+////////////////////////////////////////////////////////////////////////////////
+
+  console.log = function () {
+    var msg;
+
+    try {
+      msg = internal.sprintf.apply(internal.sprintf, arguments);
+    }
+    catch (err) {
+      msg = err + ": " + arguments;
+    }
+
+    internal.log("info", msg);
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief logs warn message
+///
+/// @FUN{console.warn(@FA{format}, @FA{argument1}, ...)}
+///
+/// Formats the arguments according to @FA{format} and logs the result as
+/// warn message.
+////////////////////////////////////////////////////////////////////////////////
+
+  console.warn = function () {
+    var msg;
+
+    try {
+      msg = internal.sprintf.apply(internal.sprintf, arguments);
+    }
+    catch (err) {
+      msg = err + ": " + arguments;
+    }
+
+    internal.log("warning", msg);
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+}());
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       END-OF-FILE
+// -----------------------------------------------------------------------------
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
+// End:
--- a/js/common/bootstrap/module-fs.js
+++ b/js/common/bootstrap/module-fs.js
@ -0,0 +1,66 @@
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
+/*global Module */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief module "js"
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2010-2013 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Dr. Frank Celler
+/// @author Copyright 2010-2013, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       Module "fs"
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup V8ModuleFS
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief file-system module
+////////////////////////////////////////////////////////////////////////////////
+
+(function () {
+  var internal = Module.prototype.ModuleCache["/internal"].exports;
+  var fs = Module.prototype.ModuleCache["/fs"].exports;
+
+  fs.exists = internal.exists;
+  fs.isDirectory = internal.isDirectory;
+  fs.listTree = internal.listTree;
+  fs.move = internal.move;
+  fs.remove = internal.remove;
+}());
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       END-OF-FILE
+// -----------------------------------------------------------------------------
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
+// End:
--- a/js/common/bootstrap/module-internal.js
+++ b/js/common/bootstrap/module-internal.js
@ -0,0 +1,727 @@
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true, nonpropdel: true, proto: true */
+/*global require, module, Module, FS_MOVE, FS_REMOVE, FS_EXISTS, FS_IS_DIRECTORY, FS_LIST_TREE, 
+  SYS_EXECUTE, SYS_LOAD, SYS_LOG, SYS_LOG_LEVEL, SYS_OUTPUT, SYS_PROCESS_STAT, SYS_READ,
+  SYS_SPRINTF, SYS_TIME, SYS_START_PAGER, SYS_STOP_PAGER, SYS_SHA256, SYS_WAIT, SYS_GETLINE,
+  SYS_PARSE, ARANGO_QUIET, MODULES_PATH, COLOR_OUTPUT, COLOR_OUTPUT_RESET, COLOR_BRIGHT,
+  COLOR_BLACK, COLOR_BOLD_BLACK, COLOR_BLINK, COLOR_BLUE, COLOR_BOLD_BLUE, COLOR_BOLD_GREEN,
+  COLOR_RED, COLOR_BOLD_RED, COLOR_GREEN, COLOR_WHITE, COLOR_BOLD_WHITE, COLOR_YELLOW,
+  COLOR_BOLD_YELLOW, PRETTY_PRINT  */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief module "internal"
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2010-2013 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Dr. Frank Celler
+/// @author Copyright 2010-2013, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                 Module "internal"
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup V8ModuleInternal
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief internal module
+////////////////////////////////////////////////////////////////////////////////
+
+(function () {
+  var internal = Module.prototype.ModuleCache["/internal"].exports;
+
+  // system functions
+  if (typeof SYS_EXECUTE !== "undefined") {
+    internal.execute = SYS_EXECUTE;
+    delete SYS_EXECUTE;
+  }
+
+  if (typeof SYS_GETLINE !== "undefined") {
+    internal.getline = SYS_GETLINE;
+    delete SYS_GETLINE;
+  }
+
+  if (typeof SYS_LOAD !== "undefined") {
+    internal.load = SYS_LOAD;
+    delete SYS_LOAD;
+  }
+
+  if (typeof SYS_LOG !== "undefined") {
+    internal.log = SYS_LOG;
+    delete SYS_LOG;
+  }
+
+  if (typeof SYS_LOG_LEVEL !== "undefined") {
+    internal.logLevel = SYS_LOG_LEVEL;
+    delete SYS_LOG_LEVEL;
+  }
+
+  if (typeof SYS_OUTPUT !== "undefined") {
+    internal.output = SYS_OUTPUT;
+    delete SYS_OUTPUT;
+  }
+
+  if (typeof SYS_PARSE !== "undefined") {
+    internal.parse= SYS_PARSE;
+    delete SYS_PARSE;
+  }
+
+  if (typeof SYS_PROCESS_STAT !== "undefined") {
+    internal.processStat = SYS_PROCESS_STAT;
+    delete SYS_PROCESS_STAT;
+  }
+
+  if (typeof SYS_READ !== "undefined") {
+    internal.read = SYS_READ;
+    delete SYS_READ;
+  }
+
+  if (typeof SYS_SHA256 !== "undefined") {
+    internal.sha256 = SYS_SHA256;
+    delete SYS_SHA256;
+  }
+
+  if (typeof SYS_SPRINTF !== "undefined") {
+    internal.sprintf = SYS_SPRINTF;
+    delete SYS_SPRINTF;
+  }
+
+  if (typeof SYS_TIME !== "undefined") {
+    internal.time = SYS_TIME;
+    delete SYS_TIME;
+  }
+
+  if (typeof SYS_WAIT !== "undefined") {
+    internal.wait = SYS_WAIT;
+    delete SYS_WAIT;
+  }
+
+  if (typeof FS_EXISTS !== "undefined") {
+    internal.exists = FS_EXISTS;
+    delete FS_EXISTS;
+  }
+
+  if (typeof FS_IS_DIRECTORY !== "undefined") {
+    internal.isDirectory = FS_IS_DIRECTORY;
+    delete FS_IS_DIRECTORY;
+  }
+
+  if (typeof FS_LIST_TREE !== "undefined") {
+    internal.listTree = FS_LIST_TREE;
+    delete FS_LIST_TREE;
+  }
+
+  if (typeof FS_MOVE !== "undefined") {
+    internal.move = FS_MOVE;
+    delete FS_MOVE;
+  }
+
+  if (typeof FS_REMOVE !== "undefined") {
+    internal.remove = FS_REMOVE;
+    delete FS_REMOVE;
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                  public constants
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup V8ModuleInternal
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief modules path
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.MODULES_PATH = "";
+
+  if (typeof MODULES_PATH !== "undefined") {
+    internal.MODULES_PATH = MODULES_PATH;
+    delete MODULES_PATH;
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief quiet flag
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.ARANGO_QUIET = false;
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief pretty print flag
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.PRETTY_PRINT = false;
+
+  if (typeof PRETTY_PRINT !== "undefined") {
+    internal.PRETTY_PRINT = PRETTY_PRINT;
+    delete PRETTY_PRINT;
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief color constants
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.COLOR_OUTPUT = false;
+  internal.COLOR_OUTPUT_DEFAULT = "";
+  internal.COLOR_OUTPUT_RESET = "";
+  internal.COLOR_BRIGHT = "";
+
+  if (typeof COLOR_OUTPUT !== "undefined") {
+    internal.COLOR_OUTPUT = COLOR_OUTPUT;
+    delete COLOR_OUTPUT;
+  }
+
+  if (typeof COLOR_OUTPUT_RESET !== "undefined") {
+    internal.COLOR_OUTPUT_RESET = COLOR_OUTPUT_RESET;
+    delete COLOR_OUTPUT_RESET;
+  }
+
+  if (typeof COLOR_BRIGHT !== "undefined") {
+    internal.COLOR_BRIGHT = COLOR_BRIGHT;
+    delete COLOR_BRIGHT;
+  }
+
+  if (internal.COLOR_OUTPUT) {
+    internal.COLOR_OUTPUT_DEFAULT = internal.COLOR_BRIGHT;
+
+    internal.COLOR_BLACK = COLOR_BLACK;
+    delete COLOR_BLACK;
+
+    internal.COLOR_BOLD_BLACK = COLOR_BOLD_BLACK;
+    delete COLOR_BOLD_BLACK;
+
+    internal.COLOR_BLINK = COLOR_BLINK;
+    delete COLOR_BLINK;
+
+    internal.COLOR_BLUE = COLOR_BLUE;
+    delete COLOR_BLUE;
+
+    internal.COLOR_BOLD_BLUE = COLOR_BOLD_BLUE;
+    delete COLOR_BOLD_BLUE;
+
+    internal.COLOR_GREEN = COLOR_GREEN;
+    delete COLOR_GREEN;
+
+    internal.COLOR_BOLD_GREEN = COLOR_BOLD_GREEN;
+    delete COLOR_BOLD_GREEN;
+
+    internal.COLOR_RED = COLOR_RED;
+    delete COLOR_RED;
+
+    internal.COLOR_BOLD_RED = COLOR_BOLD_RED;
+    delete COLOR_BOLD_RED;
+
+    internal.COLOR_WHITE = COLOR_WHITE;
+    delete COLOR_WHITE;
+
+    internal.COLOR_BOLD_WHITE = COLOR_BOLD_WHITE;
+    delete COLOR_BOLD_WHITE;
+
+    internal.COLOR_YELLOW = COLOR_YELLOW;
+    delete COLOR_YELLOW;
+
+    internal.COLOR_BOLD_YELLOW = COLOR_BOLD_YELLOW;
+    delete COLOR_BOLD_YELLOW;
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                 private functions
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup V8ModuleInternal
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief prints objects to standard output
+///
+/// @FUN{internal.printShell(@FA{arg1}, @FA{arg2}, @FA{arg3}, ...)}
+///
+/// Only available in shell mode.
+///
+/// Prints the arguments. If an argument is an object having a
+/// function @FN{_PRINT}, then this function is called. Otherwise @FN{toJson} is
+/// used.  A final newline is printed
+///
+/// @verbinclude fluent40
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.printShell = function () {
+    var i;
+
+    for (i = 0;  i < arguments.length;  ++i) {
+      if (0 < i) {
+        internal.output(" ");
+      }
+
+      if (typeof(arguments[i]) === "string") {
+        internal.output(arguments[i]);
+      }
+      else {
+        internal.printRecursive(arguments[i], [], "~", [], 0);
+      }
+    }
+
+    if (internal.COLOR_OUTPUT) {
+      internal.output(internal.COLOR_OUTPUT_DEFAULT);
+      internal.output(internal.COLOR_OUTPUT_RESET);
+    }
+
+    internal.output("\n");
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief quote cache
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.characterQuoteCache = {
+    '\b': '\\b', // ASCII 8, Backspace
+    '\t': '\\t', // ASCII 9, Tab
+    '\n': '\\n', // ASCII 10, Newline
+    '\f': '\\f', // ASCII 12, Formfeed
+    '\r': '\\r', // ASCII 13, Carriage Return
+    '\"': '\\"',
+    '\\': '\\\\'
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief quotes a single character
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.quoteSingleJsonCharacter = function (c) {
+    if (internal.characterQuoteCache.hasOwnProperty[c]) {
+      return internal.characterQuoteCache[c];
+    }
+
+    var charCode = c.charCodeAt(0);
+    var result;
+
+    if (charCode < 16) {
+      result = '\\u000';
+    }
+    else if (charCode < 256) {
+      result = '\\u00';
+    }
+    else if (charCode < 4096) {
+      result = '\\u0';
+    }
+    else {
+      result = '\\u';
+    }
+
+    result += charCode.toString(16);
+    internal.characterQuoteCache[c] = result;
+
+    return result;
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief quotes a string character
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.quoteJsonString = function (str) {
+    var quotable = /[\\\"\x00-\x1f]/g;
+    return '"' + str.replace(quotable, internal.quoteSingleJsonCharacter) + '"';
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief prints objects to standard output without a new-line
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.printRecursive = function (value, seen, path, names, level) {
+    var p;
+
+    if (seen === undefined) {
+      seen = [];
+      names = [];
+    }
+
+    p = seen.indexOf(value);
+
+    if (0 <= p) {
+      internal.output(names[p]);
+    }
+    else {
+      if (value instanceof Object) {
+        seen.push(value);
+        names.push(path);
+      }
+
+      if (value instanceof Object) {
+        if (typeof value._PRINT === "function") {
+          value._PRINT(seen, path, names, level);
+        }
+        else if (value instanceof Array) {
+          internal.printArray(value, seen, path, names, level);
+        }
+        else if (value.__proto__ === Object.prototype) {
+          internal.printObject(value, seen, path, names, level);
+        }
+	else if (typeof value.toString === "function") {
+          internal.output(value.toString());
+        }
+        else {
+          internal.printObject(value, seen, path, names, level);
+        }
+      }
+      else if (value === undefined) {
+        internal.output("undefined");
+      }
+      else {
+        if (typeof(value) === "string") {
+          internal.output(internal.quoteJsonString(value));
+        }
+        else {
+          internal.output(String(value));
+        }
+      }
+    }
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief JSON representation of an array
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.printArray = function (object, seen, path, names, level) {
+    if (object.length === 0) {
+      internal.output("[ ]");
+    }
+    else {
+      var i;
+      var sep = "";
+
+      internal.output("[");
+
+      var newLevel = level + 1;
+
+      for (i = 0;  i < object.length;  i++) {
+        internal.output(sep);
+
+        internal.printIndent(newLevel);
+
+        internal.printRecursive(object[i],
+                                seen,
+                                path + "[" + i + "]",
+                                names,
+                                newLevel);
+        sep = ", ";
+      }
+
+      if (object.length > 1) {
+        internal.output(" ");
+      }
+
+      internal.printIndent(level);
+
+      internal.output("]");
+    }
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief prints an object
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.printObject = function (object, seen, path, names, level) {
+    var sep = " ";
+    var k;
+
+    internal.output("{");
+
+    var newLevel = level + 1;
+
+    for (k in object) {
+      if (object.hasOwnProperty(k)) {
+        var val = object[k];
+
+        internal.output(sep);
+
+        internal.printIndent(newLevel);
+
+        if (internal.COLOR_OUTPUT) {
+          internal.output(internal.COLOR_OUTPUT_DEFAULT);
+          internal.output(internal.quoteJsonString(k));
+          internal.output(internal.COLOR_OUTPUT_RESET);
+          internal.output(" : ");
+        }
+        else {
+          internal.output(internal.quoteJsonString(k), " : ");
+        }
+
+        internal.printRecursive(val,
+                                seen,
+                                path + "[" + k + "]",
+                                names,
+                                newLevel);
+        sep = ", ";
+      }
+    }
+
+    if (sep === ", ") {
+      internal.output(" ");
+    }
+
+    internal.printIndent(level);
+
+    internal.output("}");
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief prints the ident for pretty printing
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.printIndent = function (level) {
+    var j;
+
+    if (internal.PRETTY_PRINT) {
+      internal.output("\n");
+
+      for (j = 0; j < level; ++j) {
+        internal.output("  ");
+      }
+    }
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief flushes the module cache
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.flushModuleCache = function() {
+    module.unloadAll();
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                    public methods
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup V8ModuleInternal
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief global print
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.print = internal.printShell;
+
+  if (typeof internal.printBrowser === "function") {
+    internal.print = internal.printBrowser;
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief start pager
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.start_pager = function () {};
+
+  if (typeof SYS_START_PAGER !== "undefined") {
+    internal.start_pager = SYS_START_PAGER;
+    delete SYS_START_PAGER;
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief stop pager
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.stop_pager = function () {};
+
+  if (typeof SYS_STOP_PAGER !== "undefined") {
+    internal.stop_pager = SYS_STOP_PAGER;
+    delete SYS_STOP_PAGER;
+  }
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief encode password using SHA256
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.encodePassword = function (password) {
+    var salt;
+    var encoded;
+
+    salt = internal.sha256("time:" + internal.time());
+    salt = salt.substr(0,8);
+
+    encoded = "$1$" + salt + "$" + internal.sha256(salt + password);
+    
+    return encoded;
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief extends a prototype
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.extend = function (target, source) {
+    Object.getOwnPropertyNames(source)
+      .forEach(function(propName) {
+        Object.defineProperty(target, propName,
+			      Object.getOwnPropertyDescriptor(source, propName));
+      });
+
+    return target;
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief reads a file from the module path or the database
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.loadDatabaseFile = function (path) {
+    var i;
+    var mc;
+    var n;
+
+    // try to load the file
+    var paths = internal.MODULES_PATH;
+
+    for (i = 0;  i < paths.length;  ++i) {
+      var p = paths[i];
+
+      if (p === "") {
+        n = "." + path + ".js";
+      }
+      else {
+        n = p + "/" + path + ".js";
+      }
+
+      if (internal.exists(n)) {
+        Module.prototype.ModuleExistsCache[path] = true;
+        return { path : n, content : internal.read(n) };
+      }
+    }
+
+    // try to load the module from the database
+    if (internal.db !== undefined) {
+      mc = internal.db._collection("_modules");
+
+      if (mc !== null && typeof mc.firstExample === "function") {
+	n = mc.firstExample({ path: path });
+
+	if (n !== null) {
+          if (n.hasOwnProperty('content')) {
+            Module.prototype.ModuleExistsCache[path] = true;
+            return { path : "_collection/" + path, content : n.content };
+          }
+
+	  if (Module.prototype.ModuleExistsCache.hasOwnProperty("/console")) {
+	    var console = Module.prototype.ModuleExistsCache["/console"];
+	    console.error("found empty content in '%s'", JSON.stringify(n));
+	  }
+	}
+      }
+    }
+
+    Module.prototype.ModuleExistsCache[path] = false;
+
+    throw "cannot find a file named '"
+        + path
+        + "' using the module path(s) '" 
+        + internal.MODULES_PATH + "'";
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief loads a file from the file-system
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.loadFile = function (path) {
+    var i;
+
+    // try to load the file
+    var paths = internal.MODULES_PATH;
+
+    for (i = 0;  i < paths.length;  ++i) {
+      var p = paths[i];
+      var n;
+
+      if (p === "") {
+        n = "." + path + ".js";
+      }
+      else {
+        n = p + "/" + path + ".js";
+      }
+
+      if (internal.exists(n)) {
+        return internal.load(n);
+      }
+    }
+
+    throw "cannot find a file named '"
+        + path 
+        + "' using the module path(s) '" 
+        + internal.MODULES_PATH + "'";
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief defines a module
+////////////////////////////////////////////////////////////////////////////////
+
+  internal.defineModule = function (path, file) {
+    var content;
+    var m;
+    var mc;
+
+    content = internal.read(file);
+
+    mc = internal.db._collection("_modules");
+
+    if (mc === null) {
+      mc = internal.db._create("_modules", { isSystem: true });
+    }
+
+    path = module.normalise(path);
+    m = mc.firstExample({ path: path });
+
+    if (m === null) {
+      mc.save({ path: path, content: content });
+    }
+    else {
+      mc.replace(m, { path: path, content: content });
+    }
+  };
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+}());
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       END-OF-FILE
+// -----------------------------------------------------------------------------
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
+// End:
--- a/js/common/bootstrap/modules.js
+++ b/js/common/bootstrap/modules.js
@ -1,17 +1,5 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
-/*global 
- require, module, 
- SYS_EXECUTE, CONSOLE_ERROR, FS_MOVE, FS_REMOVE, FS_EXISTS, SYS_LOAD, SYS_LOG,
- SYS_LOG_LEVEL, SYS_OUTPUT, SYS_PROCESS_STAT, SYS_READ, SYS_SPRINTF, SYS_TIME,
- SYS_START_PAGER, SYS_STOP_PAGER, ARANGO_QUIET, MODULES_PATH, COLOR_OUTPUT,
- COLOR_OUTPUT_RESET, COLOR_BRIGHT, PRETTY_PRINT, SYS_SHA256, SYS_WAIT, SYS_GETLINE 
-*/
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
+/*global require, module: true */

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief JavaScript server functions
@ -63,6 +51,9 @@ function Module (id) {
 ////////////////////////////////////////////////////////////////////////////////

 Module.prototype.ModuleCache = {};
+Module.prototype.ModuleCache["/internal"] = new Module("/internal");
+Module.prototype.ModuleCache["/fs"] = new Module("/fs");
+Module.prototype.ModuleCache["/console"] = new Module("/console");

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief file exists cache
@ -75,6 +66,7 @@ Module.prototype.ModuleExistsCache = {};
 ////////////////////////////////////////////////////////////////////////////////

 Module.prototype.require = function (path) {
+  var internal;
  var content;
  var f;
  var module;
@ -82,6 +74,8 @@ Module.prototype.require = function (path) {
  var raw;
  var sandbox;

+  internal = this.ModuleCache["/internal"].exports;
+
  // first get rid of any ".." and "."
  path = this.normalise(path);

@ -91,10 +85,10 @@ Module.prototype.require = function (path) {
  }

  // locate file and read content
-  raw = this.ModuleCache["/internal"].exports.readFile(path);
+  raw = internal.loadDatabaseFile(path);

  // test for parse errors first and fail early if a parse error detected
-  if (! SYS_PARSE(raw.content, path)) {
+  if (! internal.parse(raw.content, path)) {
    throw "Javascript parse error in file '" + path + "'";
  }

@ -105,7 +99,7 @@ Module.prototype.require = function (path) {
          + raw.content 
          + "\n});";
  
-  f = SYS_EXECUTE(content, undefined, path);
+  f = internal.execute(content, undefined, path);

  if (f === undefined) {
    throw "cannot create context function";
@ -118,6 +112,7 @@ Module.prototype.require = function (path) {
      this.ModuleCache["/internal"].exports.print);
  }
  catch (err) {
+    delete this.ModuleCache[path];
    throw "Javascript exception in file '" + path + "': " + err.stack;
  }

@ -129,8 +124,8 @@ Module.prototype.require = function (path) {
 ////////////////////////////////////////////////////////////////////////////////

 Module.prototype.exists = function (path) {
-  return this.ModuleExistsCache[path];
-}
+  return Module.prototype.ModuleExistsCache[path];
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief normalises a path
@ -194,12 +189,16 @@ Module.prototype.unload = function (path) {
  var norm = module.normalise(path);

  if (   norm === "/"
-      || norm === "/internal"
      || norm === "/console"
-      || norm === "/fs") {
+      || norm === "/internal"
+      || norm === "/fs"
+      || norm === "/org/arangodb"
+      || norm === "/org/arangodb/actions") {
    return;
  }

+   Module.prototype.ModuleCache["/console"].exports.info("UNLOADING %s", path);
+ 
  delete this.ModuleCache[norm];
 };

@ -251,428 +250,19 @@ function require (path) {
 }

 ////////////////////////////////////////////////////////////////////////////////
-/// @}
+/// @brief global print function
 ////////////////////////////////////////////////////////////////////////////////

-// -----------------------------------------------------------------------------
-// --SECTION--                                                       Module "fs"
-// -----------------------------------------------------------------------------
+function print () {
+  var internal = require("internal");

-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup V8ModuleFS
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief file-system module
-////////////////////////////////////////////////////////////////////////////////
-
-Module.prototype.ModuleCache["/fs"] = new Module("/fs");
-
-(function () {
-  var fs = Module.prototype.ModuleCache["/fs"].exports;
-
-  fs.exists = FS_EXISTS;
-  fs.move = FS_MOVE;
-  fs.remove = FS_REMOVE;
-}());
+  internal.print.apply(internal.print, arguments);
+}

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////

-// -----------------------------------------------------------------------------
-// --SECTION--                                                 Module "internal"
-// -----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup V8ModuleInternal
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief internal module
-////////////////////////////////////////////////////////////////////////////////
-
-Module.prototype.ModuleCache["/internal"] = new Module("/internal");
-
-(function () {
-  var internal = Module.prototype.ModuleCache["/internal"].exports;
-  var fs = Module.prototype.ModuleCache["/fs"].exports;
-
-  // system functions
-  internal.execute = SYS_EXECUTE;
-  internal.load = SYS_LOAD;
-  internal.log = SYS_LOG;
-  internal.logLevel = SYS_LOG_LEVEL;
-  internal.output = SYS_OUTPUT;
-  internal.processStat = SYS_PROCESS_STAT;
-  internal.read = SYS_READ;
-  internal.sprintf = SYS_SPRINTF;
-  internal.time = SYS_TIME;
-  internal.sha256 = SYS_SHA256;
-  internal.wait = SYS_WAIT;
-
-  // password interface
-  internal.encodePassword = function (password) {
-    var salt;
-    var encoded;
-
-    salt = internal.sha256("time:" + SYS_TIME());
-    salt = salt.substr(0,8);
-
-    encoded = "$1$" + salt + "$" + internal.sha256(salt + password);
-    
-    return encoded;
-  }
-
-
-
-  // command line parameter
-  internal.MODULES_PATH = "";
-
-  if (typeof MODULES_PATH !== "undefined") {
-    internal.MODULES_PATH = MODULES_PATH;
-  }
-
-
-  // output 
-  internal.start_pager = function () {};
-  internal.stop_pager = function () {};
-
-  internal.ARANGO_QUIET = false;
-
-  internal.COLOR_OUTPUT = false;
-  internal.COLOR_OUTPUT_DEFAULT = "";
-  internal.COLOR_OUTPUT_RESET = "";
-  internal.COLOR_BRIGHT = "";
-
-  internal.PRETTY_PRINT = false;
-
-  if (typeof SYS_START_PAGER !== "undefined") {
-    internal.start_pager = SYS_START_PAGER;
-  }
-
-  if (typeof SYS_STOP_PAGER !== "undefined") {
-    internal.stop_pager = SYS_STOP_PAGER;
-  }
-
-  if (typeof COLOR_OUTPUT !== "undefined") {
-    internal.COLOR_OUTPUT = COLOR_OUTPUT;
-  }
-
-  if (typeof COLOR_OUTPUT_RESET !== "undefined") {
-    internal.COLOR_OUTPUT_RESET = COLOR_OUTPUT_RESET;
-  }
-
-  if (typeof COLOR_BRIGHT !== "undefined") {
-    internal.COLOR_BRIGHT = COLOR_BRIGHT;
-  }
-
-  if (typeof PRETTY_PRINT !== "undefined") {
-    internal.PRETTY_PRINT = PRETTY_PRINT;
-  }
-
-  if (internal.COLOR_OUTPUT) {
-    internal.COLOR_OUTPUT_DEFAULT = internal.COLOR_BRIGHT;
-
-    internal.COLOR_BLACK = COLOR_BLACK;
-    internal.COLOR_BOLD_BLACK = COLOR_BOLD_BLACK;
-    internal.COLOR_BLINK = COLOR_BLINK;
-    internal.COLOR_BLUE = COLOR_BLUE;
-    internal.COLOR_BOLD_BLUE = COLOR_BOLD_BLUE;
-    internal.COLOR_BRIGHT = COLOR_BRIGHT;
-    internal.COLOR_GREEN = COLOR_GREEN;
-    internal.COLOR_BOLD_GREEN = COLOR_BOLD_GREEN;
-    internal.COLOR_RED = COLOR_RED;
-    internal.COLOR_BOLD_RED = COLOR_BOLD_RED;
-    internal.COLOR_WHITE = COLOR_WHITE;
-    internal.COLOR_BOLD_WHITE = COLOR_BOLD_WHITE;
-    internal.COLOR_YELLOW = COLOR_YELLOW;
-    internal.COLOR_BOLD_YELLOW = COLOR_BOLD_YELLOW;
-    internal.COLOR_OUTPUT_RESET = COLOR_OUTPUT_RESET;
-  }
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief extends a prototype
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.extend = function (target, source) {
-    Object.getOwnPropertyNames(source)
-      .forEach(function(propName) {
-        Object.defineProperty(target, propName,
-			      Object.getOwnPropertyDescriptor(source, propName));
-      });
-
-    return target;
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief reads a file from the module path or the database
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.readFile = function (path) {
-    var i;
-    var mc;
-    var n;
-
-    // try to load the file
-    var paths = internal.MODULES_PATH;
-
-    for (i = 0;  i < paths.length;  ++i) {
-      var p = paths[i];
-
-      if (p === "") {
-        n = "." + path + ".js";
-      }
-      else {
-        n = p + "/" + path + ".js";
-      }
-
-      if (fs.exists(n)) {
-        Module.prototype.ModuleExistsCache[path] = true;
-        return { path : n, content : internal.read(n) };
-      }
-    }
-
-    // try to load the module from the database
-    if (internal.db !== undefined) {
-      mc = internal.db._collection("_modules");
-
-      if (mc !== null && ("firstExample" in mc)) {
-	n = mc.firstExample({ path: path });
-
-	if (n !== null) {
-          if (n.hasOwnProperty('content')) {
-            Module.prototype.ModuleExistsCache[path] = true;
-            return { path : "_collection/" + path, content : n.content };
-          }
-          else {
-	    require("console").error("found empty content in '%s'", JSON.stringify(n));
-          }
-	}
-      }
-    }
-
-    Module.prototype.ModuleExistsCache[path] = false;
-
-    throw "cannot find a file named '"
-        + path
-        + "' using the module path(s) '" 
-        + internal.MODULES_PATH + "'";
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief loads a file from the file-system
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.loadFile = function (path) {
-    var i;
-
-    // try to load the file
-    var paths = internal.MODULES_PATH;
-
-    for (i = 0;  i < paths.length;  ++i) {
-      var p = paths[i];
-      var n;
-
-      if (p === "") {
-        n = "." + path + ".js";
-      }
-      else {
-        n = p + "/" + path + ".js";
-      }
-
-      if (fs.exists(n)) {
-        return internal.load(n);
-      }
-    }
-
-    throw "cannot find a file named '"
-        + path 
-        + "' using the module path(s) '" 
-        + internal.MODULES_PATH + "'";
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief defines a module
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.defineModule = function (path, file) {
-    var content;
-    var m;
-    var mc;
-
-    content = internal.read(file);
-
-    mc = internal.db._collection("_modules");
-
-    if (mc === null) {
-      mc = internal.db._create("_modules", { isSystem: true });
-    }
-
-    path = module.normalise(path);
-    m = mc.firstExample({ path: path });
-
-    if (m === null) {
-      mc.save({ path: path, module: content });
-    }
-    else {
-      m.module = content;
-      mc.replace(m, m);
-    }
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
-}());
-
-// -----------------------------------------------------------------------------
-// --SECTION--                                                  Module "console"
-// -----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup V8ModuleConsole
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief console module
-////////////////////////////////////////////////////////////////////////////////
-
-Module.prototype.ModuleCache["/console"] = new Module("/console");
-
-(function () {
-  var internal = Module.prototype.ModuleCache["/internal"].exports;
-  var console = Module.prototype.ModuleCache["/console"].exports;
-
-  console.getline = SYS_GETLINE;
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief logs debug message
-///
-/// @FUN{console.debug(@FA{format}, @FA{argument1}, ...)}
-///
-/// Formats the arguments according to @FA{format} and logs the result as
-/// debug message.
-///
-/// String substitution patterns, which can be used in @FA{format}.
-///
-/// - @LIT{\%s} string
-/// - @LIT{\%d}, @LIT{\%i} integer
-/// - @LIT{\%f} floating point number
-/// - @LIT{\%o} object hyperlink
-////////////////////////////////////////////////////////////////////////////////
-
-  console.debug = function () {
-    var msg;
-
-    try {
-      msg = internal.sprintf.apply(internal.sprintf, arguments);
-    }
-    catch (err) {
-      msg = err + ": " + arguments;
-    }
-
-    internal.log("debug", msg);
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief logs error message
-///
-/// @FUN{console.error(@FA{format}, @FA{argument1}, ...)}
-///
-/// Formats the arguments according to @FA{format} and logs the result as
-/// error message.
-////////////////////////////////////////////////////////////////////////////////
-
-  console.error = function () {
-    var msg;
-
-    try {
-      msg = internal.sprintf.apply(internal.sprintf, arguments);
-    }
-    catch (err) {
-      msg = err + ": " + arguments;
-    }
-
-    internal.log("error", msg);
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief logs info message
-///
-/// @FUN{console.info(@FA{format}, @FA{argument1}, ...)}
-///
-/// Formats the arguments according to @FA{format} and logs the result as
-/// info message.
-////////////////////////////////////////////////////////////////////////////////
-
-  console.info = function () {
-    var msg;
-
-    try {
-      msg = internal.sprintf.apply(internal.sprintf, arguments);
-    }
-    catch (err) {
-      msg = err + ": " + arguments;
-    }
-
-    internal.log("info", msg);
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief logs log message
-///
-/// @FUN{console.log(@FA{format}, @FA{argument1}, ...)}
-///
-/// Formats the arguments according to @FA{format} and logs the result as
-/// log message.
-////////////////////////////////////////////////////////////////////////////////
-
-  console.log = function () {
-    var msg;
-
-    try {
-      msg = internal.sprintf.apply(internal.sprintf, arguments);
-    }
-    catch (err) {
-      msg = err + ": " + arguments;
-    }
-
-    internal.log("info", msg);
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief logs warn message
-///
-/// @FUN{console.warn(@FA{format}, @FA{argument1}, ...)}
-///
-/// Formats the arguments according to @FA{format} and logs the result as
-/// warn message.
-////////////////////////////////////////////////////////////////////////////////
-
-  console.warn = function () {
-    var msg;
-
-    try {
-      msg = internal.sprintf.apply(internal.sprintf, arguments);
-    }
-    catch (err) {
-      msg = err + ": " + arguments;
-    }
-
-    internal.log("warn", msg);
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
-}());
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE
 // -----------------------------------------------------------------------------
--- a/js/common/bootstrap/monkeypatches.js
+++ b/js/common/bootstrap/monkeypatches.js
@ -1,8 +1,4 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         plusplus: true */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, plusplus: true */

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief Monkeypatches to built-in prototypes
@ -27,10 +23,20 @@
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///
-/// @author Dr. Frank Celler, Lucas Dohmen
+/// @author Dr. Frank Celler
+/// @author Lucas Dohmen
 /// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

+// -----------------------------------------------------------------------------
+// --SECTION--                                                    monkey-patches
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup V8Shell
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief remove last occurrence of element from an array
 ////////////////////////////////////////////////////////////////////////////////
@ -90,4 +96,17 @@ Object.defineProperty(Object.prototype, "propertyKeys", {
      return (element[0] !== '_' && element[0] !== '$');
    });
  }
-});
+});
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       END-OF-FILE
+// -----------------------------------------------------------------------------
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
+// End:
--- a/js/common/bootstrap/print.js
+++ b/js/common/bootstrap/print.js
@ -1,338 +0,0 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
-/*global require, print */
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief printing
-///
-/// @file
-///
-/// DISCLAIMER
-///
-/// Copyright 2010-2012 triagens GmbH, Cologne, Germany
-///
-/// Licensed under the Apache License, Version 2.0 (the "License");
-/// you may not use this file except in compliance with the License.
-/// You may obtain a copy of the License at
-///
-///     http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing, software
-/// distributed under the License is distributed on an "AS IS" BASIS,
-/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// See the License for the specific language governing permissions and
-/// limitations under the License.
-///
-/// Copyright holder is triAGENS GmbH, Cologne, Germany
-///
-/// @author Dr. Frank Celler
-/// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany
-////////////////////////////////////////////////////////////////////////////////
-
-(function () {
-  var internal = require("internal");
-
-// -----------------------------------------------------------------------------
-// --SECTION--                                                 Module "internal"
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// --SECTION--                                                 private functions
-// -----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup V8Shell
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief prints objects to standard output
-///
-/// @FUN{internal.printShell(@FA{arg1}, @FA{arg2}, @FA{arg3}, ...)}
-///
-/// Only available in shell mode.
-///
-/// Prints the arguments. If an argument is an object having a
-/// function @FN{_PRINT}, then this function is called. Otherwise @FN{toJson} is
-/// used.  A final newline is printed
-///
-/// @verbinclude fluent40
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.printShell = function () {
-    var i;
-
-    for (i = 0;  i < arguments.length;  ++i) {
-      if (0 < i) {
-        internal.output(" ");
-      }
-
-      if (typeof(arguments[i]) === "string") {
-        internal.output(arguments[i]);
-      }
-      else {
-        internal.printRecursive(arguments[i], [], "~", [], 0);
-      }
-    }
-
-    if (internal.COLOR_OUTPUT) {
-      internal.output(internal.COLOR_OUTPUT_DEFAULT);
-      internal.output(internal.COLOR_OUTPUT_RESET);
-    }
-
-    internal.output("\n");
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief quote cache
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.characterQuoteCache = {
-    '\b': '\\b', // ASCII 8, Backspace
-    '\t': '\\t', // ASCII 9, Tab
-    '\n': '\\n', // ASCII 10, Newline
-    '\f': '\\f', // ASCII 12, Formfeed
-    '\r': '\\r', // ASCII 13, Carriage Return
-    '\"': '\\"',
-    '\\': '\\\\'
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief quotes a single character
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.quoteSingleJsonCharacter = function (c) {
-    if (internal.characterQuoteCache.hasOwnProperty[c]) {
-      return internal.characterQuoteCache[c];
-    }
-
-    var charCode = c.charCodeAt(0);
-    var result;
-
-    if (charCode < 16) {
-      result = '\\u000';
-    }
-    else if (charCode < 256) {
-      result = '\\u00';
-    }
-    else if (charCode < 4096) {
-      result = '\\u0';
-    }
-    else {
-      result = '\\u';
-    }
-
-    result += charCode.toString(16);
-    internal.characterQuoteCache[c] = result;
-
-    return result;
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief quotes a string character
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.quoteJsonString = function (str) {
-    var quotable = /[\\\"\x00-\x1f]/g;
-    return '"' + str.replace(quotable, internal.quoteSingleJsonCharacter) + '"';
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief prints objects to standard output without a new-line
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.printRecursive = function (value, seen, path, names, level) {
-    var p;
-
-    if (seen === undefined) {
-      seen = [];
-      names = [];
-    }
-
-    p = seen.indexOf(value);
-
-    if (0 <= p) {
-      internal.output(names[p]);
-    }
-    else {
-      if (value instanceof Object) {
-        seen.push(value);
-        names.push(path);
-      }
-
-      if (value instanceof Object) {
-        if ('_PRINT' in value) {
-          value._PRINT(seen, path, names, level);
-        }
-        else if (value instanceof Array) {
-          internal.printArray(value, seen, path, names, level);
-        }
-        else if (value.__proto__ === Object.prototype) {
-          internal.printObject(value, seen, path, names, level);
-        }
-        else if ('toString' in value) {
-          internal.output(value.toString());
-        }
-        else {
-          internal.printObject(value, seen, path, names, level);
-        }
-      }
-      else if (value === undefined) {
-        internal.output("undefined");
-      }
-      else {
-        if (typeof(value) === "string") {
-          internal.output(internal.quoteJsonString(value));
-        }
-        else {
-          internal.output(String(value));
-        }
-      }
-    }
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief prints the ident for pretty printing
-///
-/// @FUN{internal.printIndent(@FA{level})}
-///
-/// Only available in shell mode.
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.printIndent = function (level) {
-    var j;
-
-    if (internal.PRETTY_PRINT) {
-      internal.output("\n");
-
-      for (j = 0; j < level; ++j) {
-        internal.output("  ");
-      }
-    }
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief JSON representation of an array
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.printArray = function (object, seen, path, names, level) {
-    if (object.length === 0) {
-      internal.output("[ ]");
-    }
-    else {
-      var i;
-      var sep = "";
-
-      internal.output("[");
-
-      var newLevel = level + 1;
-
-      for (i = 0;  i < object.length;  i++) {
-        internal.output(sep);
-
-        internal.printIndent(newLevel);
-
-        internal.printRecursive(object[i],
-                                seen,
-                                path + "[" + i + "]",
-                                names,
-                                newLevel);
-        sep = ", ";
-      }
-
-      if (object.length > 1) {
-        internal.output(" ");
-      }
-      internal.printIndent(level);
-
-      internal.output("]");
-    }
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief prints an object
-////////////////////////////////////////////////////////////////////////////////
-
-  internal.printObject = function (object, seen, path, names, level) {
-    var sep = " ";
-    var k;
-
-    internal.output("{");
-
-    var newLevel = level + 1;
-
-    for (k in object) {
-      if (object.hasOwnProperty(k)) {
-        var val = object[k];
-
-        internal.output(sep);
-
-        internal.printIndent(newLevel);
-
-        if (internal.COLOR_OUTPUT) {
-          internal.output(internal.COLOR_OUTPUT_DEFAULT);
-          internal.output(internal.quoteJsonString(k));
-          internal.output(internal.COLOR_OUTPUT_RESET);
-          internal.output(" : ");
-        }
-        else {
-          internal.output(internal.quoteJsonString(k), " : ");
-        }
-
-        internal.printRecursive(val,
-                                seen,
-                                path + "[" + k + "]",
-                                names,
-                                newLevel);
-        sep = ", ";
-      }
-    }
-
-    if (sep == ", ") {
-      internal.output(" ");
-    }
-    internal.printIndent(level);
-
-    internal.output("}");
-  };
-
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
-}());
-
-// -----------------------------------------------------------------------------
-// --SECTION--                                                  global functions
-// -----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup V8Shell
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief global print
-////////////////////////////////////////////////////////////////////////////////
-
-// must be a variable definition for the browser
-if (typeof require("internal").printBrowser === "function") {
-  print = require("internal").print = require("internal").printBrowser;
-}
-else {
-  print = require("internal").print = require("internal").printShell;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
-// Local Variables:
-// mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @}\\)"
-// End:
--- a/js/common/modules/jslint.js
+++ b/js/common/modules/jslint.js
@ -47,7 +47,7 @@ function RunTest (path, options) {
  var content;

  try {
-    content = SYS_READ(path);
+    content = internal.read(path);
  }
  catch (err) {
    console.error("cannot load test file '%s'", path);
--- a/js/common/modules/jslint/jslint.js
+++ b/js/common/modules/jslint/jslint.js
@ -182,10 +182,12 @@
 //     newcap     true, if constructor names capitalization is ignored
 //     node       true, if Node.js globals should be predefined
 //     nomen      true, if names may have dangling _
+///    nonpropdel true, if delete should be allowed for non-properties
 //     on         true, if HTML event handlers should be allowed
 //     passfail   true, if the scan should stop on first error
 //     plusplus   true, if increment/decrement should be allowed
 //     properties true, if all property names must be declared with /*properties*/
+//     proto      true, if __proto__ is allowed
 //     regexp     true, if the . should be allowed in regexp literals
 //     rhino      true, if the Rhino environment globals should be predefined
 //     undef      true, if variables can be declared out of order
@ -274,7 +276,7 @@
    'min-height', 'min-width', missing_a, missing_a_after_b, missing_option,
    missing_property, missing_space_a_b, missing_url, missing_use_strict, mixed,
    mm, mode, move_invocation, move_var, n, name, name_function, nav,
-    nested_comment, newcap, node, noframes, nomen, noscript, not,
+    nested_comment, newcap, node, noframes, nomen, nonpropdel, noscript, not,
    not_a_constructor, not_a_defined, not_a_function, not_a_label, not_a_scope,
    not_greater, nud, number, object, octal_a, ol, on, opacity, open, optgroup,
    option, outer, outline, 'outline-color', 'outline-style', 'outline-width',
@ -283,7 +285,7 @@
    'page-break-before', param, parameter_a_get_b, parameter_arguments_a,
    parameter_set_a, params, paren, parent, passfail, pc, plusplus, pop,
    position, postscript, pre, predef, print, progress, projection, properties,
-    properties_report, property, prototype, pt, push, px, q, quote, quotes, r,
+    properties_report, property, proto, prototype, pt, push, px, q, quote, quotes, r,
    radix, range, raw, read_only, reason, redefinition_a, regexp, replace,
    report, reserved, reserved_a, rhino, right, rp, rt, ruby, safe, samp,
    scanned_a_b, screen, script, search, second, section, select, shift,
@ -356,10 +358,12 @@ var JSLINT = (function () {
            newcap    : true,
            node      : true,
            nomen     : true,
+	    nonpropdel: true,
            on        : true,
            passfail  : true,
            plusplus  : true,
            properties: true,
+   	    proto     : true,
            regexp    : true,
            rhino     : true,
            undef     : true,
@ -1218,8 +1222,12 @@ var JSLINT = (function () {
            )] || syntax['(error)']);
            if (type === '(identifier)') {
                the_token.identifier = true;
-                if (value === '__iterator__' || value === '__proto__') {
+                if (value === '__iterator__') {
                    stop_at('reserved_a', line, from, value);
+                } else if (value === '__proto__') {
+                    if (!option.proto) {
+                      stop_at('reserved_a', line, from, value);
+		    }
                } else if (!option.nomen &&
                        (value.charAt(0) === '_' ||
                        value.charAt(value.length - 1) === '_')) {
@ -3419,8 +3427,10 @@ klass:              do {
    prefix('delete', function () {
        one_space();
        var p = expression(0);
-        if (!p || (p.id !== '.' && p.id !== '[')) {
-            warn('deleted');
+        if (!option.nonpropdel) {
+            if (!p || (p.id !== '.' && p.id !== '[')) {
+                warn('deleted');
+	    }
        }
        this.first = p;
        return this;
--- a/js/common/modules/jsunity.js
+++ b/js/common/modules/jsunity.js
@ -348,10 +348,10 @@ function RunTest (path) {
  var content;
  var f;

-  content = SYS_READ(path);
+  content = internal.read(path);

  content = "(function(jsUnity){jsUnity.attachAssertions();" + content + "})";
-  f = SYS_EXECUTE(content, undefined, path);
+  f = internal.execute(content, undefined, path);
  
  if (f == undefined) {
    throw "cannot create context function";
--- a/js/server/ArangoCollection.js
+++ b/js/server/ArangoCollection.js
@ -38,7 +38,6 @@
  var internal = require("internal");
  var console = require("console");

-  var ArangoDatabase = internal.ArangoDatabase;
  var ArangoCollection = internal.ArangoCollection;
  var ArangoError = internal.ArangoError;

@ -121,7 +120,7 @@
 /// in a production environment.
 ////////////////////////////////////////////////////////////////////////////////

-  ArangoCollection.prototype.toArray = function() {
+  ArangoCollection.prototype.toArray = function () {
    return this.ALL(null, null).documents;
  };

@ -137,10 +136,20 @@
 ///
 /// Truncates a collection:
 ///
-/// @verbinclude shell_collection-truncate
+/// @code
+/// arango> col = db.examples;
+/// [ArangoCollection 91022, "examples" (status new born)]
+/// arango> col.save({ "Hallo" : "World" });
+/// { "_id" : "91022/1532814", "_rev" : 1532814 }
+/// arango> col.count();
+/// 1
+/// arango> col.truncate();
+/// arango> col.count();
+/// 0
+/// @endcode
 ////////////////////////////////////////////////////////////////////////////////

-  ArangoCollection.prototype.truncate = function() {
+  ArangoCollection.prototype.truncate = function () {
    return internal.db._truncate(this);
  };

@ -153,10 +162,15 @@
 ///
 /// @EXAMPLES
 ///
-/// @verbinclude shell_index-read
+/// @code
+/// arango> db.example.getIndexes().map(function(x) { return x.id; });
+/// ["93013/0"]
+/// arango> db.example.index("93013/0");
+/// { "id" : "93013/0", "type" : "primary", "fields" : ["_id"] }
+/// @endcode
 ////////////////////////////////////////////////////////////////////////////////

-  ArangoCollection.prototype.index = function(id) {
+  ArangoCollection.prototype.index = function (id) {
    var indexes = this.getIndexes();
    var i;

@ -182,14 +196,141 @@
    return null;
  };

+////////////////////////////////////////////////////////////////////////////////
+/// @brief iterators over some elements of a collection
+///
+/// @FUN{@FA{collection}.iterate(@FA{iterator}, @FA{options})}
+///
+/// Iterates over some elements of the collection and apply the function
+/// @FA{iterator} to the elements. The function will be called with the
+/// document as first argument and the current number (starting with 0)
+/// as second argument.
+///
+/// @FA{options} must be an object with the following attributes:
+///
+/// - @LIT{limit} (optional, default none): use at most @LIT{limit} documents.
+///
+/// - @LIT{probability} (optional, default all): a number between @LIT{0} and
+///   @LIT{1}. Documents are chosen with this probability.
+///
+/// @EXAMPLES
+///
+/// @code
+/// arango> db.example.getIndexes().map(function(x) { return x.id; });
+/// ["93013/0"]
+/// arango> db.example.index("93013/0");
+/// { "id" : "93013/0", "type" : "primary", "fields" : ["_id"] }
+/// @endcode
+////////////////////////////////////////////////////////////////////////////////
+
+  ArangoCollection.prototype.iterate = function (iterator, options) {
+    var probability = 1.0;
+    var limit = null;
+    var stmt;
+    var cursor;
+    var pos;
+
+    if (options !== undefined) {
+      if (options.hasOwnProperty("probability")) {
+	probability = options.probability;
+      }
+
+      if (options.hasOwnProperty("limit")) {
+	limit = options.limit;
+      }
+    }
+
+    if (limit === null) {
+      if (probability >= 1.0) {
+	stmt = internal.sprintf("FOR d IN %s RETURN d", this.name());
+      }
+      else {
+	stmt = internal.sprintf("FOR d IN %s FILTER rand() >= @prob RETURN d", this.name());
+      }
+    }
+    else {
+      if (typeof limit !== "number") {
+	var error = new ArangoError();
+	error.errorNum = internal.errors.ERROR_ILLEGAL_NUMBER.code;
+	error.errorMessage = "expecting a number, got " + String(limit);
+
+	throw error;
+      }
+
+      if (probability >= 1.0) {
+	stmt = internal.sprintf("FOR d IN %s LIMIT %d RETURN d", this.name(), limit);
+      }
+      else {
+	stmt = internal.sprintf("FOR d IN %s FILTER rand() >= @prob LIMIT %d RETURN d",
+                                this.name(), limit);
+      }
+    }
+
+    stmt = internal.db._createStatement({ query: stmt });
+
+    if (probability < 1.0) {
+      stmt.bind("prob", probability);
+    }
+
+    cursor = stmt.execute();
+    pos = 0;
+
+    while (cursor.hasNext()) {
+      var document = cursor.next();
+
+      iterator(document, pos);
+
+      pos++;
+    }
+  };
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief string representation of a collection
 ////////////////////////////////////////////////////////////////////////////////

-  ArangoCollection.prototype.toString = function(seen, path, names, level) {
+  ArangoCollection.prototype.toString = function (seen, path, names, level) {
    return "[ArangoCollection " + this._id + "]";
  };

+////////////////////////////////////////////////////////////////////////////////
+/// @brief removes documents matching an example
+///
+/// @FUN{@FA{collection}.removeByExample(@FA{example})}
+///
+/// Removes all document matching an example.
+///
+/// @FUN{@FA{collection}.removeByExample(@FA{document}, @FA{waitForSync})}
+///
+/// The optional @FA{waitForSync} parameter can be used to force synchronisation
+/// of the document deletion operation to disk even in case that the
+/// @LIT{waitForSync} flag had been disabled for the entire collection.  Thus,
+/// the @FA{waitForSync} parameter can be used to force synchronisation of just
+/// specific operations. To use this, set the @FA{waitForSync} parameter to
+/// @LIT{true}. If the @FA{waitForSync} parameter is not specified or set to
+/// @LIT{false}, then the collection's default @LIT{waitForSync} behavior is
+/// applied. The @FA{waitForSync} parameter cannot be used to disable
+/// synchronisation for collections that have a default @LIT{waitForSync} value
+/// of @LIT{true}.
+///
+/// @EXAMPLES
+///
+/// @code
+/// arangod> db.content.removeByExample({ "domain": "de.celler" })
+/// @endcode
+////////////////////////////////////////////////////////////////////////////////
+
+  ArangoCollection.prototype.removeByExample = function (example, waitForSync) {
+    var documents;
+
+    documents = this.byExample(example);
+
+    while (documents.hasNext()) {
+      var document = documents.next();
+
+      this.remove(document, true, waitForSync);
+    }
+  };
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
@ -207,7 +348,7 @@
 /// @brief prints a collection
 ////////////////////////////////////////////////////////////////////////////////

-  ArangoCollection.prototype._PRINT = function() {
+  ArangoCollection.prototype._PRINT = function () {
    var status = "unknown";
    var type = "unknown";

--- a/js/server/ahuacatl.js
+++ b/js/server/ahuacatl.js
--- a/js/server/modules/org/arangodb.js
+++ b/js/server/modules/org/arangodb.js
@ -1,10 +1,4 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
 /*global require, exports */

 ////////////////////////////////////////////////////////////////////////////////
@ -47,6 +41,18 @@ var internal = require("internal");

 exports.db = internal.db;
 exports.ArangoCollection = internal.ArangoCollection;
+exports.ArangoError = internal.ArangoError;
+
+// copy error codes
+(function () {
+  var name;
+
+  for (name in internal.errors) {
+    if (internal.errors.hasOwnProperty(name)) {
+      exports[name] = internal.errors[name].code;
+    }
+  }
+}());

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
--- a/js/server/modules/org/arangodb/actions.js
+++ b/js/server/modules/org/arangodb/actions.js
@ -1,10 +1,4 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, regexp: true plusplus: true */
 /*global require, exports, module */

 ////////////////////////////////////////////////////////////////////////////////
@ -34,8 +28,10 @@
 /// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

+var arangodb = require("org/arangodb");
 var internal = require("internal");
 var console = require("console");
+var moduleExists = function(name) { return module.exists; };

 // -----------------------------------------------------------------------------
 // --SECTION--                                                 private variables
@ -195,6 +191,7 @@ function lookupCallbackStatic (content) {
    type = content.contentType || "text/plain";
    body = content.body || "";
    methods = content.methods || [ exports.GET, exports.HEAD ];
+    options = content.options || {};
  }

  return {
@ -245,11 +242,12 @@ function lookupCallbackAction (route, action) {
        func = module[name];
      }
      else {
-        func = notImplementedFunction(route, "could not find action named '" + name + "' in module '" + joined + "'");
+        func = notImplementedFunction(route, "could not find action named '"
+                                             + name + "' in module '" + joined + "'");
      }
    }
    catch (err) {
-      if (! module.exists(joined)) {
+      if (! moduleExists(joined)) {
        func = notImplementedFunction(route, 
 				      "an error occurred while loading action named '" + name 
 				        + "' in module '" + joined + "': " + String(err));
@ -280,19 +278,19 @@ function lookupCallbackAction (route, action) {

      return {
        controller: function (req, res, options, next) {
+          var m;
+
          // enum all HTTP methods
-          for (var m in httpMethods) {
-            if (! httpMethods.hasOwnProperty(m)) {
-              continue;
-            }
+          for (m in httpMethods) {
+            if (httpMethods.hasOwnProperty(m)) {
+              if (req.requestType === httpMethods[m] && module.hasOwnProperty(m)) {
+                func = module[m]
+		  || errorFunction(route, 
+				   "invalid definition for " + m + " action in action controller module '" 
+				     + action.controller + "'");

-            if (req.requestType == httpMethods[m] && module.hasOwnProperty(m)) {
-              func = module[m]
-		|| errorFunction(route, 
-				 "invalid definition for " + m + " action in action controller module '" 
-				   + action.controller + "'");
-
-              return func(req, res, options, next); 
+                return func(req, res, options, next); 
+              }
            }
          }

@ -311,16 +309,16 @@ function lookupCallbackAction (route, action) {
        methods: action.methods || exports.ALL_METHODS
      };
    }
-    catch (err) {
-      if (! module.exists(action.controller)) {
+    catch (err1) {
+      if (! moduleExists(action.controller)) {
        return notImplementedFunction(route, 
 				      "cannot load/execute action controller module '" 
-				        + action.controller + ": " + String(err));
+				        + action.controller + ": " + String(err1));
      }

      return errorFunction(route, 
 			   "cannot load/execute action controller module '" 
-			     + action.controller + ": " + String(err));
+			     + action.controller + ": " + String(err1));
    }
  }

@ -348,27 +346,28 @@ function lookupCallbackAction (route, action) {
        catch (err) {
 	  efunc = errorFunction;

-          if (! module.exists(path)) {
+          if (! moduleExists(path)) {
 	    efunc = notImplementedFunction;
          }

-          return efunc(route, "cannot load prefix controller: " + String(err))(req, res, options, next);
+          return efunc(route, "cannot load prefix controller: " + String(err))(
+                   req, res, options, next);
        }

        try {
+          var m;
+
          // enum all HTTP methods
-          for (var m in httpMethods) {
-            if (! httpMethods.hasOwnProperty(m)) {
-              continue;
-            }
+          for (m in httpMethods) {
+            if (httpMethods.hasOwnProperty(m)) {
+              if (req.requestType === httpMethods[m] && module.hasOwnProperty(m)) {
+                func = module[m]
+		  || errorFunction(route,
+				   "Invalid definition for " + m + " action in prefix controller '"
+				     + action.prefixController + "'");

-            if (req.requestType == httpMethods[m] && module.hasOwnProperty(m)) {
-              func = module[m]
-		|| errorFunction(route,
-				 "Invalid definition for " + m + " action in prefix controller '"
-				   + action.prefixController + "'");
-
-              return func(req, res, options, next);
+                return func(req, res, options, next);
+              }
            }
          }
  
@ -381,10 +380,11 @@ function lookupCallbackAction (route, action) {
            return func(req, res, options, next);
          }
        }
-        catch (err) {
+        catch (err2) {
          return errorFunction(route, 
 			       "Cannot load/execute prefix controller '"
-			         + action.prefixController + "': " + String(err))(req, res, options, next);
+			         + action.prefixController + "': " + String(err2))(
+                   req, res, options, next);
        }

        next();
@ -454,7 +454,7 @@ function defineRoutePart (route, subwhere, parts, pos, constraint, callback) {
  var ok;

  part = parts[pos];
-  if (part == undefined) {
+  if (part === undefined) {
    // otherwise we'll get an exception below
    part = '';
  }
@ -558,15 +558,20 @@ function flattenRouting (routes, path, urlParameters, depth, prefix) {
  var cur;
  var i;
  var k;
+  var newUrlParameters;
+  var parameter;
+  var match;
  var result = [];

  if (routes.hasOwnProperty('exact')) {
    for (k in routes.exact) {
      if (routes.exact.hasOwnProperty(k)) {
+        newUrlParameters = urlParameters.shallowCopy;
+
        cur = path + "/" + k.replace(/([\.\+\*\?\^\$\(\)\[\]])/g, "\\$1");
        result = result.concat(flattenRouting(routes.exact[k],
                                              cur,
-                                              urlParameters.shallowCopy,
+                                              newUrlParameters,
                                              depth + 1,
                                              false));
      }
@ -575,14 +580,14 @@ function flattenRouting (routes, path, urlParameters, depth, prefix) {

  if (routes.hasOwnProperty('parameters')) {
    for (i = 0;  i < routes.parameters.length;  ++i) {
-      var parameter = routes.parameters[i];
-      var newUrlParameters = urlParameters.shallowCopy;
-      var match;
+      parameter = routes.parameters[i];
+      newUrlParameters = urlParameters.shallowCopy;

      if (parameter.hasOwnProperty('constraint')) {
        var constraint = parameter.constraint;
+        var pattern = /\/.*\//;

-        if (/\/.*\//.test(constraint)) {
+        if (pattern.test(constraint)) {
          match = "/" + constraint.substr(1, constraint.length - 2);
        }
        else {
@ -804,20 +809,25 @@ function getErrorMessage (code) {

 function getJsonBody (req, res, code) {
  var body;
+  var err;

  try {
    body = JSON.parse(req.requestBody || "{}") || {};
  }
-  catch (err) {
-    exports.resultBad(req, res, exports.ERROR_HTTP_CORRUPTED_JSON, err);
+  catch (err1) {
+    exports.resultBad(req, res, arangodb.ERROR_HTTP_CORRUPTED_JSON, err1);
    return undefined;
  }

  if (! body || ! (body instanceof Object)) {
    if (code === undefined) {
-      code = exports.ERROR_HTTP_CORRUPTED_JSON;
+      code = arangodb.ERROR_HTTP_CORRUPTED_JSON;
    }

+    err = new internal.ArangoError();
+    err.errorNum = code;
+    err.errorMessage = "expecting a valid JSON object as body";
+
    exports.resultBad(req, res, code, err);
    return undefined;
  }
@ -841,6 +851,7 @@ function getJsonBody (req, res, code) {

 function resultError (req, res, httpReturnCode, errorNum, errorMessage, headers, keyvals) {  
  var i;
+  var msg;

  res.responseCode = httpReturnCode;
  res.contentType = "application/json; charset=utf-8";
@ -852,6 +863,13 @@ function resultError (req, res, httpReturnCode, errorNum, errorMessage, headers,
    errorNum = httpReturnCode;
  }
  
+  if (errorMessage === undefined || errorMessage === null) {
+    msg = getErrorMessage(errorNum);
+  }
+  else {
+    msg = String(errorMessage);
+  }
+
  var result = {};

  if (keyvals !== undefined) {
@ -862,10 +880,10 @@ function resultError (req, res, httpReturnCode, errorNum, errorMessage, headers,
    }
  }

-  result["error"]        = true;
-  result["code"]         = httpReturnCode;
-  result["errorNum"]     = errorNum;
-  result["errorMessage"] = errorMessage;
+  result.error        = true;
+  result.code         = httpReturnCode;
+  result.errorNum     = errorNum;
+  result.errorMessage = msg;
  
  res.body = JSON.stringify(result);

@ -1087,7 +1105,8 @@ function firstRouting (type, parts) {
 ////////////////////////////////////////////////////////////////////////////////

 function badParameter (req, res, name) {
-  resultError(req, res, exports.HTTP_BAD, exports.HTTP_BAD, "invalid value for parameter '" + name + "'");
+  resultError(req, res, exports.HTTP_BAD, exports.HTTP_BAD, 
+              "invalid value for parameter '" + name + "'");
 }

 ////////////////////////////////////////////////////////////////////////////////
@ -1130,13 +1149,6 @@ function resultOk (req, res, httpReturnCode, result, headers) {
 ////////////////////////////////////////////////////////////////////////////////

 function resultBad (req, res, code, msg, headers) {
-  if (msg === undefined || msg === null) {
-    msg = getErrorMessage(code);
-  }
-  else {
-    msg = String(msg);
-  }
-
  resultError(req, res, exports.HTTP_BAD, code, msg, headers);
 }

@ -1149,7 +1161,7 @@ function resultBad (req, res, code, msg, headers) {
 ////////////////////////////////////////////////////////////////////////////////

 function resultNotFound (req, res, code, msg, headers) {
-  resultError(req, res, exports.HTTP_NOT_FOUND, code, String(msg), headers);
+  resultError(req, res, exports.HTTP_NOT_FOUND, code, msg, headers);
 }

 ////////////////////////////////////////////////////////////////////////////////
@ -1164,8 +1176,8 @@ function resultNotImplemented (req, res, msg, headers) {
  resultError(req, 
              res,
              exports.HTTP_NOT_IMPLEMENTED,
-              exports.ERROR_NOT_IMPLEMENTED,
-              String(msg),
+              arangodb.ERROR_NOT_IMPLEMENTED,
+              msg,
              headers);
 }

@ -1179,7 +1191,8 @@ function resultNotImplemented (req, res, msg, headers) {

 function resultUnsupported (req, res, headers) {
  resultError(req, res,
-              exports.HTTP_METHOD_NOT_ALLOWED, exports.ERROR_HTTP_METHOD_NOT_ALLOWED,
+              exports.HTTP_METHOD_NOT_ALLOWED,
+	      arangodb.ERROR_HTTP_METHOD_NOT_ALLOWED,
              "Unsupported method",
              headers);  
 }
@ -1300,11 +1313,11 @@ function resultCursor (req, res, cursor, code, options) {
  };

  if (cursorId) {
-    result["id"] = cursorId;
+    result.id = cursorId;
  }
    
  if (hasCount) {
-    result["count"] = count;
+    result.count = count;
  }

  if (code === undefined) {
@ -1325,13 +1338,13 @@ function resultCursor (req, res, cursor, code, options) {
 function collectionNotFound (req, res, collection, headers) {
  if (collection === undefined) {
    resultError(req, res,
-                exports.HTTP_BAD, exports.ERROR_HTTP_BAD_PARAMETER,
+                exports.HTTP_BAD, arangodb.ERROR_HTTP_BAD_PARAMETER,
                "expecting a collection name or identifier",
                headers);
  }
  else {
    resultError(req, res,
-                exports.HTTP_NOT_FOUND, exports.ERROR_ARANGO_COLLECTION_NOT_FOUND,
+                exports.HTTP_NOT_FOUND, arangodb.ERROR_ARANGO_COLLECTION_NOT_FOUND,
                "unknown collection '" + collection + "'", headers);
  }
 }
@ -1347,19 +1360,19 @@ function collectionNotFound (req, res, collection, headers) {
 function indexNotFound (req, res, collection, index, headers) {
  if (collection === undefined) {
    resultError(req, res,
-                exports.HTTP_BAD, exports.ERROR_HTTP_BAD_PARAMETER,
+                exports.HTTP_BAD, arangodb.ERROR_HTTP_BAD_PARAMETER,
                "expecting a collection name or identifier",
                headers);
  }
  else if (index === undefined) {
    resultError(req, res,
-                exports.HTTP_BAD, exports.ERROR_HTTP_BAD_PARAMETER,
+                exports.HTTP_BAD, arangodb.ERROR_HTTP_BAD_PARAMETER,
                "expecting an index identifier",
                headers);
  }
  else {
    resultError(req, res,
-                exports.HTTP_NOT_FOUND, exports.ERROR_ARANGO_INDEX_NOT_FOUND,
+                exports.HTTP_NOT_FOUND, arangodb.ERROR_ARANGO_INDEX_NOT_FOUND,
                "unknown index '" + index + "'", headers);
  }
 }
@ -1373,20 +1386,20 @@ function indexNotFound (req, res, collection, index, headers) {
 ////////////////////////////////////////////////////////////////////////////////

 function resultException (req, res, err, headers) {
-  if (err instanceof ArangoError) {
+  if (err instanceof internal.ArangoError) {
    var num = err.errorNum;
    var msg = err.errorMessage;
    var code = exports.HTTP_BAD;

    switch (num) {
-      case exports.ERROR_INTERNAL: code = exports.HTTP_SERVER_ERROR; break;
+      case arangodb.ERROR_INTERNAL: code = exports.HTTP_SERVER_ERROR; break;
    }

    resultError(req, res, code, num, msg, headers);
  }
  else {
    resultError(req, res,
-                exports.HTTP_SERVER_ERROR, exports.ERROR_HTTP_SERVER_ERROR,
+                exports.HTTP_SERVER_ERROR, arangodb.ERROR_HTTP_SERVER_ERROR,
                String(err),
                headers);
  }
@ -1570,15 +1583,6 @@ exports.HTTP_NOT_IMPLEMENTED     = 501;
 exports.HTTP_BAD_GATEWAY         = 502;
 exports.HTTP_SERVICE_UNAVAILABLE = 503;

-// copy error codes
-var name;
-
-for (name in internal.errors) {
-  if (internal.errors.hasOwnProperty(name)) {
-    exports[name] = internal.errors[name].code;
-  }
-}
-
 // load routing
 reloadRouting();

--- a/js/server/modules/org/arangodb/actions/echoController.js
+++ b/js/server/modules/org/arangodb/actions/echoController.js
@ -1,5 +1,8 @@
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
+/*global require, exports */
+
 ////////////////////////////////////////////////////////////////////////////////
-/// @brief example controller
+/// @brief example echo controller
 ///
 /// @file
 ///
@ -27,17 +30,17 @@

 var actions = require("org/arangodb/actions");

-exports.head = function (req, res, next, options) {
+exports.head = function (req, res, options, next) {
  res.responseCode = actions.HTTP_OK;
  res.contentType = "application/json; charset=utf-8";
  res.body = "";
-}
+};

-exports.do = function (req, res, next, options) {
+exports['do'] = function (req, res, options, next) {
  res.responseCode = actions.HTTP_OK;
  res.contentType = "application/json; charset=utf-8";
  res.body = JSON.stringify( { "request" : req, "options" : options });
-}
+};

 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE
--- a/js/server/modules/org/arangodb/actions/staticContentController.js
+++ b/js/server/modules/org/arangodb/actions/staticContentController.js
@ -0,0 +1,135 @@
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
+/*global require, exports */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief deliver static content from collection
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2012 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Dr. Frank Celler
+/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+var arangodb = require("org/arangodb");
+var actions = require("org/arangodb/actions");
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                 private functions
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoActions
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief locate content from collection
+////////////////////////////////////////////////////////////////////////////////
+
+function locateContent (req, options) {
+  var path;
+  var collection;
+
+  if (! options.hasOwnProperty("contentCollection")) {
+    return null;
+  }
+
+  collection = arangodb.db._collection(options.contentCollection);
+
+  if (collection === null) {
+    return null;
+  }
+
+  path = "/" + req.suffix.join("/");
+
+  return collection.firstExample({ 
+    path: path,
+    prefix: options.prefix,
+    application: options.application });
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                 private functions
+// -----------------------------------------------------------------------------
+
+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoActions
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief locate content from collection
+////////////////////////////////////////////////////////////////////////////////
+
+exports.head = function (req, res, options, next) {
+  var content;
+
+  content = locateContent(req, options);
+  
+  if (content === null) {
+    res.responseCode = actions.HTTP_NOT_IMPLEMENTED;
+    res.contentType = "text/plain";
+  }
+  else {
+    res.responseCode = actions.HTTP_OK;
+    res.contentType = content.contentType || "text/html";
+  }
+
+  res.body = "";
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief get request
+////////////////////////////////////////////////////////////////////////////////
+
+exports.get = function (req, res, options, next) {
+  var content;
+
+  content = locateContent(req, options);
+  
+  if (content === null) {
+    res.responseCode = actions.HTTP_NOT_IMPLEMENTED;
+    res.contentType = "text/plain";
+    res.body = "path '" + req.suffix.join("/") + "' not implemented";
+  }
+  else {
+    res.responseCode = actions.HTTP_OK;
+    res.contentType = content.contentType || "text/html";
+    res.body = content.content || "";
+  }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
+// -----------------------------------------------------------------------------
+// --SECTION--                                                       END-OF-FILE
+// -----------------------------------------------------------------------------
+
+// Local Variables:
+// mode: outline-minor
+// outline-regexp: "\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
+// End:
--- a/js/server/modules/org/arangodb/formatter.js
+++ b/js/server/modules/org/arangodb/formatter.js
@ -1,10 +1,4 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
 /*global require, exports */

 ////////////////////////////////////////////////////////////////////////////////
@ -34,10 +28,17 @@
 /// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

+var arangodb = require("org/arangodb");
+
 // -----------------------------------------------------------------------------
-// --SECTION--                                                    number parsers
+// --SECTION--                                                 number formatters
 // -----------------------------------------------------------------------------

+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoStructures
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief parses a number
 ////////////////////////////////////////////////////////////////////////////////
@ -57,8 +58,8 @@ exports.number = function (value, info, lang) {
      result = String(value);
    }
    else {
-      error = new ArangoError();
-      error.errorNum = internal.errors.ERROR_NOT_IMPLEMENTED.code;
+      error = new arangodb.ArangoError();
+      error.errorNum = arangodb.ERROR_NOT_IMPLEMENTED;
      error.errorMessage = "format '" + format + "' not implemented";

      throw error;
@ -69,7 +70,7 @@ exports.number = function (value, info, lang) {
  }

  return result;
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
--- a/js/server/modules/org/arangodb/parser.js
+++ b/js/server/modules/org/arangodb/parser.js
@ -1,10 +1,4 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
 /*global require, exports */

 ////////////////////////////////////////////////////////////////////////////////
@ -34,10 +28,17 @@
 /// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

+var arangodb = require("org/arangodb");
+
 // -----------------------------------------------------------------------------
 // --SECTION--                                                    number parsers
 // -----------------------------------------------------------------------------

+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoStructures
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief parses a number
 ////////////////////////////////////////////////////////////////////////////////
@ -51,7 +52,7 @@ exports.number = function (value, info, lang) {
    format = info.format;

    if (format === "%d") {
-      result = parseInt(value);
+      result = parseInt(value, 10);
    }
    else if (format === "%f") {
      result = parseFloat(value);
@ -63,8 +64,8 @@ exports.number = function (value, info, lang) {
      result = parseInt(value, 8);
    }
    else {
-      error = new ArangoError();
-      error.errorNum = internal.errors.ERROR_NOT_IMPLEMENTED.code;
+      error = new arangodb.ArangoError();
+      error.errorNum = arangodb.ERROR_NOT_IMPLEMENTED;
      error.errorMessage = "format '" + format + "' not implemented";

      throw error;
@ -75,15 +76,15 @@ exports.number = function (value, info, lang) {
  }

  if (result === null || result === undefined || isNaN(result)) {
-    error = new ArangoError();
-    error.errorNum = internal.errors.ERROR_ARANGO_PARSER_FAILED;
+    error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_PARSER_FAILED;
    error.errorMessage = "format '" + format + "' not implemented";

    throw error;
  }

  return result;
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
--- a/js/server/modules/org/arangodb/validator.js
+++ b/js/server/modules/org/arangodb/validator.js
@ -1,10 +1,4 @@
-/*jslint indent: 2,
-         nomen: true,
-         maxlen: 100,
-         sloppy: true,
-         vars: true,
-         white: true,
-         plusplus: true */
+/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
 /*global require, exports */

 ////////////////////////////////////////////////////////////////////////////////
@ -34,23 +28,30 @@
 /// @author Copyright 2011-2012, triAGENS GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////

+var arangodb = require("org/arangodb");
+
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 number validators
 // -----------------------------------------------------------------------------

+////////////////////////////////////////////////////////////////////////////////
+/// @addtogroup ArangoStructure
+/// @{
+////////////////////////////////////////////////////////////////////////////////
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief positive number
 ////////////////////////////////////////////////////////////////////////////////

 exports.positiveNumber = function (value, info, lang) {
  if (value <= 0.0) {
-    error = new ArangoError();
-    error.errorNum = internal.errors.ERROR_ARANGO_VALIDATION_FAILED.code;
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_VALIDATION_FAILED;
    error.errorMessage = "number must be positive";

    throw error;
  }
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief negative number
@ -58,13 +59,13 @@ exports.positiveNumber = function (value, info, lang) {

 exports.negativeNumber = function (value, info, lang) {
  if (0.0 <= value) {
-    error = new ArangoError();
-    error.errorNum = internal.errors.ERROR_ARANGO_VALIDATION_FAILED.code;
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_VALIDATION_FAILED;
    error.errorMessage = "number must be negative";

    throw error;
  }
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief zero
@ -72,13 +73,13 @@ exports.negativeNumber = function (value, info, lang) {

 exports.zeroNumber = function (value, info, lang) {
  if (value === 0.0) {
-    error = new ArangoError();
-    error.errorNum = internal.errors.ERROR_ARANGO_VALIDATION_FAILED.code;
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_VALIDATION_FAILED;
    error.errorMessage = "number must be zero";

    throw error;
  }
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief non-positive number
@ -86,13 +87,13 @@ exports.zeroNumber = function (value, info, lang) {

 exports.nonPositiveNumber = function (value, info, lang) {
  if (0.0 < value) {
-    error = new ArangoError();
-    error.errorNum = internal.errors.ERROR_ARANGO_VALIDATION_FAILED.code;
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_VALIDATION_FAILED;
    error.errorMessage = "number must be non-positive";

    throw error;
  }
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief non-negative number
@ -100,13 +101,13 @@ exports.nonPositiveNumber = function (value, info, lang) {

 exports.nonNegativeNumber = function (value, info, lang) {
  if (value < 0.0) {
-    error = new ArangoError();
-    error.errorNum = internal.errors.ERROR_ARANGO_VALIDATION_FAILED.code;
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_VALIDATION_FAILED;
    error.errorMessage = "number must be non-negative";

    throw error;
  }
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @brief zero
@ -114,13 +115,13 @@ exports.nonNegativeNumber = function (value, info, lang) {

 exports.nonZeroNumber = function (value, info, lang) {
  if (value !== 0.0) {
-    error = new ArangoError();
-    error.errorNum = internal.errors.ERROR_ARANGO_VALIDATION_FAILED.code;
+    var error = new arangodb.ArangoError();
+    error.errorNum = arangodb.ERROR_ARANGO_VALIDATION_FAILED;
    error.errorMessage = "number must be non-zero";

    throw error;
  }
-}
+};

 ////////////////////////////////////////////////////////////////////////////////
 /// @}
--- a/js/server/server.js
+++ b/js/server/server.js
@ -5,7 +5,7 @@
         vars: true,
         white: true,
         plusplus: true */
-/*global require, db, edges, ModuleCache, Module,
+/*global require, db, edges, Module,
  ArangoCollection, ArangoDatabase,
  ArangoError, ShapedJson,
  SYS_DEFINE_ACTION */
--- a/js/server/version-check.js
+++ b/js/server/version-check.js
@ -92,9 +92,9 @@
    }


-    if (FS_EXISTS(versionFile)) {
+    if (internal.exists(versionFile)) {
      // VERSION file exists, read its contents
-      var versionInfo = SYS_READ(versionFile);
+      var versionInfo = internal.read(versionFile);

      if (versionInfo != '') {
        var versionValues = JSON.parse(versionInfo);
@ -342,13 +342,13 @@
  
  var currentVersion = parseFloat(currentServerVersion[1]);
  
-  if (! FS_EXISTS(versionFile)) {
+  if (! internal.exists(versionFile)) {
    console.info("No version information file found in database directory.");
    return runUpgrade(currentVersion);
  }

   // VERSION file exists, read its contents
-  var versionInfo = SYS_READ(versionFile);
+  var versionInfo = internal.read(versionFile);
  if (versionInfo != '') {
    var versionValues = JSON.parse(versionInfo);
    if (versionValues && versionValues.version && ! isNaN(versionValues.version)) {
--- a/lib/BasicsC/files.c
+++ b/lib/BasicsC/files.c
@ -158,6 +158,58 @@ static void InitialiseLockFiles (void) {
  Initialised = true;
 }

+////////////////////////////////////////////////////////////////////////////////
+/// @brief lists the directory tree
+////////////////////////////////////////////////////////////////////////////////
+
+static void ListTreeRecursively (char const* full,
+                                 char const* path, 
+                                 TRI_vector_string_t* result) {
+  size_t i;
+  size_t j;
+  TRI_vector_string_t dirs = TRI_FilesDirectory(full);
+
+  for (j = 0;  j < 2;  ++j) {
+    for (i = 0;  i < dirs._length;  ++i) {
+      char const* filename = dirs._buffer[i];
+      char* newfull = TRI_Concatenate2File(full, filename);
+      char* newpath;
+
+      if (*path) {
+        newpath = TRI_Concatenate2File(path, filename);
+      }
+      else {
+        newpath = TRI_DuplicateString(filename);
+      }
+
+      if (j == 0) {
+        if (TRI_IsDirectory(newfull)) {
+          TRI_PushBackVectorString(result, newpath);
+
+          if (! TRI_IsSymbolicLink(newfull)) {
+            ListTreeRecursively(newfull, newpath, result);
+          }
+        }
+        else {
+          TRI_FreeString(TRI_CORE_MEM_ZONE, newpath);
+        }
+      }
+      else {
+        if (! TRI_IsDirectory(newfull)) {
+          TRI_PushBackVectorString(result, newpath);
+        }
+        else {
+          TRI_FreeString(TRI_CORE_MEM_ZONE, newpath);
+        }
+      }
+
+      TRI_FreeString(TRI_CORE_MEM_ZONE, newfull);
+    }
+  }
+
+  TRI_DestroyVectorString(&dirs);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
@ -233,6 +285,19 @@ bool TRI_IsDirectory (char const* path) {
  return (res == 0) && ((stbuf.st_mode & S_IFMT) == S_IFDIR);
 }

+////////////////////////////////////////////////////////////////////////////////
+/// @brief checks if path is a symbolic link
+////////////////////////////////////////////////////////////////////////////////
+
+bool TRI_IsSymbolicLink (char const* path) {
+  struct stat stbuf;
+  int res;
+
+  res = lstat(path, &stbuf);
+
+  return (res == 0) && ((stbuf.st_mode & S_IFMT) == S_IFLNK);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief checks if file exists
 ////////////////////////////////////////////////////////////////////////////////
@ -517,6 +582,21 @@ TRI_vector_string_t TRI_FilesDirectory (char const* path) {

 #endif

+////////////////////////////////////////////////////////////////////////////////
+/// @brief lists the directory tree including files and directories
+////////////////////////////////////////////////////////////////////////////////
+
+TRI_vector_string_t TRI_FullTreeDirectory (char const* path) {
+  TRI_vector_string_t result;
+
+  TRI_InitVectorString(&result, TRI_CORE_MEM_ZONE);
+  
+  TRI_PushBackVectorString(&result, TRI_DuplicateString(""));
+  ListTreeRecursively(path, "", &result);
+
+  return result;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief renames a file
 ////////////////////////////////////////////////////////////////////////////////
--- a/lib/BasicsC/files.h
+++ b/lib/BasicsC/files.h
@ -69,6 +69,12 @@ int64_t TRI_SizeFile (char const* path);

 bool TRI_IsDirectory (char const* path);

+////////////////////////////////////////////////////////////////////////////////
+/// @brief checks if path is a symbolic link
+////////////////////////////////////////////////////////////////////////////////
+
+bool TRI_IsSymbolicLink (char const* path);
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief checks if file exists
 ////////////////////////////////////////////////////////////////////////////////
@ -123,6 +129,12 @@ char* TRI_Concatenate3File (char const* path1, char const* path2, char const* na

 TRI_vector_string_t TRI_FilesDirectory (char const* path);

+////////////////////////////////////////////////////////////////////////////////
+/// @brief lists the directory tree including files and directories
+////////////////////////////////////////////////////////////////////////////////
+
+TRI_vector_string_t TRI_FullTreeDirectory (char const* path);
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief renames a file
 ////////////////////////////////////////////////////////////////////////////////
--- a/lib/V8/v8-utils.cpp
+++ b/lib/V8/v8-utils.cpp
@ -713,7 +713,7 @@ static v8::Handle<v8::Value> JS_Execute (v8::Arguments const& argv) {
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief checks if a file of any type or directory exists
 ///
-/// @FUN{fs.exists(@FA{filename})}
+/// @FUN{fs.exists(@FA{path})}
 ///
 /// Returns true if a file (of any type) or a directory exists at a given
 /// path. If the file is a broken symbolic link, returns false.
@ -749,6 +749,72 @@ static v8::Handle<v8::Value> JS_Getline (v8::Arguments const& argv) {
  return scope.Close(v8::String::New(line.c_str(), line.size()));
 }

+////////////////////////////////////////////////////////////////////////////////
+/// @brief tests if path is a directory
+///
+/// @FUN{fs.isDirectory(@FA{path})}
+///
+/// Returns true if the @FA{path} points to a directory.
+////////////////////////////////////////////////////////////////////////////////
+
+static v8::Handle<v8::Value> JS_IsDirectory (v8::Arguments const& argv) {
+  v8::HandleScope scope;
+
+  // extract arguments
+  if (argv.Length() != 1) {
+    return scope.Close(v8::ThrowException(v8::String::New("usage: isDirectory(<path>)")));
+  }
+
+  TRI_Utf8ValueNFC name(TRI_UNKNOWN_MEM_ZONE, argv[0]);
+
+  if (*name == 0) {
+    return scope.Close(v8::ThrowException(v8::String::New("<path> must be a string")));
+  }
+
+  // return result
+  return scope.Close(TRI_IsDirectory(*name) ? v8::True() : v8::False());
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief returns the directory tree
+///
+/// @FUN{fs.listTree(@FA{path})}
+///
+/// The function returns an array that starts with the given path, and all of
+/// the paths relative to the given path, discovered by a depth first traversal
+/// of every directory in any visited directory, reporting but not traversing
+/// symbolic links to directories. The first path is always @LIT{""}, the path
+/// relative to itself.
+////////////////////////////////////////////////////////////////////////////////
+
+static v8::Handle<v8::Value> JS_ListTree (v8::Arguments const& argv) {
+  v8::HandleScope scope;
+
+  // extract arguments
+  if (argv.Length() != 1) {
+    return scope.Close(v8::ThrowException(v8::String::New("usage: listTree(<path>)")));
+  }
+
+  TRI_Utf8ValueNFC name(TRI_UNKNOWN_MEM_ZONE, argv[0]);
+
+  if (*name == 0) {
+    return scope.Close(v8::ThrowException(v8::String::New("<path> must be a string")));
+  }
+
+  // constructed listing
+  v8::Handle<v8::Array> result = v8::Array::New();
+  TRI_vector_string_t list = TRI_FullTreeDirectory(*name);
+
+  for (size_t i = 0;  i < list._length;  ++i) {
+    result->Set(i, v8::String::New(list._buffer[i]));
+  }
+
+  TRI_DestroyVectorString(&list);
+
+  // return result
+  return scope.Close(result);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief reads a file and executes it
 ///
@ -1669,6 +1735,8 @@ void TRI_InitV8Utils (v8::Handle<v8::Context> context, string const& path) {
  // .............................................................................
  
  TRI_AddGlobalFunctionVocbase(context, "FS_EXISTS", JS_Exists);
+  TRI_AddGlobalFunctionVocbase(context, "FS_IS_DIRECTORY", JS_IsDirectory);
+  TRI_AddGlobalFunctionVocbase(context, "FS_LIST_TREE", JS_ListTree);
  TRI_AddGlobalFunctionVocbase(context, "FS_MOVE", JS_Move);
  TRI_AddGlobalFunctionVocbase(context, "FS_REMOVE", JS_Remove);
				`@ -0,0 +1 @@`
				`../../../../js/common/bootstrap/module-internal.js`
				`@ -0,0 +1 @@`
				`../../../../js/common/bootstrap/monkeypatches.js`