Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ssue #165: front-end application howto

This commit is contained in:
Frank Celler 2012-09-24 10:31:13 +02:00
parent 1366b3a531
commit aeb83e4435
15 changed files with 1823 additions and 609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
v1.0.1 (2012-XX-XX) v1.0.1 (2012-XX-XX)
------------------- -------------------
* darft for issue #165: front-end application howto
* updated mruby to cf8fdea4a6598aa470e698e8cbc9b9b492319d * updated mruby to cf8fdea4a6598aa470e698e8cbc9b9b492319d
* fix for issue #190: install doesn't create log directory * fix for issue #190: install doesn't create log directory

2
Doxygen/arango.template
View File

@ -1550,7 +1550,7 @@ HIDE_UNDOC_RELATIONS = YES
# toolkit from AT&T and Lucent Bell Labs. The other options in this section # toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default) # have no effect if this option is set to NO (the default)
HAVE_DOT = NO HAVE_DOT = YES
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
# allowed to run in parallel. When set to 0 (the default) doxygen will # allowed to run in parallel. When set to 0 (the default) doxygen will

11
Makefile.in
View File

@ -1,9 +1,8 @@
# Makefile.in generated by automake 1.12 from Makefile.am. # Makefile.in generated by automake 1.12.1 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994-2012 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
@ -1657,7 +1656,9 @@ SHELL_COMMON = @srcdir@/js/common/tests/shell-document.js \
@srcdir@/js/common/tests/shell-unique-constraint.js \ @srcdir@/js/common/tests/shell-unique-constraint.js \
@srcdir@/js/common/tests/shell-hash-index.js @srcdir@/js/common/tests/shell-hash-index.js
SHELL_SERVER = $(SHELL_COMMON) SHELL_SERVER = $(SHELL_COMMON) \
@srcdir@/js/server/tests/routing.js
UNITTESTS_SERVER = $(addprefix --javascript.unit-tests ,$(SHELL_SERVER)) UNITTESTS_SERVER = $(addprefix --javascript.unit-tests ,$(SHELL_SERVER))
################################################################################ ################################################################################

3
Makefile.unittests
View File

@ -149,7 +149,8 @@ SHELL_COMMON = @srcdir@/js/common/tests/shell-document.js \
@srcdir@/js/common/tests/shell-unique-constraint.js \ @srcdir@/js/common/tests/shell-unique-constraint.js \
@srcdir@/js/common/tests/shell-hash-index.js @srcdir@/js/common/tests/shell-hash-index.js
SHELL_SERVER = $(SHELL_COMMON) SHELL_SERVER = $(SHELL_COMMON) \
@srcdir@/js/server/tests/routing.js
.PHONY: unittests-shell-server .PHONY: unittests-shell-server

73
aclocal.m4 vendored
View File

@ -1,8 +1,7 @@
# generated automatically by aclocal 1.12 -*- Autoconf -*- # generated automatically by aclocal 1.12.1 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
# Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
@ -37,7 +36,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12' [am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.12], [], m4_if([$1], [1.12.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -53,7 +52,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.12])dnl [AM_AUTOMAKE_VERSION([1.12.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@ -154,7 +153,7 @@ fi])])
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
# serial 16 # serial 17
# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4, # written in clear, in which case automake, when reading aclocal.m4,
@ -166,7 +165,7 @@ fi])])
# _AM_DEPENDENCIES(NAME) # _AM_DEPENDENCIES(NAME)
# ---------------------- # ----------------------
# See how the compiler implements dependency checking. # See how the compiler implements dependency checking.
# NAME is "CC", "CXX", "GCJ", or "OBJC". # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable. # We try a few techniques and use that to set a single cache variable.
# #
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@ -182,6 +181,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
[$1], [CXX], [depcc="$CXX" am_compiler_list=], [$1], [CXX], [depcc="$CXX" am_compiler_list=],
[$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
[$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
[$1], [UPC], [depcc="$UPC" am_compiler_list=], [$1], [UPC], [depcc="$UPC" am_compiler_list=],
[$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=]) [depcc="$$1" am_compiler_list=])
@ -422,7 +422,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
# serial 18 # serial 19
# This macro actually does too much. Some checks are only needed if # This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal. # your package does certain things. But this isn't really a big deal.
@ -468,7 +468,10 @@ AC_SUBST([CYGPATH_W])
# Define the identity of the package. # Define the identity of the package.
dnl Distinguish between old-style and new-style calls. dnl Distinguish between old-style and new-style calls.
m4_ifval([$2], m4_ifval([$2],
[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [AC_DIAGNOSE([obsolete],
[$0: two- and three-arguments forms are deprecated. For more info, see:
http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])], AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl [_AM_SET_OPTIONS([$1])dnl
@ -494,7 +497,8 @@ AM_MISSING_PROG([AUTOHEADER], [autoheader])
AM_MISSING_PROG([MAKEINFO], [makeinfo]) AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
# We need awk for the "check" target. The system "awk" is bad on # We need awk for the "check" target. The system "awk" is bad on
# some platforms. # some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_AWK])dnl
@ -506,16 +510,23 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
_AM_IF_OPTION([no-dependencies],, _AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC], [AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES([CC])], [_AM_DEPENDENCIES([CC])],
[define([AC_PROG_CC], [m4_define([AC_PROG_CC],
defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX], AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES([CXX])], [_AM_DEPENDENCIES([CXX])],
[define([AC_PROG_CXX], [m4_define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC], AC_PROVIDE_IFELSE([AC_PROG_OBJC],
[_AM_DEPENDENCIES([OBJC])], [_AM_DEPENDENCIES([OBJC])],
[define([AC_PROG_OBJC], [m4_define([AC_PROG_OBJC],
defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
dnl Support for Objective C++ was only introduced in Autoconf 2.65,
dnl but we still cater to Autoconf 2.62.
m4_ifdef([AC_PROG_OBJCXX],
[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
[_AM_DEPENDENCIES([OBJCXX])],
[m4_define([AC_PROG_OBJCXX],
m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
]) ])
_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
@ -726,34 +737,6 @@ else
fi fi
]) ])
# Copyright (C) 2003-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 2
# AM_PROG_MKDIR_P
# ---------------
# Check for 'mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
dnl Makefile.ins that do not define MKDIR_P, so we do our own
dnl adjustment using top_builddir (which is defined more often than
dnl MKDIR_P).
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
case $mkdir_p in
[[\\/$]]* | ?:[[\\/]]*) ;;
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
esac
])
# Helper functions for option handling. -*- Autoconf -*- # Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2012 Free Software Foundation, Inc. # Copyright (C) 2001-2012 Free Software Foundation, Inc.

537
arangod/Documentation/user-manual.dox
View File

@ -350,10 +350,35 @@
/// <ul> /// <ul>
/// <li>@ref UserManualActionsIntro</li> /// <li>@ref UserManualActionsIntro</li>
/// <li>@ref UserManualActionsHelloWorld</li> /// <li>@ref UserManualActionsHelloWorld</li>
/// <li>@ref UserManualActionsMatches
/// <ul>
/// <li>@ref UserManualActionsMatchesExact</li>
/// <li>@ref UserManualActionsMatchesPrefix</li>
/// <li>@ref UserManualActionsMatchesParameterized</li>
/// <li>@ref UserManualActionsMatchesConstraint</li>
/// <li>@ref UserManualActionsMatchesOptional</li>
/// <li>@ref UserManualActionsMatchesMethod</li>
/// <li>@ref UserManualActionsMatching</li>
/// </ul>
/// </li>
/// <li>@ref UserManualActionsHelloJson</li> /// <li>@ref UserManualActionsHelloJson</li>
/// <li>@ref UserManualActionsEcho</li> /// <li>@ref UserManualActionsContent
/// <li>@ref UserManualActionsDYO</li> /// <ul>
/// <li>@ref UserManualActionsAdvanced</li> /// <li>@ref UserManualActionsContentStatic</li>
/// <li>@ref UserManualActionsContentAction</li>
/// <li>@ref UserManualActionsContentController</li>
/// <li>@ref UserManualActionsContentPrefix</li>
/// <li>@ref UserManualActionsContentMethod</li>
/// </ul>
/// </li>
/// <li>@ref UserManualActionsReqRes</li>
/// <li>@ref UserManualActionsAdvanced
/// <ul>
/// <li>@ref UserManualActionsAdvancedRedirects</li>
/// <li>@ref UserManualActionsAdvancedBundles</li>
/// <li>@ref UserManualActionsAdvancedMiddleware</li>
/// </ul>
// </li>
/// </ul> /// </ul>
/// </li> /// </li>
/// </ul> /// </ul>
@ -454,8 +479,8 @@
/// ///
/// @code /// @code
/// arangosh> db._routing.save({ /// arangosh> db._routing.save({
/// ........> path: "/hello/world", /// ........> url: { match: "/hello/world" },
/// ........> callback: { /// ........> content: {
/// ........> contentType: "text/html", /// ........> contentType: "text/html",
/// ........> body: "<html><body>Hello World</body></html>" }}); /// ........> body: "<html><body>Hello World</body></html>" }});
/// @endcode /// @endcode
@ -464,13 +489,186 @@
/// or call the internal reload function. /// or call the internal reload function.
/// ///
/// @code /// @code
/// arangosh> require("internal").reloadRouting() /// arangosh> require("org/arangodb/routing").reload()
/// @endcode /// @endcode
/// ///
/// Now use the browser and access /// Now use the browser and access
/// ///
/// @LIT{http://localhost:8529/hello/world} /// @LIT{http://localhost:8529/hello/world}
/// ///
/// You should see the @LIT{Hello World} in our browser.
///
/// @section UserManualActionsMatches Matching an URL
/////////////////////////////////////////////////////
///
/// There are a lot of options for the @LIT{url} attribute. If you define
/// different routing for the same path, then the following simple rule is
/// applied in order to determine which match wins: If there are two matches,
/// then the more specific wins. I. e, if there is a wildcard match and an exact
/// match, the exact match is prefered. If there is a short and a long match,
/// the longer match wins.
///
/// @subsection UserManualActionsMatchesExact Exact Match
///
/// If the definition is
///
/// @code
/// { url: { match: "/hello/world" } }
/// @endcode
///
/// then the match must be exact. Only the request for @LIT{/hello/world} will
/// match, everything else, e. g. @LIT{/hello/world/my} or @LIT{/hello/world2},
/// will not match.
///
/// The following definition is a short-cut for an exact match.
///
/// @code
/// { url: "/hello/world" }
/// @endcode
///
/// @subsection UserManualActionsMatchesPrefix Prefix Match
///
/// If the definition is
///
/// @code
/// { url: { match: "/hello/world/*" } }
/// @endcode
///
/// then the match can be a prefix match. The requests for @LIT{/hello/world},
/// @LIT{/hello/world/my}, and @LIT{/hello/world/how/are/you} will all
/// match. However @LIT{/hello/world2} does not match. Prefix matches within an
/// URL part, i. e. @LIT{/hello/world*}, are not allowed. The wildcard must
/// occur at the end, i. e.
///
/// @code
/// /hello/*/world
/// @endcode
///
/// is also disallowed.
///
/// If you define two routes
///
/// @code
/// { url: { match: "/hello/world/*" } }
/// { url: { match: "/hello/world/emil" } }
/// @endcode
///
/// then the second route will be used for @LIT{/hello/world/emil} because it is
/// more specific.
///
/// @subsection UserManualActionsMatchesParameterized Parameterized Match
///
/// A parameterized match is similar to a prefix match, but the parameters are
/// also allowed inside the URL path.
///
/// If the definition is
///
/// @code
/// { url: { match: "/hello/:name/world" } }
/// @endcode
///
/// then the URL must have three parts, the first part being @LIT{hello} and the
/// third part @LIT{world}. For example, @LIT{/hello/emil/world} will match,
/// while @LIT{/hello/emil/meyer/world} will not.
///
/// @subsection UserManualActionsMatchesConstraint Constraint Match
///
/// A constraint match is similar to a parameterized match, but the parameters
/// carries a constraint.
///
/// If the definition is
///
/// @code
/// { url: { match: "/hello/:name/world", constraint: { name: "/[a-z]+/" } }
/// @endcode
///
/// then the URL must have three parts, the first part being @LIT{hello} and the
/// third part @LIT{world}. The second part must be all lowercase.
///
/// It is possible to use more then one constraint for the same URL part.
///
/// @code
/// { url: { match: "/hello/:name|:id/world",
/// constraint: { name: "/[a-z]+/", id: "/[0-9]+/" } }
/// @endcode
///
/// @subsection UserManualActionsMatchesOptional Optional Match
///
/// An optional match is similar to a parameterized match, but the last
/// parameter is optional.
///
/// If the definition is
///
/// @code
/// { url: { match: "/hello/:name?", constraint: { name: "/[a-z]+/" } }
/// @endcode
///
/// then the URL @LIT{/hello} and @LIT{/hello/emil} will match.
///
/// If the definitions are
///
/// @code
/// { url: { match: "/hello/world" } }
/// { url: { match: "/hello/:name", constraint: { name: "/[a-z]+/" } }
/// { url: { match: "/hello/*" } }
/// @endcode
///
/// then the URL @LIT{/hello/world} will be matched by the first route, because it
/// is the most specific. The URL @LIT{/hello/you} will be matched by the second
/// route, because it is more specific than the prefix match.
///
/// @subsection UserManualActionsMatchesMethod Method Restriction
///
/// You can restrict the match to specific methods.
///
/// If the definition is
///
/// @code
/// { url: { match: "/hello/world", methods: [ "post", "put" ] }
/// @endcode
///
/// then only @LIT{POST} and @LIT{PUT} requests will match.
///
/// @subsection UserManualActionsMatching More on Matching
///
/// Remember that the more specific match wins.
///
/// - A match without parameter or wildcard is more specific than a match with
/// parameters or wildcard.
/// - A match with parameter is more specific than a match with a wildcard.
/// - If there is more than one parameter, specificity is applied from left to
/// right.
///
/// Consider the following definitions
///
/// @code
/// (1) { url: { match: "/hello/world" } }
/// (2) { url: { match: "/hello/:name", constraint: { name: "/[a-z]+/" } }
/// (3) { url: { match: "/:something/world" }
/// (4) { url: { match: "/hello/*" } }
/// @endcode
///
/// Then
///
/// - @LIT{/hello/world} is match by (1)
/// - @LIT{/hello/emil} is match by (2)
/// - @LIT{/your/world} is match by (3)
/// - @LIT{/hello/you} is match by (4)
///
/// You can write the following document into the @LIT{_routing} collection
/// to test the above examples.
///
/// @code
/// {
/// routes: [
/// { url: { match: "/hello/world" }, content: "route 1" },
/// { url: { match: "/hello/:name|:id", constraint: { name: "/[a-z]+/", id: "/[0-9]+/" } }, content: "route 2" },
/// { url: { match: "/:something/world" }, content: "route 3" },
/// { url: { match: "/hello/*" }, content: "route 4" },
/// ]
/// }
/// @endcode
///
/// @section UserManualActionsHelloJson A Hello World Example for JSON /// @section UserManualActionsHelloJson A Hello World Example for JSON
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
/// ///
@ -478,8 +676,8 @@
/// ///
/// @code /// @code
/// arangosh> db._routing.save({ /// arangosh> db._routing.save({
/// ........> path: "/hello/json", /// ........> url: "/hello/json",
/// ........> callback: { /// ........> content: {
/// ........> contentType: "application/json", /// ........> contentType: "application/json",
/// ........> body: "{ \"hello\" : \"world\" }" }}); /// ........> body: "{ \"hello\" : \"world\" }" }});
/// arangosh> require("internal").reloadRouting() /// arangosh> require("internal").reloadRouting()
@ -500,12 +698,163 @@
/// { "hello" : "world" } /// { "hello" : "world" }
/// @endcode /// @endcode
/// ///
/// @section UserManualActionsEcho A Dynamic Example /// @section UserManualActionsContent Delivering Content
//////////////////////////////////////////////////// ////////////////////////////////////////////////////////
/// ///
/// The above examples deliver static content, which is fine for an example. /// There are a lot of different ways on how to deliver content. We have already
/// But the real power of actions lies in dynamic actions which use JavaScript /// seen the simplest one, where static content is delivered. The fun, however,
/// to construct the result. /// starts when delivering dynamic content.
///
/// @subsection UserManualActionsContentStatic Static Content
///
/// You can specify a body and a content-type.
///
/// @code
/// { content: {
/// contentType: "text/html",
/// body: "<html><body>Hallo World</body></html>"
/// }
/// }
/// @endcode
///
/// If the content type is @LIT{text/plain} then you can use the short-cut
///
/// @code
/// { content: "Hallo World" }
/// @endcode
///
/// @subsection UserManualActionsContentAction A Simple Action
///
/// The simplest dynamic action is:
///
/// @code
/// { action: "org/arangodb/actions/echoRequest" }
/// @endcode
///
/// 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 accessed from JavaScript as:
///
/// @LIT{require("org/arangodb/actions").echoRequest}
///
/// The function @LIT{echoRequest} is pre-defined. It takes the request objects
/// and echos it in the response.
///
/// The signature of such a function must be
///
/// @code
/// function (req, res, next, options)
/// @endcode
///
/// For example
///
/// @code
/// arangosh> db._routing.save({
/// ........> url: "/hello/echo",
/// ........> action: "org/arangodb/actions/echoRequest" });
/// @endcode
///
/// Reload the routing and check
///
/// @LIT{http://127.0.0.1:8529/hello/echo}
///
/// You should see something like
///
/// @code
/// {
/// "request": {
/// "path": "/hello/echo",
/// "headers": {
/// "accept-encoding": "gzip, deflate",
/// "accept-language": "de-de,de;q=0.8,en-us;q=0.5,en;q=0.3",
/// "connection": "keep-alive",
/// "content-length": "0",
/// "host": "localhost:8529",
/// "user-agent": "Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0"
/// },
/// "requestType": "GET",
/// "parameters": { }
/// },
/// "options": { }
/// }
/// @endcode
///
/// The request might contain @LIT{path}, @LIT{prefix}, @LIT{suffix}, and
/// @LIT{urlParameters} attributes. @LIT{path} is the complete path as supplied
/// by the user and always available. If a prefix was matched, then this prefix
/// is stored in the attribute @LIT{prefix} and the remaining URL parts are
/// stored as an array in @LIT{suffix}. If one or more parameters were matched,
/// then the parameter values are stored in @LIT{urlParameters}.
///
/// For example, if the url description is
///
/// @code
/// { url: { match: "/hello/:name/:action" } }
/// @endcode
///
/// and you request the path @LIT{/hello/emil/jump}, then the request object
/// will contain the following attribute
///
/// @code
/// urlParameters: { name: "emil", action: "jump" } }
/// @endcode
///
/// @subsection UserManualActionsContentController Action Controller
///
/// As an alternative to the simple action, you can use controllers. A
/// controller is a module, defines the function @LIT{get}, @LIT{put},
/// @LIT{post}, @LIT{delete}, @LIT{head}, @LIT{patch}. If a request of
/// the corresponding type is matched, the function will be called.
///
/// For example
///
/// @code
/// arangosh> db._routing.save({
/// ........> url: "/hello/echo",
/// ........> action: { controller: "org/arangodb/actions/echoController" } });
/// @endcode
///
/// @subsection UserManualActionsContentPrefix Prefix Action Controller
///
/// The controller is selected when the definition is read. There is a
/// more flexible, but slower and maybe insecure variant, the prefix
/// controller.
///
/// Assume that the url is a prefix match
///
/// @code
/// { url: { match: /hello/*" } }
/// @endcode
///
/// You can use
///
/// @code
/// { prefixController: "org/arangodb/actions" }
/// @endcode
///
/// to define a prefix controller. If the URL @LIT{/hello/echoController} is
/// given, then the module @LIT{org/arangodb/actions/echoController} is used.
///
/// If you use an prefix controller, you should make certain that no unwanted
/// actions are available under the prefix.
///
/// @subsection UserManualActionsContentMethod Method Restriction
///
/// You can restrict the match to specific methods.
///
/// If the definition is
///
/// @code
/// { controller: "org/arangodb/actions/echoController", methods: [ "post", "put" ] }
/// @endcode
///
/// then only @LIT{POST} and @LIT{PUT} requests will match.
///
/// @section UserManualActionsReqRes Requests and Responses
///////////////////////////////////////////////////////////
///
/// The controller must define handler functions which take a request object and
/// fill the response object.
/// ///
/// A very simple example is the function @LIT{echoRequest} defined in /// A very simple example is the function @LIT{echoRequest} defined in
/// the module @LIT{org/arangodb/actions}. /// the module @LIT{org/arangodb/actions}.
@ -522,21 +871,12 @@
/// } /// }
/// @endcode /// @endcode
/// ///
/// That functions accepts a request and returns this request as JSON object. /// Install it as
///
/// 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 accessed from JavaScript as:
///
/// @LIT{require("org/arangodb/actions").echoRequest}
///
/// You can use it in the routing collection by specifying the name
/// @LIT{"org/arangodb/actions/echoRequest"}.
/// ///
/// @code /// @code
/// arangosh> db._routing.save({ /// arangosh> db._routing.save({
/// ........> path: "/hello/echo", /// ........> url: "/echo",
/// ........> callback: "org/arangodb/actions/echoRequest" }); /// ........> action: "org/arangodb/actions/echoRequest" });
/// @endcode /// @endcode
/// ///
/// Reload the routing and check /// Reload the routing and check
@ -569,30 +909,30 @@
/// } /// }
/// @endcode /// @endcode
/// ///
/// Please note that /// Note that
/// ///
/// @code /// @code
/// arangosh> db._routing.save({ /// arangosh> db._routing.save({
/// ........> path: "/hello/echo", /// ........> url: "/echo",
/// ........> callback: "org/arangodb/actions/echoRequest" }); /// ........> action: "org/arangodb/actions/echoRequest" });
/// @endcode /// @endcode
/// ///
/// is a short-cut for /// is a short-cut for
/// ///
/// @code /// @code
/// arangosh> db._routing.save({ /// arangosh> db._routing.save({
/// ........> path: "/hello/echo-long", /// ........> url: "/echo",
/// ........> callback: { /// ........> action: { do: "org/arangodb/actions/echoRequest" } });
/// ........> for: "org/arangodb/actions",
/// ........> do: "echoRequest" }});
/// @endcode /// @endcode
/// ///
/// The verbose form allows you to pass options to the called function: /// The latter form allows you to pass options to the called function:
/// ///
/// @code /// @code
/// arangosh> a = db._routing.firstExample({path: "/hello/echo-long"}); /// arangosh> db._routing.save({
/// arangosh> a.callback.options = { option: "my option1" }; /// ........> url: "/echo",
/// arangosh> db._replace(a, a); /// ........> action: {
/// ........> do: "org/arangodb/actions/echoRequest",
/// ........> options: { "Hallo": "World" } } });
/// @endcode /// @endcode
/// ///
/// You should now see the options in the result. /// You should now see the options in the result.
@ -609,91 +949,61 @@
/// } /// }
/// @endcode /// @endcode
/// ///
/// @section UserManualActionsDYO Define Your Own Callback
//////////////////////////////////////////////////////////
///
/// You can define your own callbacks by adding a new module to ArangoDB. In
/// order to avoid name clashes modules should be named
///
/// @LIT{tld/domain/modulename}
///
/// where @LIT{domain.tld} is your domain name. For development you can store
/// your code in files in the filesystem, see @ref MODULES_PATH and
/// @ref MODULES.
///
/// However, when you are finished with the development, you can rollout the
/// module code by storing it inside the @LIT{_modules} collection.
///
/// Create a file @LIT{hello-world.js} with the following content:
///
/// @code
/// var actions = require("org/arangodb/actions");
///
/// exports.helloWorld = function (req, res) {
/// res.contentType = "text/html";
/// res.responseCode = actions.HTTP_OK;
/// res.body = "<html><body>Hello World!</body></html>";
/// };
/// @endcode
///
/// Load this file as new module @LIT{de/celler/hello-world} into the database
///
/// @code
/// arangosh> require("internal").defineModule("de/celler/hello-world", "hello-world.js");
/// @endcode
///
/// Define a corresponding routing
///
/// @code
/// arangosh> db._routing.save({
/// ........> path: "/my/echo",
/// ........> callback: "de/celler/hello-world/helloWorld" });
/// arangosh> require("internal").reloadRouting()
/// @endcode
///
/// and check it
///
/// @LIT{http://localhost:8529/my/echo}
///
/// @section UserManualActionsAdvanced Advanced Usages /// @section UserManualActionsAdvanced Advanced Usages
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
/// ///
/// For detailed information see the reference manual. /// For detailed information see the reference manual.
/// ///
/// @subsection UserManualActionsAdvancedPrefix Using Prefixes /// @subsection UserManualActionsAdvancedRedirects Redirects
//////////////////////////////////////////////////////////////
/// ///
/// All the above definitions require an exact match. If you set the /// Use the following for a permanent redirect:
/// @LIT{prefix} attribute to @LIT{true}, additional paths are ignored and the
/// URL also results in a match.
/// ///
/// @code /// @code
/// arangosh> db._routing.save({ /// arangosh> db._routing.save({
/// ........> path: "/hello", /// ........> url: "/",
/// ........> prefix: true, /// ........> action: {
/// ........> callback: "org/arangodb/actions/echoRequest" }); /// ........> do: "org/arangodb/actions/redirectRequest",
/// ........> options: {
/// ........> permanently: true,
/// ........> destination: "http://somewhere.else/" } } });
/// @endcode /// @endcode
/// ///
/// Now try /// @subsection UserManualActionsAdvancedBundles Routing Bundles
/// ///
/// @LIT{http://localhost:8529/hello/this/is/ignored/but/available/in/path} /// Instead of adding all routes for package separately, you can
/// /// specify a bundle.
/// The complete path is available in the @LIT{path} attribute, while the
/// matched prefix is available in the @LIT{prefix} attribute.
/// ///
/// @code /// @code
/// { /// {
/// "request": { /// routes: [
/// "prefix": "/hello", /// { url: "/url1", content: "..." },
/// "path": "/hello/this/is/ignored/but/available/in/path", /// { url: "/url2", content: "..." },
/// ... /// { url: "/url3", content: "..." },
/// }, /// ...
/// "options": { } /// ]
/// } /// }
/// @endcode /// @endcode
/// ///
/// The advantage is, that you can put all your routes into one document
/// and use a common prefix.
///
/// @code
/// {
/// urlPrefix: "/test",
///
/// routes: [
/// { url: "/url1", content: "..." },
/// { url: "/url2", content: "..." },
/// { url: "/url3", content: "..." },
/// ...
/// ]
/// }
/// @endcode
///
/// will define the URL @LIT{/test/url1}, @LIT{/test/url2}, and
/// @LIT{/test/url3}.
///
/// @subsection UserManualActionsAdvancedMiddleware Writing Middleware /// @subsection UserManualActionsAdvancedMiddleware Writing Middleware
//////////////////////////////////////////////////////////////////////
/// ///
/// Assume, you want to log every request. In this case you can easily define /// Assume, you want to log every request. In this case you can easily define
/// an action for the whole url-space @LIT{/}. This action simply logs /// an action for the whole url-space @LIT{/}. This action simply logs
@ -713,23 +1023,10 @@
/// ///
/// @code /// @code
/// arangosh> db._routing.save({ /// arangosh> db._routing.save({
/// ........> path: "/", /// ........> middleware: [
/// ........> topdown: true, /// ........> { url: { match: "/*" }, action: "org/arangodb/actions/logRequest" }
/// ........> prefix: true, /// ........> ]
/// ........> callback: "org/arangodb/actions/logRequest" }); /// ........> });
/// @endcode
///
/// @subsection UserManualActionsAdvancedeRedirect Redirects
////////////////////////////////////////////////////////////
///
/// Use the following for a permanent redirect:
///
/// @code
/// arangosh> db._routing.save({
/// ........> path: "/",
/// ........> topdown: true,
/// ........> prefix: true,
/// ........> callback: { redirect: "http://somewhere.else.org/hallo" });
/// @endcode /// @endcode
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -740,5 +1037,5 @@
// Local Variables: // Local Variables:
// mode: c++ // mode: c++
// mode: outline-minor // mode: outline-minor
// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)" // outline-regexp: "\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @section\\|/// @subsection\\|/// @\\}\\)"
// End: // End:

144
config/config.guess vendored
View File

@ -138,6 +138,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}" in
i?86)
test -z "$VENDOR" && VENDOR=pc
;;
*)
test -z "$VENDOR" && VENDOR=unknown
;;
esac
test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
# Note: order is significant - the case branches are not exclusive. # Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@ -202,19 +212,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;; exit ;;
*:OpenBSD:*:*) *:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
exit ;; exit ;;
*:ekkoBSD:*:*) *:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
exit ;; exit ;;
*:SolidBSD:*:*) *:SolidBSD:*:*)
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
exit ;; exit ;;
macppc:MirBSD:*:*) macppc:MirBSD:*:*)
echo powerpc-unknown-mirbsd${UNAME_RELEASE} echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
exit ;; exit ;;
*:MirBSD:*:*) *:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
exit ;; exit ;;
alpha:OSF1:*:*) alpha:OSF1:*:*)
case $UNAME_RELEASE in case $UNAME_RELEASE in
@ -282,13 +292,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo alpha-dec-winnt3.5 echo alpha-dec-winnt3.5
exit ;; exit ;;
Amiga*:UNIX_System_V:4.0:*) Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4 echo m68k-${VENDOR}-sysv4
exit ;; exit ;;
*:[Aa]miga[Oo][Ss]:*:*) *:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos echo ${UNAME_MACHINE}-${VENDOR}-amigaos
exit ;; exit ;;
*:[Mm]orph[Oo][Ss]:*:*) *:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos echo ${UNAME_MACHINE}-${VENDOR}-morphos
exit ;; exit ;;
*:OS/390:*:*) *:OS/390:*:*)
echo i370-ibm-openedition echo i370-ibm-openedition
@ -303,7 +313,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo arm-acorn-riscix${UNAME_RELEASE} echo arm-acorn-riscix${UNAME_RELEASE}
exit ;; exit ;;
arm:riscos:*:*|arm:RISCOS:*:*) arm:riscos:*:*|arm:RISCOS:*:*)
echo arm-unknown-riscos echo arm-${VENDOR}-riscos
exit ;; exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp echo hppa1.1-hitachi-hiuxmpp
@ -411,7 +421,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo m68k-hades-mint${UNAME_RELEASE} echo m68k-hades-mint${UNAME_RELEASE}
exit ;; exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE} echo m68k-${VENDOR}-mint${UNAME_RELEASE}
exit ;; exit ;;
m68k:machten:*:*) m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE} echo m68k-apple-machten${UNAME_RELEASE}
@ -722,9 +732,9 @@ EOF
exit ;; exit ;;
i*86:OSF1:*:*) i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
else else
echo ${UNAME_MACHINE}-unknown-osf1 echo ${UNAME_MACHINE}-${VENDOR}-osf1
fi fi
exit ;; exit ;;
parisc*:Lites*:*:*) parisc*:Lites*:*:*)
@ -784,18 +794,18 @@ EOF
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;; exit ;;
sparc*:BSD/OS:*:*) sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE} echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
exit ;; exit ;;
*:BSD/OS:*:*) *:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
exit ;; exit ;;
*:FreeBSD:*:*) *:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p` UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in case ${UNAME_PROCESSOR} in
amd64) amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*) *)
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac esac
exit ;; exit ;;
i*:CYGWIN*:*) i*:CYGWIN*:*)
@ -820,10 +830,10 @@ EOF
echo i586-pc-interix${UNAME_RELEASE} echo i586-pc-interix${UNAME_RELEASE}
exit ;; exit ;;
authenticamd | genuineintel | EM64T) authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE} echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
exit ;; exit ;;
IA64) IA64)
echo ia64-unknown-interix${UNAME_RELEASE} echo ia64-${VENDOR}-interix${UNAME_RELEASE}
exit ;; exit ;;
esac ;; esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@ -842,31 +852,31 @@ EOF
echo ${UNAME_MACHINE}-pc-uwin echo ${UNAME_MACHINE}-pc-uwin
exit ;; exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin echo x86_64-${VENDOR}-cygwin
exit ;; exit ;;
p*:CYGWIN*:*) p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin echo powerpcle-${VENDOR}-cygwin
exit ;; exit ;;
prep*:SunOS:5.*:*) prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;; exit ;;
*:GNU:*:*) *:GNU:*:*)
# the GNU system # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;; exit ;;
*:GNU/*:*:*) *:GNU/*:*:*)
# other systems with GNU libc and userland # other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;; exit ;;
i*86:Minix:*:*) i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix echo ${UNAME_MACHINE}-pc-minix
exit ;; exit ;;
aarch64:Linux:*:*) aarch64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
aarch64_be:Linux:*:*) aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be UNAME_MACHINE=aarch64_be
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
alpha:Linux:*:*) alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@ -880,26 +890,26 @@ EOF
esac esac
objdump --private-headers /bin/sh | grep -q ld.so.1 objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
exit ;; exit ;;
arm*:Linux:*:*) arm*:Linux:*:*)
eval $set_cc_for_build eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__ | grep -q __ARM_EABI__
then then
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
else else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP | grep -q __ARM_PCS_VFP
then then
echo ${UNAME_MACHINE}-unknown-linux-gnueabi echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
else else
echo ${UNAME_MACHINE}-unknown-linux-gnueabihf echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabihf
fi fi
fi fi
exit ;; exit ;;
avr32*:Linux:*:*) avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
cris:Linux:*:*) cris:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-gnu echo ${UNAME_MACHINE}-axis-linux-gnu
@ -908,10 +918,10 @@ EOF
echo ${UNAME_MACHINE}-axis-linux-gnu echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;; exit ;;
frv:Linux:*:*) frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
hexagon:Linux:*:*) hexagon:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
i*86:Linux:*:*) i*86:Linux:*:*)
LIBC=gnu LIBC=gnu
@ -925,13 +935,13 @@ EOF
echo "${UNAME_MACHINE}-pc-linux-${LIBC}" echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;; exit ;;
ia64:Linux:*:*) ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
m32r*:Linux:*:*) m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
m68*:Linux:*:*) m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
mips:Linux:*:* | mips64:Linux:*:*) mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build eval $set_cc_for_build
@ -950,54 +960,54 @@ EOF
#endif #endif
EOF EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
;; ;;
or32:Linux:*:*) or32:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
padre:Linux:*:*) padre:Linux:*:*)
echo sparc-unknown-linux-gnu echo sparc-${VENDOR}-linux-gnu
exit ;; exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*) parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu echo hppa64-${VENDOR}-linux-gnu
exit ;; exit ;;
parisc:Linux:*:* | hppa:Linux:*:*) parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level # Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
PA7*) echo hppa1.1-unknown-linux-gnu ;; PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
PA8*) echo hppa2.0-unknown-linux-gnu ;; PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;; *) echo hppa-${VENDOR}-linux-gnu ;;
esac esac
exit ;; exit ;;
ppc64:Linux:*:*) ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu echo powerpc64-${VENDOR}-linux-gnu
exit ;; exit ;;
ppc:Linux:*:*) ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu echo powerpc-${VENDOR}-linux-gnu
exit ;; exit ;;
s390:Linux:*:* | s390x:Linux:*:*) s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux echo ${UNAME_MACHINE}-ibm-linux
exit ;; exit ;;
sh64*:Linux:*:*) sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
sh*:Linux:*:*) sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*) sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
tile*:Linux:*:*) tile*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
vax:Linux:*:*) vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;; exit ;;
x86_64:Linux:*:*) x86_64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
xtensa*:Linux:*:*) xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;; exit ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@ -1019,16 +1029,16 @@ EOF
echo ${UNAME_MACHINE}-pc-os2-emx echo ${UNAME_MACHINE}-pc-os2-emx
exit ;; exit ;;
i*86:XTS-300:*:STOP) i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop echo ${UNAME_MACHINE}-${VENDOR}-stop
exit ;; exit ;;
i*86:atheos:*:*) i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos echo ${UNAME_MACHINE}-${VENDOR}-atheos
exit ;; exit ;;
i*86:syllable:*:*) i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable echo ${UNAME_MACHINE}-pc-syllable
exit ;; exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE} echo i386-${VENODR}-lynxos${UNAME_RELEASE}
exit ;; exit ;;
i*86:*DOS:*:*) i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp echo ${UNAME_MACHINE}-pc-msdosdjgpp
@ -1048,7 +1058,7 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;; *Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit ;; exit ;;
i*86:*:3.2:*) i*86:*:3.2:*)
if test -f /usr/options/cb.name; then if test -f /usr/options/cb.name; then
@ -1087,7 +1097,7 @@ EOF
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered. else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 echo i860-${VENODR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi fi
exit ;; exit ;;
mini*:CTIX:SYS*5:*) mini*:CTIX:SYS*5:*)
@ -1124,19 +1134,19 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE} echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;; exit ;;
mc68030:UNIX_System_V:4.*:*) mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4 echo m68k-atari-sysv4
exit ;; exit ;;
TSUNAMI:LynxOS:2.*:*) TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE} echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;; exit ;;
rs6000:LynxOS:2.*:*) rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE} echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;; exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE} echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
exit ;; exit ;;
SM[BE]S:UNIX_SV:*:*) SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE} echo mips-dde-sysv${UNAME_RELEASE}
@ -1186,7 +1196,7 @@ EOF
if [ -d /usr/nec ]; then if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE} echo mips-nec-sysv${UNAME_RELEASE}
else else
echo mips-unknown-sysv${UNAME_RELEASE} echo mips-${VENDOR}-sysv${UNAME_RELEASE}
fi fi
exit ;; exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@ -1280,13 +1290,13 @@ EOF
else else
UNAME_MACHINE="$cputype" UNAME_MACHINE="$cputype"
fi fi
echo ${UNAME_MACHINE}-unknown-plan9 echo ${UNAME_MACHINE}-${VENDOR}-plan9
exit ;; exit ;;
*:TOPS-10:*:*) *:TOPS-10:*:*)
echo pdp10-unknown-tops10 echo pdp10-${VENDOR}-tops10
exit ;; exit ;;
*:TENEX:*:*) *:TENEX:*:*)
echo pdp10-unknown-tenex echo pdp10-${VENDOR}-tenex
exit ;; exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20 echo pdp10-dec-tops20
@ -1295,16 +1305,16 @@ EOF
echo pdp10-xkl-tops20 echo pdp10-xkl-tops20
exit ;; exit ;;
*:TOPS-20:*:*) *:TOPS-20:*:*)
echo pdp10-unknown-tops20 echo pdp10-${VENDOR}-tops20
exit ;; exit ;;
*:ITS:*:*) *:ITS:*:*)
echo pdp10-unknown-its echo pdp10-${VENDOR}-its
exit ;; exit ;;
SEI:*:*:SEIUX) SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE} echo mips-sei-seiux${UNAME_RELEASE}
exit ;; exit ;;
*:DragonFly:*:*) *:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;; exit ;;
*:*VMS:*:*) *:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null` UNAME_MACHINE=`(uname -p) 2>/dev/null`
@ -1326,7 +1336,7 @@ EOF
echo ${UNAME_MACHINE}-pc-aros echo ${UNAME_MACHINE}-pc-aros
exit ;; exit ;;
x86_64:VMkernel:*:*) x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx echo ${UNAME_MACHINE}-${VENDOR}-esx
exit ;; exit ;;
esac esac

8
config/config.sub vendored
View File

@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc. # 2011, 2012 Free Software Foundation, Inc.
timestamp='2012-02-10' timestamp='2012-04-18'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
@ -225,6 +225,12 @@ case $os in
-isc*) -isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;; ;;
-lynx*178)
os=-lynxos178
;;
-lynx*5)
os=-lynxos5
;;
-lynx*) -lynx*)
os=-lynxos os=-lynxos
;; ;;

9
configure vendored
View File

@ -3168,12 +3168,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; } $as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
case $mkdir_p in
[\\/$]* | ?:[\\/]*) ;;
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
esac
for ac_prog in gawk mawk nawk awk for ac_prog in gawk mawk nawk awk
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
@ -3306,6 +3300,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
mkdir_p="$MKDIR_P"
# We need awk for the "check" target. The system "awk" is bad on # We need awk for the "check" target. The system "awk" is bad on
# some platforms. # some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used # Always define AMTAR for backward compatibility. Yes, it's still used
@ -9208,7 +9203,7 @@ if test "x$tr_MRUBY" = "xyes"; then
MRUBY_LDFLAGS="" MRUBY_LDFLAGS=""
MRUBY_LIBS="${srcdir}/3rdParty/mruby/lib/libmruby.a" MRUBY_LIBS="${srcdir}/3rdParty/mruby/lib/libmruby.a"
TRI_MRUBY_VERSION="2012-07-02 (ac5838ac67d489c5321ac9cb0e8d6e50c6c4fd6f)" TRI_MRUBY_VERSION="2012-09-20 (15cf8fdea4a6598aa470e698e8cbc9b9b492319d)"
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

52
js/actions/system/api-system.js
View File

@ -44,36 +44,31 @@ var actions = require("org/arangodb/actions");
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function Routing (req, res) { function Routing (req, res) {
var callbacks; var execute;
var current;
var i;
var next; var next;
callbacks = actions.routing(req.requestType, req.suffix); action = actions.firstRouting(req.requestType, req.suffix);
current = 0;
next = function () { execute = function () {
var callback; if (action.route === undefined) {
actions.resultNotImplemented(req, res, "unknown path '" + req.suffix.join("/") + "'");
if (callbacks.length <= current) {
actions.resultNotImplemented(req, res,
"unknown path '" + req.suffix.join("/") + "'");
return; return;
} }
callback = callbacks[current++]; req.path = action.route.path;
req.prefix = action.prefix;
req.suffix = action.suffix;
req.urlParameters = action.urlParameters;
if (callback == null) { action.route.callback.controller(req, res, next, action.route.callback.options);
actions.resultNotImplemented(req, res,
"not implemented '" + req.suffix.join("/") + "'");
}
else {
req.prefix = callback.path;
callback.func(req, res, next, callback.options);
}
} }
next(); next = function () {
action = actions.nextRouting(action);
execute();
}
execute();
} }
actions.defineHttp({ actions.defineHttp({
@ -101,7 +96,7 @@ actions.defineHttp({
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
actions.defineHttp({ actions.defineHttp({
url : "_admin/reloadRouting", url : "_admin/routing/reload",
context : "admin", context : "admin",
prefix : false, prefix : false,
callback : function (req, res) { callback : function (req, res) {
@ -114,6 +109,19 @@ actions.defineHttp({
/// @brief returns system status information for the server /// @brief returns system status information for the server
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
actions.defineHttp({
url : "_admin/routing/routes",
context : "admin",
prefix : false,
callback : function (req, res) {
actions.resultOk(req, res, actions.HTTP_OK, actions.routingCache());
}
});
////////////////////////////////////////////////////////////////////////////////
/// @brief returns system status information for the server
////////////////////////////////////////////////////////////////////////////////
function AdminRedirect (req, res) { function AdminRedirect (req, res) {
var dest = "/_admin/html/index.html"; var dest = "/_admin/html/index.html";

16
js/client/client.js
View File

@ -407,10 +407,24 @@ function help () {
internal.reloadRouting = function () { internal.reloadRouting = function () {
if (typeof arango !== 'undefined') { if (typeof arango !== 'undefined') {
arango.POST("/_admin/reloadRouting", ""); arango.POST("/_admin/routing/reload", "");
} }
}; };
////////////////////////////////////////////////////////////////////////////////
/// @brief rebuilds the routing cache
////////////////////////////////////////////////////////////////////////////////
internal.routingCache = function () {
var result;
if (typeof arango !== 'undefined') {
result = arango.GET("/_admin/routing/routes", "");
}
return result;
};
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

16
js/client/js-client.h
View File

@ -408,11 +408,25 @@ static string JS_client_client =
"\n" "\n"
" internal.reloadRouting = function () {\n" " internal.reloadRouting = function () {\n"
" if (typeof arango !== 'undefined') {\n" " if (typeof arango !== 'undefined') {\n"
" arango.POST(\"/_admin/reloadRouting\", \"\");\n" " arango.POST(\"/_admin/routing/reload\", \"\");\n"
" }\n" " }\n"
" };\n" " };\n"
"\n" "\n"
"////////////////////////////////////////////////////////////////////////////////\n" "////////////////////////////////////////////////////////////////////////////////\n"
"/// @brief rebuilds the routing cache\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"\n"
" internal.routingCache = function () {\n"
" var result;\n"
"\n"
" if (typeof arango !== 'undefined') {\n"
" result = arango.GET(\"/_admin/routing/routes\", \"\");\n"
" }\n"
"\n"
" return result;\n"
" };\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"/// @}\n" "/// @}\n"
"////////////////////////////////////////////////////////////////////////////////\n" "////////////////////////////////////////////////////////////////////////////////\n"
"\n" "\n"

1032
js/server/modules/org/arangodb/actions.js
View File

File diff suppressed because it is too large Load Diff

49
js/server/modules/org/arangodb/actions/echoController.js Normal file
View File

@ -0,0 +1,49 @@
////////////////////////////////////////////////////////////////////////////////
/// @brief example controller
///
/// @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 actions = require("org/arangodb/actions");
exports.head = function (req, res, next, options) {
res.responseCode = actions.HTTP_OK;
res.contentType = "application/json; charset=utf-8";
res.body = "";
}
exports.do = function (req, res, next, options) {
res.responseCode = actions.HTTP_OK;
res.contentType = "application/json; charset=utf-8";
res.body = JSON.stringify(req);
}
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// Local Variables:
// mode: outline-minor
// outline-regexp: "\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
// End:

478
js/server/tests/routing.js Normal file
View File

@ -0,0 +1,478 @@
////////////////////////////////////////////////////////////////////////////////
/// @brief tests for routing
///
/// @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 2012, triAGENS GmbH, Cologne, Germany
////////////////////////////////////////////////////////////////////////////////
var actions = require("org/arangodb/actions");
var internal = require("internal");
var jsunity = require("jsunity");
// -----------------------------------------------------------------------------
// --SECTION-- test suite
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @brief single patterns routing
////////////////////////////////////////////////////////////////////////////////
function routingSuiteSingle () {
var errors = internal.errors;
var cn = "_routing";
return {
////////////////////////////////////////////////////////////////////////////////
/// @brief set up
////////////////////////////////////////////////////////////////////////////////
setUp : function () {
internal.db._drop(cn);
collection = internal.db._create(cn, { isSystem: true });
collection.save({
url: { match: "/hello/world" },
content: "c1"
});
collection.save({
url: "/world/hello",
content: "c2"
});
collection.save({
url: "/prefix/hello/*",
content: "c3"
});
collection.save({
url: { match: "/param/:hello/world", constraint: { hello: "[0-9]+" } },
content: "c4"
});
collection.save({
url: { match: "/opt/:hello?", constraint: { hello: "[0-9]+" }, methods: [ 'get' ] },
content: "c5"
});
collection.save({
url: "/json",
content: { contentType: "application/json", body: '{"text": "c6"}' }
});
collection.save({
url: "/p/h/*",
content: "p1"
});
collection.save({
url: "/p/h",
content: "p2"
});
actions.reloadRouting();
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing
////////////////////////////////////////////////////////////////////////////////
testSimpleRouting: function () {
var r = actions.firstRouting('GET', "/hello/world");
assertEqual('c1', r.route.route.content);
assertEqual('/hello/world', r.route.path);
assertEqual(undefined, r.prefix);
assertEqual(undefined, r.suffix);
r = actions.nextRouting(r);
assertEqual(undefined, r.route);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing (sort-cut for match)
////////////////////////////////////////////////////////////////////////////////
testSimpleRoutingShort: function () {
var r = actions.firstRouting('GET', "/world/hello");
assertEqual('c2', r.route.route.content);
assertEqual('/world/hello', r.route.path);
assertEqual(undefined, r.prefix);
assertEqual(undefined, r.suffix);
r = actions.nextRouting(r);
assertEqual(undefined, r.route);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing (prefix)
////////////////////////////////////////////////////////////////////////////////
testSimpleRoutingPrefix: function () {
var r = actions.firstRouting('GET', "/prefix/hello/world");
assertEqual('c3', r.route.route.content);
assertEqual('/prefix/hello(/[^/]+)*', r.route.path);
assertEqual('/prefix/hello', r.prefix);
assertEqual(['world'], r.suffix);
r = actions.nextRouting(r);
assertEqual(undefined, r.route);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing (parameter)
////////////////////////////////////////////////////////////////////////////////
testSimpleRoutingParameter: function () {
var r = actions.firstRouting('GET', "/param/12345/world");
assertEqual('c4', r.route.route.content);
assertEqual('/param/[0-9]+/world', r.route.path);
assertEqual(undefined, r.prefix);
assertEqual(undefined, r.suffix);
r = actions.nextRouting(r);
assertEqual(undefined, r.route);
r = actions.firstRouting('GET', "/param/a12345/world");
assertEqual(undefined, r.route);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing (optional)
////////////////////////////////////////////////////////////////////////////////
testSimpleRoutingOptional: function () {
var r = actions.firstRouting('GET', "/opt/12345");
assertEqual('c5', r.route.route.content);
assertEqual('/opt(/[0-9]+)?', r.route.path);
assertEqual(undefined, r.prefix);
assertEqual(undefined, r.suffix);
r = actions.nextRouting(r);
assertEqual(undefined, r.route);
r = actions.firstRouting('GET', "/opt");
assertEqual('c5', r.route.route.content);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing (optional)
////////////////////////////////////////////////////////////////////////////////
testSimpleRoutingMethod: function () {
var r = actions.firstRouting('HEAD', "/opt/12345");
assertEqual(undefined, r.route);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing (prefix vs non-prefix)
////////////////////////////////////////////////////////////////////////////////
testSimpleRoutingNonPrefix: function () {
var r = actions.firstRouting('GET', "/p/h");
assertEqual('p2', r.route.route.content);
assertEqual('/p/h', r.route.path);
assertEqual(undefined, r.prefix);
assertEqual(undefined, r.suffix);
r = actions.nextRouting(r);
assertEqual('/p/h(/[^/]+)*', r.route.path);
assertEqual('/p/h', r.prefix);
assertEqual([], r.suffix);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: content string
////////////////////////////////////////////////////////////////////////////////
testContentString: function () {
var r = actions.firstRouting('GET', "/opt/12345");
req = {};
res = {};
r.route.callback.controller(req, res);
assertEqual(actions.HTTP_OK, res.responseCode);
assertEqual("text/plain", res.contentType);
assertEqual("c5", res.body);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: content json
////////////////////////////////////////////////////////////////////////////////
testContentJson: function () {
var r = actions.firstRouting('GET', "/json");
req = {};
res = {};
r.route.callback.controller(req, res);
assertEqual(actions.HTTP_OK, res.responseCode);
assertEqual("application/json", res.contentType);
assertEqual('{"text": "c6"}', res.body);
}
};
}
// -----------------------------------------------------------------------------
// --SECTION-- test suite
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @brief bundle without prefix
////////////////////////////////////////////////////////////////////////////////
function routingSuiteBundle () {
var errors = internal.errors;
var cn = "_routing";
return {
////////////////////////////////////////////////////////////////////////////////
/// @brief set up
////////////////////////////////////////////////////////////////////////////////
setUp : function () {
internal.db._drop(cn);
collection = internal.db._create(cn, { isSystem: true });
collection.save({
middleware: [
{ url: { match: "/*" }, content: "m1" },
{ url: { match: "/hello/*" }, content: "m2" },
{ url: { match: "/hello/world" }, content: "m3" },
{ url: { match: "/:name/world" }, content: "m4" }
],
routes: [
{ url: { match: "/*" }, content: "c1" },
{ url: { match: "/hello/*" }, content: "c2" },
{ url: { match: "/hello/world" }, content: "c3" },
{ url: { match: "/hello/:name|:id", constraint: { name: "/[a-z]+/", id: "/[0-9]+/" } }, content: "c4" },
{ url: { match: "/hello/:name/:id", constraint: { name: "/[a-z]+/", id: "/[0-9]+/" } }, content: "c5" },
{ url: { match: "/:name/world" }, content: "c6" },
{ url: { match: "/hello" }, content: "c7" }
]
});
actions.reloadRouting();
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: routing cache
////////////////////////////////////////////////////////////////////////////////
testRoutingCache: function () {
var cache = actions.routingCache();
assertEqual(3, cache.routes.GET.exact.hello.parameters.length);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing
////////////////////////////////////////////////////////////////////////////////
testSimpleRouting: function () {
var r = actions.firstRouting('GET', "/hello/world");
assertEqual('m1', r.route.route.content);
assertEqual('(/[^/]+)*', r.route.path);
// middleware: unspecific to specific
r = actions.nextRouting(r);
assertEqual('m4', r.route.route.content);
assertEqual('/[^/]+/world', r.route.path);
r = actions.nextRouting(r);
assertEqual('m2', r.route.route.content);
assertEqual('/hello(/[^/]+)*', r.route.path);
r = actions.nextRouting(r);
assertEqual('m3', r.route.route.content);
assertEqual('/hello/world', r.route.path);
// routing: specific to unspecific
r = actions.nextRouting(r);
assertEqual('c3', r.route.route.content);
assertEqual('/hello/world', r.route.path);
r = actions.nextRouting(r);
assertEqual('c4', r.route.route.content);
assertEqual(1, r.route.urlParameters.name);
assertEqual('/hello/[a-z]+', r.route.path);
r = actions.nextRouting(r);
assertEqual('c2', r.route.route.content);
assertEqual('/hello(/[^/]+)*', r.route.path);
r = actions.nextRouting(r);
assertEqual('c6', r.route.route.content);
assertEqual('/[^/]+/world', r.route.path);
r = actions.nextRouting(r);
assertEqual('c1', r.route.route.content);
assertEqual('(/[^/]+)*', r.route.path);
r = actions.nextRouting(r);
assertEqual(undefined, r.route);
}
};
}
// -----------------------------------------------------------------------------
// --SECTION-- test suite
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @brief bundle with prefix
////////////////////////////////////////////////////////////////////////////////
function routingSuitePrefix () {
var errors = internal.errors;
var cn = "_routing";
return {
////////////////////////////////////////////////////////////////////////////////
/// @brief set up
////////////////////////////////////////////////////////////////////////////////
setUp : function () {
internal.db._drop(cn);
collection = internal.db._create(cn, { isSystem: true });
collection.save({
urlPrefix: "/test",
middleware: [
{ url: { match: "/*" }, content: "m1" },
{ url: { match: "/hello/*" }, content: "m2" },
{ url: { match: "/hello/world" }, content: "m3" },
{ url: { match: "/:name/world" }, content: "m4" }
],
routes: [
{ url: { match: "/*" }, content: "c1" },
{ url: { match: "/hello/*" }, content: "c2" },
{ url: { match: "/hello/world" }, content: "c3" },
{ url: { match: "/hello/:name|:id", constraint: { name: "/[a-z]+/", id: "/[0-9]+/" } }, content: "c4" },
{ url: { match: "/hello/:name/:id", constraint: { name: "/[a-z]+/", id: "/[0-9]+/" } }, content: "c5" },
{ url: { match: "/:name/world" }, content: "c6" },
{ url: { match: "/hello" }, content: "c7" }
]
});
actions.reloadRouting();
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: routing cache
////////////////////////////////////////////////////////////////////////////////
testRoutingCache: function () {
var cache = actions.routingCache();
assertEqual(3, cache.routes.GET.exact.test.exact.hello.parameters.length);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test: simple routing
////////////////////////////////////////////////////////////////////////////////
testSimpleRouting: function () {
var r = actions.firstRouting('GET', "/test/hello/world");
assertEqual('m1', r.route.route.content);
assertEqual('/test(/[^/]+)*', r.route.path);
// middleware: unspecific to specific
r = actions.nextRouting(r);
assertEqual('m4', r.route.route.content);
assertEqual('/test/[^/]+/world', r.route.path);
r = actions.nextRouting(r);
assertEqual('m2', r.route.route.content);
assertEqual('/test/hello(/[^/]+)*', r.route.path);
r = actions.nextRouting(r);
assertEqual('m3', r.route.route.content);
assertEqual('/test/hello/world', r.route.path);
// routing: specific to unspecific
r = actions.nextRouting(r);
assertEqual('c3', r.route.route.content);
assertEqual('/test/hello/world', r.route.path);
r = actions.nextRouting(r);
assertEqual('c4', r.route.route.content);
assertEqual(2, r.route.urlParameters.name);
assertEqual('/test/hello/[a-z]+', r.route.path);
r = actions.nextRouting(r);
assertEqual('c2', r.route.route.content);
assertEqual('/test/hello(/[^/]+)*', r.route.path);
r = actions.nextRouting(r);
assertEqual('c6', r.route.route.content);
assertEqual('/test/[^/]+/world', r.route.path);
r = actions.nextRouting(r);
assertEqual('c1', r.route.route.content);
assertEqual('/test(/[^/]+)*', r.route.path);
r = actions.nextRouting(r);
assertEqual(undefined, r.route);
}
};
}
// -----------------------------------------------------------------------------
// --SECTION-- main
// -----------------------------------------------------------------------------
////////////////////////////////////////////////////////////////////////////////
/// @brief executes the test suites
////////////////////////////////////////////////////////////////////////////////
jsunity.run(routingSuiteSingle);
jsunity.run(routingSuiteBundle);
jsunity.run(routingSuitePrefix);
return jsunity.done();
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// Local Variables:
// mode: outline-minor
// outline-regexp: "\\(/// @brief\\|/// @addtogroup\\|// --SECTION--\\|/// @page\\|/// @\\}\\)"
// End: