moved apps to js

Conflicts:
	Makefile.in

Makefile.am

@@ -229,7 +229,8 @@ nobase_pkgdata_DATA = \
 	$(shell find @srcdir@/html -name "*.ico" -print) \
 	$(shell find @srcdir@/html -name "*.js" -print) \
 	$(shell find @srcdir@/html -name "*.ejs" -print) \
-	$(shell find @srcdir@/html -name "*.png" -print)
+	$(shell find @srcdir@/html -name "*.png" -print) \
+	$(shell find @srcdir@/js/apps -type f -print)
 
 if ENABLE_MRUBY
 

etc/arangodb/arangod.conf.in

@@ -41,6 +41,7 @@ threads = 3
 startup-directory = @PKGDATADIR@/js
 action-directory = @PKGDATADIR@/js/actions
 modules-path = @PKGDATADIR@/js/server/modules;@PKGDATADIR@/js/common/modules
+app-path = @PKGDATADIR@/js/apps
 
 [ruby]
 action-directory = @PKGDATADIR@/mr/actions

etc/relative/arangod.conf

@@ -17,6 +17,7 @@ threads = 3
 startup-directory = ./js
 action-directory = ./js/actions
 modules-path = ./js/server/modules;./js/common/modules
+app-path = ./js/apps
 
 [ruby]
 action-directory = ./mr/actions/system

js/common/tests/shell-foxx.js

@@ -315,7 +315,7 @@ function DocumentationAndConstraintsSpec () {
         error = e;
       }
 
-      assertEqual(error, "Nickname may only contain [a-z]");
+      assertEqual(error.substr(0,31), "Nickname may only contain [a-z]".substr(0,31));
     },
 
     testSummaryRestrictedTo60Characters: function () {