From 54fb1a73d87fa1e32fae94e66d1f28eef533ee74 Mon Sep 17 00:00:00 2001 From: Alan Plum Date: Fri, 18 Dec 2015 14:12:39 +0100 Subject: [PATCH] foxx -> foxx/legacy --- js/server/modules/@arangodb/foxx/index.js | 10 ++++----- .../foxx/{ => legacy}/authentication.js | 0 .../foxx/{ => legacy}/base_middleware.js | 0 .../@arangodb/foxx/{ => legacy}/controller.js | 22 +++++++++---------- .../@arangodb/foxx/{ => legacy}/internals.js | 0 .../@arangodb/foxx/{ => legacy}/model.js | 2 +- .../@arangodb/foxx/{ => legacy}/query.js | 0 .../@arangodb/foxx/{ => legacy}/repository.js | 2 +- .../foxx/{ => legacy}/request_context.js | 8 +++---- .../@arangodb/foxx/{ => legacy}/schema.js | 2 +- .../@arangodb/foxx/{ => legacy}/sessions.js | 0 .../foxx/{ => legacy}/swaggerDocs.js | 0 .../foxx/{ => legacy}/template_middleware.js | 0 ...s => shell-foxx-legacy-base-middleware.js} | 2 +- ...=> shell-foxx-legacy-model-events-spec.js} | 4 ++-- ...xx-model.js => shell-foxx-legacy-model.js} | 8 +++---- ...pec.js => shell-foxx-legacy-query-spec.js} | 2 +- ...oxx-legacy-repository-events-auto-spec.js} | 4 ++-- ...ell-foxx-legacy-repository-events-spec.js} | 4 ++-- ...s => shell-foxx-legacy-repository-spec.js} | 4 ++-- ... shell-foxx-legacy-template-middleware.js} | 2 +- js/server/tests/shell/shell-foxx.js | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) rename js/server/modules/@arangodb/foxx/{ => legacy}/authentication.js (100%) rename js/server/modules/@arangodb/foxx/{ => legacy}/base_middleware.js (100%) rename js/server/modules/@arangodb/foxx/{ => legacy}/controller.js (94%) rename js/server/modules/@arangodb/foxx/{ => legacy}/internals.js (100%) rename js/server/modules/@arangodb/foxx/{ => legacy}/model.js (98%) rename js/server/modules/@arangodb/foxx/{ => legacy}/query.js (100%) rename js/server/modules/@arangodb/foxx/{ => legacy}/repository.js (99%) rename js/server/modules/@arangodb/foxx/{ => legacy}/request_context.js (97%) rename js/server/modules/@arangodb/foxx/{ => legacy}/schema.js (96%) rename js/server/modules/@arangodb/foxx/{ => legacy}/sessions.js (100%) rename js/server/modules/@arangodb/foxx/{ => legacy}/swaggerDocs.js (100%) rename js/server/modules/@arangodb/foxx/{ => legacy}/template_middleware.js (100%) rename js/server/tests/shell/{shell-foxx-base-middleware.js => shell-foxx-legacy-base-middleware.js} (97%) rename js/server/tests/shell/{shell-foxx-model-events-spec.js => shell-foxx-legacy-model-events-spec.js} (95%) rename js/server/tests/shell/{shell-foxx-model.js => shell-foxx-legacy-model.js} (98%) rename js/server/tests/shell/{shell-foxx-query-spec.js => shell-foxx-legacy-query-spec.js} (99%) rename js/server/tests/shell/{shell-foxx-repository-events-auto-spec.js => shell-foxx-legacy-repository-events-auto-spec.js} (96%) rename js/server/tests/shell/{shell-foxx-repository-events-spec.js => shell-foxx-legacy-repository-events-spec.js} (96%) rename js/server/tests/shell/{shell-foxx-repository-spec.js => shell-foxx-legacy-repository-spec.js} (98%) rename js/server/tests/shell/{shell-foxx-template-middleware.js => shell-foxx-legacy-template-middleware.js} (97%) diff --git a/js/server/modules/@arangodb/foxx/index.js b/js/server/modules/@arangodb/foxx/index.js index 12efe51788..bae79166e2 100644 --- a/js/server/modules/@arangodb/foxx/index.js +++ b/js/server/modules/@arangodb/foxx/index.js @@ -27,12 +27,12 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -exports.Controller = require('@arangodb/foxx/controller').Controller; -exports.Model = require('@arangodb/foxx/model').Model; -exports.Repository = require('@arangodb/foxx/repository').Repository; +exports.Controller = require('@arangodb/foxx/legacy/controller').Controller; +exports.Model = require('@arangodb/foxx/legacy/model').Model; +exports.Repository = require('@arangodb/foxx/legacy/repository').Repository; +exports.createQuery = require('@arangodb/foxx/legacy/query').createQuery; +exports.toJSONSchema = require('@arangodb/foxx/legacy/schema').toJSONSchema; exports.queues = require('@arangodb/foxx/queues'); -exports.createQuery = require('@arangodb/foxx/query').createQuery; -exports.toJSONSchema = require('@arangodb/foxx/schema').toJSONSchema; const manager = require('@arangodb/foxx/manager'); diff --git a/js/server/modules/@arangodb/foxx/authentication.js b/js/server/modules/@arangodb/foxx/legacy/authentication.js similarity index 100% rename from js/server/modules/@arangodb/foxx/authentication.js rename to js/server/modules/@arangodb/foxx/legacy/authentication.js diff --git a/js/server/modules/@arangodb/foxx/base_middleware.js b/js/server/modules/@arangodb/foxx/legacy/base_middleware.js similarity index 100% rename from js/server/modules/@arangodb/foxx/base_middleware.js rename to js/server/modules/@arangodb/foxx/legacy/base_middleware.js diff --git a/js/server/modules/@arangodb/foxx/controller.js b/js/server/modules/@arangodb/foxx/legacy/controller.js similarity index 94% rename from js/server/modules/@arangodb/foxx/controller.js rename to js/server/modules/@arangodb/foxx/legacy/controller.js index 3787565c81..dddcbca24e 100644 --- a/js/server/modules/@arangodb/foxx/controller.js +++ b/js/server/modules/@arangodb/foxx/legacy/controller.js @@ -27,11 +27,11 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -const RequestContext = require('@arangodb/foxx/request_context'); -const BaseMiddleware = require('@arangodb/foxx/base_middleware').BaseMiddleware; +const RequestContext = require('@arangodb/foxx/legacy/request_context'); +const BaseMiddleware = require('@arangodb/foxx/legacy/base_middleware').BaseMiddleware; const _ = require('lodash'); const is = require('@arangodb/is'); -const internal = require('@arangodb/foxx/internals'); +const internal = require('@arangodb/foxx/legacy/internals'); const swagger = require('@arangodb/foxx/swagger'); @@ -41,7 +41,7 @@ var authControllerProps = { /// @brief Get the users of this controller //////////////////////////////////////////////////////////////////////////////// getUsers() { - const foxxAuthentication = require('@arangodb/foxx/authentication'); + const foxxAuthentication = require('@arangodb/foxx/legacy/authentication'); return new foxxAuthentication.Users(this.applicationContext); }, @@ -57,7 +57,7 @@ var authControllerProps = { /// @brief was docuBlock JSF_foxx_controller_login //////////////////////////////////////////////////////////////////////////////// login(route, opts) { - var authentication = require('@arangodb/foxx/authentication'); + var authentication = require('@arangodb/foxx/legacy/authentication'); return this.post(route, authentication.createStandardLoginHandler(this.getAuth(), this.getUsers(), opts)); }, @@ -65,7 +65,7 @@ var authControllerProps = { /// @brief was docuBlock JSF_foxx_controller_logout //////////////////////////////////////////////////////////////////////////////// logout(route, opts) { - var authentication = require('@arangodb/foxx/authentication'); + var authentication = require('@arangodb/foxx/legacy/authentication'); return this.post(route, authentication.createStandardLogoutHandler(this.getAuth(), opts)); }, @@ -73,7 +73,7 @@ var authControllerProps = { /// @brief was docuBlock JSF_foxx_controller_register //////////////////////////////////////////////////////////////////////////////// register(route, opts) { - var authentication = require('@arangodb/foxx/authentication'); + var authentication = require('@arangodb/foxx/legacy/authentication'); return this.post( route, authentication.createStandardRegistrationHandler(this.getAuth(), this.getUsers(), opts) @@ -84,7 +84,7 @@ var authControllerProps = { /// @brief was docuBlock JSF_foxx_controller_changePassword //////////////////////////////////////////////////////////////////////////////// changePassword(route, opts) { - var authentication = require('@arangodb/foxx/authentication'); + var authentication = require('@arangodb/foxx/legacy/authentication'); return this.post(route, authentication.createStandardChangePasswordHandler(this.getUsers(), opts)); } }; @@ -110,7 +110,7 @@ var sessionControllerProps = { if (!method || typeof this[method] !== 'function') { method = 'post'; } - var sessions = require('@arangodb/foxx/sessions'); + var sessions = require('@arangodb/foxx/legacy/sessions'); return this[method](route, sessions.createDestroySessionHandler(this.getSessions(), opts)); } }; @@ -347,7 +347,7 @@ class Controller { /// @brief was docuBlock JSF_foxx_controller_activateAuthentication //////////////////////////////////////////////////////////////////////////////// activateAuthentication(opts) { - var authentication = require('@arangodb/foxx/authentication'); + var authentication = require('@arangodb/foxx/legacy/authentication'); _.extend(this, authControllerProps); this.auth = authentication.createAuthObject(this.applicationContext, opts); @@ -360,7 +360,7 @@ class Controller { //////////////////////////////////////////////////////////////////////////////// activateSessions(opts) { - var sessions = require('@arangodb/foxx/sessions'); + var sessions = require('@arangodb/foxx/legacy/sessions'); _.extend(this, sessionControllerProps); this.sessions = new sessions.Sessions(opts); diff --git a/js/server/modules/@arangodb/foxx/internals.js b/js/server/modules/@arangodb/foxx/legacy/internals.js similarity index 100% rename from js/server/modules/@arangodb/foxx/internals.js rename to js/server/modules/@arangodb/foxx/legacy/internals.js diff --git a/js/server/modules/@arangodb/foxx/model.js b/js/server/modules/@arangodb/foxx/legacy/model.js similarity index 98% rename from js/server/modules/@arangodb/foxx/model.js rename to js/server/modules/@arangodb/foxx/legacy/model.js index 9787a4167b..220a20ed90 100644 --- a/js/server/modules/@arangodb/foxx/model.js +++ b/js/server/modules/@arangodb/foxx/legacy/model.js @@ -30,7 +30,7 @@ const _ = require('lodash'); const joi = require('joi'); const is = require('@arangodb/is'); -const toJSONSchema = require('@arangodb/foxx/schema').toJSONSchema; +const toJSONSchema = require('@arangodb/foxx/legacy/schema').toJSONSchema; const extend = require('@arangodb/extend').extend; const EventEmitter = require('events').EventEmitter; const metadataSchema = { diff --git a/js/server/modules/@arangodb/foxx/query.js b/js/server/modules/@arangodb/foxx/legacy/query.js similarity index 100% rename from js/server/modules/@arangodb/foxx/query.js rename to js/server/modules/@arangodb/foxx/legacy/query.js diff --git a/js/server/modules/@arangodb/foxx/repository.js b/js/server/modules/@arangodb/foxx/legacy/repository.js similarity index 99% rename from js/server/modules/@arangodb/foxx/repository.js rename to js/server/modules/@arangodb/foxx/legacy/repository.js index 9f5d19f0c0..fdf9062c93 100644 --- a/js/server/modules/@arangodb/foxx/repository.js +++ b/js/server/modules/@arangodb/foxx/legacy/repository.js @@ -27,7 +27,7 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -const Model = require('@arangodb/foxx/model').Model; +const Model = require('@arangodb/foxx/legacy/model').Model; const _ = require('lodash'); const extend = require('@arangodb/extend').extend; const EventEmitter = require('events').EventEmitter; diff --git a/js/server/modules/@arangodb/foxx/request_context.js b/js/server/modules/@arangodb/foxx/legacy/request_context.js similarity index 97% rename from js/server/modules/@arangodb/foxx/request_context.js rename to js/server/modules/@arangodb/foxx/legacy/request_context.js index 5cf1e7d14f..c15f1c605f 100644 --- a/js/server/modules/@arangodb/foxx/request_context.js +++ b/js/server/modules/@arangodb/foxx/legacy/request_context.js @@ -28,14 +28,14 @@ /// @author Copyright 2013, triAGENS GmbH, Cologne, Germany //////////////////////////////////////////////////////////////////////////////// -const SwaggerDocs = require('@arangodb/foxx/swaggerDocs').Docs; +const SwaggerDocs = require('@arangodb/foxx/legacy/swaggerDocs').Docs; const joi = require('joi'); const _ = require('lodash'); -const internal = require('@arangodb/foxx/internals'); -const toJSONSchema = require('@arangodb/foxx/schema').toJSONSchema; +const internal = require('@arangodb/foxx/legacy/internals'); +const toJSONSchema = require('@arangodb/foxx/legacy/schema').toJSONSchema; const is = require('@arangodb/is'); const UnprocessableEntity = require('http-errors').UnprocessableEntity; -const UnauthorizedError = require('@arangodb/foxx/authentication').UnauthorizedError; +const UnauthorizedError = require('@arangodb/foxx/legacy/authentication').UnauthorizedError; function createBodyParamExtractor(rootElement, paramName, allowInvalid) { var extractElement; diff --git a/js/server/modules/@arangodb/foxx/schema.js b/js/server/modules/@arangodb/foxx/legacy/schema.js similarity index 96% rename from js/server/modules/@arangodb/foxx/schema.js rename to js/server/modules/@arangodb/foxx/legacy/schema.js index 9d43d3a78b..ad77a9fa8d 100644 --- a/js/server/modules/@arangodb/foxx/schema.js +++ b/js/server/modules/@arangodb/foxx/legacy/schema.js @@ -44,7 +44,7 @@ function toJSONSchema(id, schema) { if ( typeof schema.toJSONSchema === 'function' && schema.toJSONSchema !== toJSONSchema && - schema.toJSONSchema !== require('@arangodb/foxx/model').Model.toJSONSchema + schema.toJSONSchema !== require('@arangodb/foxx/legacy/model').Model.toJSONSchema ) { // allow overriding toJSONSchema. return schema.toJSONSchema(id); diff --git a/js/server/modules/@arangodb/foxx/sessions.js b/js/server/modules/@arangodb/foxx/legacy/sessions.js similarity index 100% rename from js/server/modules/@arangodb/foxx/sessions.js rename to js/server/modules/@arangodb/foxx/legacy/sessions.js diff --git a/js/server/modules/@arangodb/foxx/swaggerDocs.js b/js/server/modules/@arangodb/foxx/legacy/swaggerDocs.js similarity index 100% rename from js/server/modules/@arangodb/foxx/swaggerDocs.js rename to js/server/modules/@arangodb/foxx/legacy/swaggerDocs.js diff --git a/js/server/modules/@arangodb/foxx/template_middleware.js b/js/server/modules/@arangodb/foxx/legacy/template_middleware.js similarity index 100% rename from js/server/modules/@arangodb/foxx/template_middleware.js rename to js/server/modules/@arangodb/foxx/legacy/template_middleware.js diff --git a/js/server/tests/shell/shell-foxx-base-middleware.js b/js/server/tests/shell/shell-foxx-legacy-base-middleware.js similarity index 97% rename from js/server/tests/shell/shell-foxx-base-middleware.js rename to js/server/tests/shell/shell-foxx-legacy-base-middleware.js index abb2ec1dff..45d9ece0c1 100644 --- a/js/server/tests/shell/shell-foxx-base-middleware.js +++ b/js/server/tests/shell/shell-foxx-legacy-base-middleware.js @@ -36,7 +36,7 @@ function BaseMiddlewareSpec () { return { setUp: function () { - baseMiddleware = require("@arangodb/foxx/base_middleware").BaseMiddleware().functionRepresentation; + baseMiddleware = require("@arangodb/foxx/legacy/base_middleware").BaseMiddleware().functionRepresentation; request = {}; response = {}; options = {}; diff --git a/js/server/tests/shell/shell-foxx-model-events-spec.js b/js/server/tests/shell/shell-foxx-legacy-model-events-spec.js similarity index 95% rename from js/server/tests/shell/shell-foxx-model-events-spec.js rename to js/server/tests/shell/shell-foxx-legacy-model-events-spec.js index 781360f5ea..c3b3c5b9d2 100644 --- a/js/server/tests/shell/shell-foxx-model-events-spec.js +++ b/js/server/tests/shell/shell-foxx-legacy-model-events-spec.js @@ -3,8 +3,8 @@ var sinon = require('sinon'); var expect = require('expect.js'); -var FoxxRepository = require("@arangodb/foxx/repository").Repository; -var Model = require("@arangodb/foxx/model").Model; +var FoxxRepository = require("@arangodb/foxx/legacy/repository").Repository; +var Model = require("@arangodb/foxx/legacy/model").Model; describe('Model Events', function () { var collection, instance, repository; diff --git a/js/server/tests/shell/shell-foxx-model.js b/js/server/tests/shell/shell-foxx-legacy-model.js similarity index 98% rename from js/server/tests/shell/shell-foxx-model.js rename to js/server/tests/shell/shell-foxx-legacy-model.js index 1e950de8c8..58bff00b8d 100644 --- a/js/server/tests/shell/shell-foxx-model.js +++ b/js/server/tests/shell/shell-foxx-legacy-model.js @@ -38,7 +38,7 @@ function ModelSpec () { return { setUp: function () { - FoxxModel = require('@arangodb/foxx/model').Model; + FoxxModel = require('@arangodb/foxx/legacy/model').Model; }, testWithInitialData: function () { @@ -317,7 +317,7 @@ function ModelDBSpec () { return { setUp: function () { - FoxxModel = require('@arangodb/foxx/model').Model; + FoxxModel = require('@arangodb/foxx/legacy/model').Model; cn = "UnitTestsFoxxModel"; db._drop(cn); @@ -422,8 +422,8 @@ function ModelAnnotationSpec () { return { setUp: function () { - FoxxModel = require('@arangodb/foxx/model').Model; - toJSONSchema = require('@arangodb/foxx/schema').toJSONSchema; + FoxxModel = require('@arangodb/foxx/legacy/model').Model; + toJSONSchema = require('@arangodb/foxx/legacy/schema').toJSONSchema; }, testGetEmptyJSONSchema: function () { diff --git a/js/server/tests/shell/shell-foxx-query-spec.js b/js/server/tests/shell/shell-foxx-legacy-query-spec.js similarity index 99% rename from js/server/tests/shell/shell-foxx-query-spec.js rename to js/server/tests/shell/shell-foxx-legacy-query-spec.js index 4d98e1ccb9..53cdc26b5e 100644 --- a/js/server/tests/shell/shell-foxx-query-spec.js +++ b/js/server/tests/shell/shell-foxx-legacy-query-spec.js @@ -32,7 +32,7 @@ const expect = require('chai').expect; const sinon = require('sinon'); -const createQuery = require('@arangodb/foxx/query').createQuery; +const createQuery = require('@arangodb/foxx/legacy/query').createQuery; const arangodb = require('@arangodb'); const db = arangodb.db; const ArangoError = arangodb.ArangoError; diff --git a/js/server/tests/shell/shell-foxx-repository-events-auto-spec.js b/js/server/tests/shell/shell-foxx-legacy-repository-events-auto-spec.js similarity index 96% rename from js/server/tests/shell/shell-foxx-repository-events-auto-spec.js rename to js/server/tests/shell/shell-foxx-legacy-repository-events-auto-spec.js index 5c0f545694..8a6c9ee683 100644 --- a/js/server/tests/shell/shell-foxx-repository-events-auto-spec.js +++ b/js/server/tests/shell/shell-foxx-legacy-repository-events-auto-spec.js @@ -30,8 +30,8 @@ const expect = require('chai').expect; const sinon = require('sinon'); -const FoxxRepository = require('@arangodb/foxx/repository').Repository; -const FoxxModel = require('@arangodb/foxx/model').Model; +const FoxxRepository = require('@arangodb/foxx/legacy/repository').Repository; +const FoxxModel = require('@arangodb/foxx/legacy/model').Model; describe('Repository Events', function () { let collection, Model; diff --git a/js/server/tests/shell/shell-foxx-repository-events-spec.js b/js/server/tests/shell/shell-foxx-legacy-repository-events-spec.js similarity index 96% rename from js/server/tests/shell/shell-foxx-repository-events-spec.js rename to js/server/tests/shell/shell-foxx-legacy-repository-events-spec.js index 4f675d9783..49487b2e73 100644 --- a/js/server/tests/shell/shell-foxx-repository-events-spec.js +++ b/js/server/tests/shell/shell-foxx-legacy-repository-events-spec.js @@ -30,8 +30,8 @@ const expect = require('chai').expect; const sinon = require('sinon'); -const FoxxRepository = require('@arangodb/foxx/repository').Repository; -const Model = require('@arangodb/foxx/model').Model; +const FoxxRepository = require('@arangodb/foxx/legacy/repository').Repository; +const Model = require('@arangodb/foxx/legacy/model').Model; describe('Model Events', function () { let collection, instance, repository; diff --git a/js/server/tests/shell/shell-foxx-repository-spec.js b/js/server/tests/shell/shell-foxx-legacy-repository-spec.js similarity index 98% rename from js/server/tests/shell/shell-foxx-repository-spec.js rename to js/server/tests/shell/shell-foxx-legacy-repository-spec.js index d571669459..703b03cd1b 100644 --- a/js/server/tests/shell/shell-foxx-repository-spec.js +++ b/js/server/tests/shell/shell-foxx-legacy-repository-spec.js @@ -31,8 +31,8 @@ const expect = require('chai').expect; const sinon = require('sinon'); -const FoxxRepository = require('@arangodb/foxx/repository').Repository; -const FoxxModel = require('@arangodb/foxx/model').Model; +const FoxxRepository = require('@arangodb/foxx/legacy/repository').Repository; +const FoxxModel = require('@arangodb/foxx/legacy/model').Model; describe('Repository', function () { const prefix = 'myApp'; diff --git a/js/server/tests/shell/shell-foxx-template-middleware.js b/js/server/tests/shell/shell-foxx-legacy-template-middleware.js similarity index 97% rename from js/server/tests/shell/shell-foxx-template-middleware.js rename to js/server/tests/shell/shell-foxx-legacy-template-middleware.js index f8077b22ca..bd3e35e215 100644 --- a/js/server/tests/shell/shell-foxx-template-middleware.js +++ b/js/server/tests/shell/shell-foxx-legacy-template-middleware.js @@ -42,7 +42,7 @@ function TemplateMiddlewareSpec () { response = {}; options = {}; next = function () {}; - TemplateMiddleware = require("@arangodb/foxx/template_middleware").TemplateMiddleware; + TemplateMiddleware = require("@arangodb/foxx/legacy/template_middleware").TemplateMiddleware; db._drop("templateTest"); templateCollection = db._create("templateTest"); }, diff --git a/js/server/tests/shell/shell-foxx.js b/js/server/tests/shell/shell-foxx.js index 7b37dc47c6..32e8aff9f1 100644 --- a/js/server/tests/shell/shell-foxx.js +++ b/js/server/tests/shell/shell-foxx.js @@ -35,7 +35,7 @@ var stub, FunctionStub, mockConstructor, joi = require("joi"), - transformRoute = require("@arangodb/foxx/routing").__test_transformControllerToRoute, + transformRoute = require("@arangodb/foxx/legacy/routing").__test_transformControllerToRoute, _ = require("lodash"); // Sorry for Yak Shaving. But I can't take it anymore.