mirror of https://gitee.com/bigwinds/arangodb
Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.0-issue-165
This commit is contained in:
Frank Celler
commit
c637ac03b6
|
|
@ -1,4 +1,4 @@
|
|||
v1.0.1 (2012-XX-XX)
|
||||
v1.0.1 (2012-09-30)
|
||||
-------------------
|
||||
|
||||
* darft for issue #165: front-end application howto
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ Please follow these guidelines if you want to contribute to ArangoDB:
|
|||
* If the modifications change any documented behavior or add new features, document the changes. The documentation can be found in arangod/Documentation directory. To recreate the documentation locally, run make doxygen. This will re-create all documentation files in the Doxygen directory in your repository. You can inspect the documentation in this folder using a text editor or a browser
|
||||
* When done, run the complete test suite and make sure all tests pass
|
||||
* When finished, push the changes to your GitHub repository and send a pull request from your fork to the ArangoDB repository. Please make sure to select the appropriate branches there
|
||||
* You must use the Apache License for your changes
|
||||
|
||||
## Additional Resources
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
<?php include "../include/footer.php" ?>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<style type="text/css">
|
||||
div.line{
|
||||
font-family:monospace;
|
||||
white-space:pre;
|
||||
}
|
||||
</style>
|
||||
<?php include "../include/header.php" ?>
|
||||
|
|
@ -31,7 +31,7 @@ PROJECT_NAME = "ArangoDB"
|
|||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = 1.0.0
|
||||
PROJECT_NUMBER = 1.0.1
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ ALIASES += GE{1}="<b>\1</b>"
|
|||
ALIASES += EXAMPLES="<b>Examples</b><br>"
|
||||
ALIASES += EXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}@endlatexonly"
|
||||
ALIASES += TINYEXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}\renewcommand{\examplesize}{\tiny}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}\renewcommand{\examplesize}{\ttfamily}@endlatexonly"
|
||||
ALIASES += VERSION="1.0.0"
|
||||
ALIASES += VERSION="1.0.1"
|
||||
ALIASES += EMBEDTOC{1}="@ifnot LATEX<hr>@copydoc \1<hr>@endif"
|
||||
ALIASES += RESTHEADER{2}="@if LATEX@latexonly \vskip 0.5em\colorbox{gray}{@endlatexonly\1 (\2)@latexonly}\vskip 1em@endlatexonly@else <hr><em>\1</em> (\2)<hr><br>@endif"
|
||||
ALIASES += LATEXBREAK="@latexonly\vskip -0.5em\hskip 1.0em@endlatexonly"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ PROJECT_NAME = "ArangoDB"
|
|||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = 1.0.0
|
||||
PROJECT_NUMBER = 1.0.1
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ ALIASES += GE{1}="<b>\1</b>"
|
|||
ALIASES += EXAMPLES="<b>Examples</b><br>"
|
||||
ALIASES += EXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}@endlatexonly"
|
||||
ALIASES += TINYEXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}\renewcommand{\examplesize}{\tiny}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}\renewcommand{\examplesize}{\ttfamily}@endlatexonly"
|
||||
ALIASES += VERSION="1.0.0"
|
||||
ALIASES += VERSION="1.0.1"
|
||||
ALIASES += EMBEDTOC{1}="@ifnot LATEX<hr>@copydoc \1<hr>@endif"
|
||||
ALIASES += RESTHEADER{2}="@if LATEX@latexonly \vskip 0.5em\colorbox{gray}{@endlatexonly\1 (\2)@latexonly}\vskip 1em@endlatexonly@else <hr><em>\1</em> (\2)<hr><br>@endif"
|
||||
ALIASES += LATEXBREAK="@latexonly\vskip -0.5em\hskip 1.0em@endlatexonly"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ PROJECT_NAME = "ArangoDB"
|
|||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = 1.0.0
|
||||
PROJECT_NUMBER = 1.0.1
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ ALIASES += GE{1}="<b>\1</b>"
|
|||
ALIASES += EXAMPLES="<b>Examples</b><br>"
|
||||
ALIASES += EXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}@endlatexonly"
|
||||
ALIASES += TINYEXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}\renewcommand{\examplesize}{\tiny}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}\renewcommand{\examplesize}{\ttfamily}@endlatexonly"
|
||||
ALIASES += VERSION="1.0.0"
|
||||
ALIASES += VERSION="1.0.1"
|
||||
ALIASES += EMBEDTOC{1}="@ifnot LATEX<hr>@copydoc \1<hr>@endif"
|
||||
ALIASES += RESTHEADER{2}="@if LATEX@latexonly \vskip 0.5em\colorbox{gray}{@endlatexonly\1 (\2)@latexonly}\vskip 1em@endlatexonly@else <hr><em>\1</em> (\2)<hr><br>@endif"
|
||||
ALIASES += LATEXBREAK="@latexonly\vskip -0.5em\hskip 1.0em@endlatexonly"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ PROJECT_NAME = "ArangoDB"
|
|||
# This could be handy for archiving the generated documentation or
|
||||
# if some version control system is used.
|
||||
|
||||
PROJECT_NUMBER = 1.0.0
|
||||
PROJECT_NUMBER = 1.0.1
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ ALIASES += GE{1}="<b>\1</b>"
|
|||
ALIASES += EXAMPLES="<b>Examples</b><br>"
|
||||
ALIASES += EXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}@endlatexonly"
|
||||
ALIASES += TINYEXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}\renewcommand{\examplesize}{\tiny}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}\renewcommand{\examplesize}{\ttfamily}@endlatexonly"
|
||||
ALIASES += VERSION="1.0.0"
|
||||
ALIASES += VERSION="1.0.1"
|
||||
ALIASES += EMBEDTOC{1}="@ifnot LATEX<hr>@copydoc \1<hr>@endif"
|
||||
ALIASES += RESTHEADER{2}="@if LATEX@latexonly \vskip 0.5em\colorbox{gray}{@endlatexonly\1 (\2)@latexonly}\vskip 1em@endlatexonly@else <hr><em>\1</em> (\2)<hr><br>@endif"
|
||||
ALIASES += LATEXBREAK="@latexonly\vskip -0.5em\hskip 1.0em@endlatexonly"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
MANUAL_DST="www@www.arangodb.org:/var/www/www.arangodb.org/avoc/manuals"
|
||||
IMAGES_DST="www@www.arangodb.org:/var/www/www.arangodb.org/avoc/manuals/images"
|
||||
|
||||
OUTPUT_FOLDER="Doxygen/manuals/$(PACKAGE_VERSION)"
|
||||
OUTPUT_FOLDER=Doxygen/manuals/$(PACKAGE_VERSION)
|
||||
|
||||
################################################################################
|
||||
## publish
|
||||
|
|
@ -22,18 +22,18 @@ publish-wiki:
|
|||
publish-html: $(OUTPUT_FOLDER)
|
||||
$(MAKE) doxygen
|
||||
@for w in $(WIKI); do cp Doxygen/html/$$w.html $(OUTPUT_FOLDER); done
|
||||
@for i in `ls Doxygen/web/images/*.png`; do scp $$i $(OUTPUT_FOLDER)/images; done
|
||||
@for i in `ls Doxygen/web/images/*.png`; do cp $$i $(OUTPUT_FOLDER)/images; done
|
||||
|
||||
publish-pdf: $(OUTPUT_FOLDER)
|
||||
$(MAKE) latex
|
||||
$(MAKE) latex
|
||||
scp Doxygen/latex/dba-manual.pdf $(OUTPUT_FOLDER)
|
||||
scp Doxygen/latex/implementor-manual.pdf $(OUTPUT_FOLDER)
|
||||
scp Doxygen/latex/install-manual.pdf $(OUTPUT_FOLDER)
|
||||
scp Doxygen/latex/user-manual.pdf $(OUTPUT_FOLDER)
|
||||
scp Doxygen/latex/ref-manual.pdf $(OUTPUT_FOLDER)
|
||||
scp Doxygen/latex/imp-manual.pdf $(OUTPUT_FOLDER)
|
||||
scp arangod/Documentation/arangodb_1.0_shell_reference_card.pdf $(OUTPUT_FOLDER)
|
||||
cp Doxygen/latex/dba-manual.pdf $(OUTPUT_FOLDER)
|
||||
cp Doxygen/latex/implementor-manual.pdf $(OUTPUT_FOLDER)
|
||||
cp Doxygen/latex/install-manual.pdf $(OUTPUT_FOLDER)
|
||||
cp Doxygen/latex/user-manual.pdf $(OUTPUT_FOLDER)
|
||||
cp Doxygen/latex/ref-manual.pdf $(OUTPUT_FOLDER)
|
||||
cp Doxygen/latex/imp-manual.pdf $(OUTPUT_FOLDER)
|
||||
cp arangod/Documentation/arangodb_1.0_shell_reference_card.pdf $(OUTPUT_FOLDER)
|
||||
|
||||
$(OUTPUT_FOLDER):
|
||||
mkdir -p $(OUTPUT_FOLDER)
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
///
|
||||
/// @LIT{> mkdir /tmp/vocbase}
|
||||
///
|
||||
/// First start the ArgangoDB server. You can start it as daemon and
|
||||
/// First start the ArangoDB server. You can start it as daemon and
|
||||
/// redirect the output to a file as follows:
|
||||
///
|
||||
/// @LIT{> ./arangod --daemon --pid-file /tmp/arangod.pid --log.file /tmp/arangod.log /tmp/vocbase}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
/// [ArangoDB]
|
||||
/// name=ArangoDB Repository for CentOS
|
||||
/// failovermethod=priority
|
||||
/// baseurl=http://www.arangodb.org/repositories/CentOS-6.2
|
||||
/// baseurl=http://www.arangodb.org/repositories/CentOS-6.3
|
||||
/// enabled=1
|
||||
/// gpgcheck=1
|
||||
/// gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-www.arangodb.org
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@
|
|||
/// <li>@ref UserManualShellStartStopOptions</li>
|
||||
/// </ul>
|
||||
/// </li>
|
||||
/// </li>
|
||||
/// <li>@ref UserManualServerStartStopDebug
|
||||
/// </li>
|
||||
/// </ul>
|
||||
|
|
@ -377,7 +376,7 @@
|
|||
/// <li>@ref UserManualActionsAdvancedBundles</li>
|
||||
/// <li>@ref UserManualActionsAdvancedMiddleware</li>
|
||||
/// </ul>
|
||||
// </li>
|
||||
/// </li>
|
||||
/// </ul>
|
||||
/// </li>
|
||||
/// </ul>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for triAGENS ArangoDB 1.0.0.
|
||||
# Generated by GNU Autoconf 2.69 for triAGENS ArangoDB 1.0.1.
|
||||
#
|
||||
# Report bugs to <info@triagens.de>.
|
||||
#
|
||||
|
|
@ -580,8 +580,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='triAGENS ArangoDB'
|
||||
PACKAGE_TARNAME='arangodb'
|
||||
PACKAGE_VERSION='1.0.0'
|
||||
PACKAGE_STRING='triAGENS ArangoDB 1.0.0'
|
||||
PACKAGE_VERSION='1.0.1'
|
||||
PACKAGE_STRING='triAGENS ArangoDB 1.0.1'
|
||||
PACKAGE_BUGREPORT='info@triagens.de'
|
||||
PACKAGE_URL='http://www.arangodb.org'
|
||||
|
||||
|
|
@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures triAGENS ArangoDB 1.0.0 to adapt to many kinds of systems.
|
||||
\`configure' configures triAGENS ArangoDB 1.0.1 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1503,7 +1503,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of triAGENS ArangoDB 1.0.0:";;
|
||||
short | recursive ) echo "Configuration of triAGENS ArangoDB 1.0.1:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1659,7 +1659,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
triAGENS ArangoDB configure 1.0.0
|
||||
triAGENS ArangoDB configure 1.0.1
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -2124,7 +2124,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by triAGENS ArangoDB $as_me 1.0.0, which was
|
||||
It was created by triAGENS ArangoDB $as_me 1.0.1, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -3272,7 +3272,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='arangodb'
|
||||
VERSION='1.0.0'
|
||||
VERSION='1.0.1'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -10364,7 +10364,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by triAGENS ArangoDB $as_me 1.0.0, which was
|
||||
This file was extended by triAGENS ArangoDB $as_me 1.0.1, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -10431,7 +10431,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
triAGENS ArangoDB config.status 1.0.0
|
||||
triAGENS ArangoDB config.status 1.0.1
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ dnl ============================================================================
|
|||
dnl --SECTION-- triAGENS GmbH Build Environment
|
||||
dnl ============================================================================
|
||||
|
||||
AC_INIT([triAGENS ArangoDB], [1.0.0], [info@triagens.de], [arangodb], [http://www.arangodb.org])
|
||||
AC_INIT([triAGENS ArangoDB], [1.0.1], [info@triagens.de], [arangodb], [http://www.arangodb.org])
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl auxillary directory for install-sh and missing
|
||||
|
|
|
|||
|
|
@ -2026,8 +2026,13 @@ function AHUACATL_GRAPH_SUBNODES (searchAttributes, vertexId, visited, edges, ve
|
|||
|
||||
var clonedEdges = AHUACATL_CLONE(edges);
|
||||
var clonedVertices = AHUACATL_CLONE(vertices);
|
||||
clonedEdges.push(subEdge);
|
||||
clonedVertices.push(internal.db._document_nl(targetId));
|
||||
try {
|
||||
clonedVertices.push(internal.db._document_nl(targetId));
|
||||
clonedEdges.push(subEdge);
|
||||
}
|
||||
catch (e) {
|
||||
// avoid "document not found error" in case referenced vertices were deleted
|
||||
}
|
||||
|
||||
var connected = AHUACATL_GRAPH_SUBNODES(searchAttributes, targetId, AHUACATL_CLONE(visited), clonedEdges, clonedVertices, level + 1);
|
||||
for (k = 0; k < connected.length; ++k) {
|
||||
|
|
|
|||
|
|
@ -2027,8 +2027,13 @@ static string JS_server_ahuacatl =
|
|||
"\n"
|
||||
" var clonedEdges = AHUACATL_CLONE(edges);\n"
|
||||
" var clonedVertices = AHUACATL_CLONE(vertices);\n"
|
||||
" clonedEdges.push(subEdge);\n"
|
||||
" clonedVertices.push(internal.db._document_nl(targetId));\n"
|
||||
" try {\n"
|
||||
" clonedVertices.push(internal.db._document_nl(targetId));\n"
|
||||
" clonedEdges.push(subEdge);\n"
|
||||
" }\n"
|
||||
" catch (e) {\n"
|
||||
" // avoid \"document not found error\" in case referenced vertices were deleted\n"
|
||||
" }\n"
|
||||
" \n"
|
||||
" var connected = AHUACATL_GRAPH_SUBNODES(searchAttributes, targetId, AHUACATL_CLONE(visited), clonedEdges, clonedVertices, level + 1);\n"
|
||||
" for (k = 0; k < connected.length; ++k) {\n"
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ echo
|
|||
echo "########################################################"
|
||||
echo "Call mkepmlist to create a sublist"
|
||||
|
||||
for dir in js/actions/system js/server js/server/modules js/client js/client/modules js/common/modules js/common/bootstrap; do
|
||||
for dir in `find js -type d`; do
|
||||
echo " mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}"
|
||||
mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}
|
||||
done
|
||||
|
|
|
|||
Loading…
Reference in New Issue