From 3928975435b65b9aba970f73355ced4f07af980f Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 28 Mar 2013 22:41:42 +0100 Subject: [PATCH] moved apps to js Conflicts: Makefile.in --- Makefile.am | 3 ++- etc/arangodb/arangod.conf.in | 1 + etc/relative/arangod.conf | 1 + {apps => js/apps}/aardvark/aardvark.js | 0 .../apps}/aardvark/assets/collections/foxxCollection.js | 0 {apps => js/apps}/aardvark/assets/index.html | 0 {apps => js/apps}/aardvark/assets/lib/backbone.js | 0 {apps => js/apps}/aardvark/assets/lib/jquery.js | 0 {apps => js/apps}/aardvark/assets/lib/underscore.js | 0 {apps => js/apps}/aardvark/assets/models/foxx.js | 0 {apps => js/apps}/aardvark/assets/router/router.js | 0 {apps => js/apps}/aardvark/assets/views/foxxListView.js | 0 {apps => js/apps}/aardvark/assets/views/foxxView.js | 0 {apps => js/apps}/aardvark/index.html | 0 {apps => js/apps}/aardvark/manifest.json | 0 {apps => js/apps}/aardvark/models/foxxes.js | 0 {apps => js/apps}/aardvark/models/swagger.js | 0 js/common/tests/shell-foxx.js | 2 +- 18 files changed, 5 insertions(+), 2 deletions(-) rename {apps => js/apps}/aardvark/aardvark.js (100%) rename {apps => js/apps}/aardvark/assets/collections/foxxCollection.js (100%) rename {apps => js/apps}/aardvark/assets/index.html (100%) rename {apps => js/apps}/aardvark/assets/lib/backbone.js (100%) rename {apps => js/apps}/aardvark/assets/lib/jquery.js (100%) rename {apps => js/apps}/aardvark/assets/lib/underscore.js (100%) rename {apps => js/apps}/aardvark/assets/models/foxx.js (100%) rename {apps => js/apps}/aardvark/assets/router/router.js (100%) rename {apps => js/apps}/aardvark/assets/views/foxxListView.js (100%) rename {apps => js/apps}/aardvark/assets/views/foxxView.js (100%) rename {apps => js/apps}/aardvark/index.html (100%) rename {apps => js/apps}/aardvark/manifest.json (100%) rename {apps => js/apps}/aardvark/models/foxxes.js (100%) rename {apps => js/apps}/aardvark/models/swagger.js (100%) diff --git a/Makefile.am b/Makefile.am index c4379b164a..3c56c89b41 100644 --- a/Makefile.am +++ b/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 diff --git a/etc/arangodb/arangod.conf.in b/etc/arangodb/arangod.conf.in index 965f04296a..4a9af9a2b7 100644 --- a/etc/arangodb/arangod.conf.in +++ b/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 diff --git a/etc/relative/arangod.conf b/etc/relative/arangod.conf index 23dbae75d5..eacd37d5ea 100644 --- a/etc/relative/arangod.conf +++ b/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 diff --git a/apps/aardvark/aardvark.js b/js/apps/aardvark/aardvark.js similarity index 100% rename from apps/aardvark/aardvark.js rename to js/apps/aardvark/aardvark.js diff --git a/apps/aardvark/assets/collections/foxxCollection.js b/js/apps/aardvark/assets/collections/foxxCollection.js similarity index 100% rename from apps/aardvark/assets/collections/foxxCollection.js rename to js/apps/aardvark/assets/collections/foxxCollection.js diff --git a/apps/aardvark/assets/index.html b/js/apps/aardvark/assets/index.html similarity index 100% rename from apps/aardvark/assets/index.html rename to js/apps/aardvark/assets/index.html diff --git a/apps/aardvark/assets/lib/backbone.js b/js/apps/aardvark/assets/lib/backbone.js similarity index 100% rename from apps/aardvark/assets/lib/backbone.js rename to js/apps/aardvark/assets/lib/backbone.js diff --git a/apps/aardvark/assets/lib/jquery.js b/js/apps/aardvark/assets/lib/jquery.js similarity index 100% rename from apps/aardvark/assets/lib/jquery.js rename to js/apps/aardvark/assets/lib/jquery.js diff --git a/apps/aardvark/assets/lib/underscore.js b/js/apps/aardvark/assets/lib/underscore.js similarity index 100% rename from apps/aardvark/assets/lib/underscore.js rename to js/apps/aardvark/assets/lib/underscore.js diff --git a/apps/aardvark/assets/models/foxx.js b/js/apps/aardvark/assets/models/foxx.js similarity index 100% rename from apps/aardvark/assets/models/foxx.js rename to js/apps/aardvark/assets/models/foxx.js diff --git a/apps/aardvark/assets/router/router.js b/js/apps/aardvark/assets/router/router.js similarity index 100% rename from apps/aardvark/assets/router/router.js rename to js/apps/aardvark/assets/router/router.js diff --git a/apps/aardvark/assets/views/foxxListView.js b/js/apps/aardvark/assets/views/foxxListView.js similarity index 100% rename from apps/aardvark/assets/views/foxxListView.js rename to js/apps/aardvark/assets/views/foxxListView.js diff --git a/apps/aardvark/assets/views/foxxView.js b/js/apps/aardvark/assets/views/foxxView.js similarity index 100% rename from apps/aardvark/assets/views/foxxView.js rename to js/apps/aardvark/assets/views/foxxView.js diff --git a/apps/aardvark/index.html b/js/apps/aardvark/index.html similarity index 100% rename from apps/aardvark/index.html rename to js/apps/aardvark/index.html diff --git a/apps/aardvark/manifest.json b/js/apps/aardvark/manifest.json similarity index 100% rename from apps/aardvark/manifest.json rename to js/apps/aardvark/manifest.json diff --git a/apps/aardvark/models/foxxes.js b/js/apps/aardvark/models/foxxes.js similarity index 100% rename from apps/aardvark/models/foxxes.js rename to js/apps/aardvark/models/foxxes.js diff --git a/apps/aardvark/models/swagger.js b/js/apps/aardvark/models/swagger.js similarity index 100% rename from apps/aardvark/models/swagger.js rename to js/apps/aardvark/models/swagger.js diff --git a/js/common/tests/shell-foxx.js b/js/common/tests/shell-foxx.js index e0a82b860b..3cc8c4a309 100644 --- a/js/common/tests/shell-foxx.js +++ b/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 () {