1
0
Fork 0

renamed userContext to actionContext

This commit is contained in:
Frank Celler 2012-03-04 15:44:11 +01:00
parent ffdc497643
commit 69544596f3
4 changed files with 31 additions and 3 deletions

View File

@ -91,6 +91,7 @@ string ActionDispatcherThread::_startupModules;
/// @brief constructs a new dispatcher thread
////////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
<<<<<<< HEAD
ActionDispatcherThread::ActionDispatcherThread (DispatcherQueue* queue,
string const& actionQueue,
@ -98,9 +99,13 @@ ActionDispatcherThread::ActionDispatcherThread (DispatcherQueue* queue,
=======
ActionDisptacherThread::ActionDisptacherThread (DispatcherQueue* queue, string const& userContext)
>>>>>>> added module doc
=======
ActionDisptacherThread::ActionDisptacherThread (DispatcherQueue* queue, string const& actionContext)
>>>>>>> renamed userContext to actionContext
: DispatcherThread(queue),
_isolate(0),
_context(),
<<<<<<< HEAD
<<<<<<< HEAD
_actionQueue(actionQueue),
_actionLoader(actionLoader),
@ -108,6 +113,9 @@ ActionDisptacherThread::ActionDisptacherThread (DispatcherQueue* queue, string c
=======
_userContext(userContext) {
>>>>>>> added module doc
=======
_actionContext(actionContext) {
>>>>>>> renamed userContext to actionContext
}
////////////////////////////////////////////////////////////////////////////////
@ -251,11 +259,15 @@ void ActionDispatcherThread::initialise () {
_context->Enter();
TRI_InitV8VocBridge(_context, _vocbase);
<<<<<<< HEAD
<<<<<<< HEAD
TRI_InitV8Actions(_context, _actionQueue.c_str());
=======
TRI_InitV8Actions(_context, _userContext.c_str());
>>>>>>> added module doc
=======
TRI_InitV8Actions(_context, _actionContext.c_str());
>>>>>>> renamed userContext to actionContext
TRI_InitV8Conversions(_context);
TRI_InitV8Utils(_context, _startupModules);
TRI_InitV8Shell(_context);

View File

@ -108,11 +108,15 @@ namespace triagens {
/// @brief constructs a new dispatcher thread
////////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
<<<<<<< HEAD
ActionDispatcherThread (rest::DispatcherQueue*, string const& actionQueue, JSLoader*);
=======
ActionDisptacherThread (rest::DispatcherQueue* queue, string const& userContext);
>>>>>>> added module doc
=======
ActionDisptacherThread (rest::DispatcherQueue* queue, string const& actionContext);
>>>>>>> renamed userContext to actionContext
////////////////////////////////////////////////////////////////////////////////
/// @brief destructs a dispatcher thread
@ -241,6 +245,7 @@ namespace triagens {
/// @brief action context
////////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
<<<<<<< HEAD
std::string _actionQueue;
@ -258,6 +263,9 @@ namespace triagens {
=======
std::string _userContext;
>>>>>>> added module doc
=======
std::string _actionContext;
>>>>>>> renamed userContext to actionContext
};
}
}

View File

@ -764,11 +764,15 @@ HttpResponse* TRI_ExecuteActionVocBase (TRI_vocbase_t* vocbase,
/// @brief stores the V8 actions function inside the global variable
////////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
<<<<<<< HEAD
void TRI_InitV8Actions (v8::Handle<v8::Context> context, char const* actionQueue) {
=======
void TRI_InitV8Actions (v8::Handle<v8::Context> context, char const* userContext) {
>>>>>>> added module doc
=======
void TRI_InitV8Actions (v8::Handle<v8::Context> context, char const* actionContext) {
>>>>>>> renamed userContext to actionContext
v8::HandleScope scope;
// check the isolate
@ -790,8 +794,12 @@ void TRI_InitV8Actions (v8::Handle<v8::Context> context, char const* userContext
v8::String::New(actionQueue),
=======
context->Global()->Set(v8::String::New("SYS_ACTION_CONTEXT"),
<<<<<<< HEAD
v8::String::New(userContext),
>>>>>>> added module doc
=======
v8::String::New(actionContext),
>>>>>>> renamed userContext to actionContext
v8::ReadOnly);
// .............................................................................

View File

@ -165,6 +165,7 @@ var console = require("console");
/// It is possible to specify a list of contexts, in case an actions belongs to
/// more than one context.
///
<<<<<<< HEAD
/// Note that the url for "user" actions is automatically prefixed
/// with @LIT{_action}. This applies to all specified contexts. For example, if
/// the context contains "admin" and "user" and the url is @LIT{hallo}, then the
@ -192,14 +193,13 @@ var console = require("console");
/// the AvocadoDB server. Both the "api" and "user" actions are using the same
/// worker queue.
///
=======
>>>>>>> renamed userContext to actionContext
/// Note that the url for "user" actions is automatically prefixed
/// with @LIT{_action}. This applies to all specified contexts. For example, if
/// the context contains "admin" and "user" and the url is @LIT{hallo}, then the
/// action is accessible under @{/_action/hallo} - even for the admin context.
///
/// It is possible to specify a list of contexts, in case an actions belongs to
/// more than one context.
///
/// @FA{options.callback}(@FA{request}, @FA{response})
///
<<<<<<< HEAD