the great rename

.gitignore

@@ -1,89 +1,58 @@
-*.Po
-*.gcda
-*.gcno
-*.la
-*.lo
-*.o
-*.old
-*.pyc
-*.swp
 *~
-.DS_Store
-.deps
-.dirstamp
-.libev-build-*
-.libs
-.mruby-build-*
-.setup-js-directories
-.setup-mr-directories
-.svn
-.v8-build-*
-/nbproject/private/
 3rdParty/libev/ARCH.x64
 3rdParty/libev/libtool
+3rdParty/mruby/bin/mrbc
+3rdParty/mruby/bin/mruby
+3rdParty/mruby/bin/mrubysample
 3rdParty/mruby/GIT
 3rdParty/mruby/GPATH
 3rdParty/mruby/GRTAGS
 3rdParty/mruby/GTAGS
-3rdParty/mruby/bin/mrbc
-3rdParty/mruby/bin/mruby
-3rdParty/mruby/bin/mrubysample
-3rdParty/mruby/lib/ritevm.a
 3rdParty/mruby/mrblib/mrblib.c
 3rdParty/mruby/mrblib/mrblib.ctmp
 3rdParty/mruby/mrblib/mrblib.rbtmp
-3rdParty/ptmalloc3/libptmalloc3.a
+3rdParty/ptmalloc3/tst-independent-alloc
 3rdParty/ptmalloc3/t-test1
 3rdParty/ptmalloc3/t-test2
-3rdParty/ptmalloc3/tst-independent-alloc
+arangod/Ahuacatl/ahuacatl-grammar.output
 ARCH.*
-Ahuacatl/ahuacatl-grammar.output
+autom4te.cache
-BasicsC/local-configuration.h
+bin
+build.h
+build.info
+commit.sh
+config/config.guess
+config/config.h
+config/config.sub
+config.h
+config.log
+config/revision.sh
+config.status
+config/version.sh
 COVERAGE
-Doxygen/.setup-directories
+.deps
+.dirstamp
 Doxygen/arango.doxy
 Doxygen/html/
 Doxygen/js
 Doxygen/latex/
+Doxygen/.setup-directories
 Doxygen/web/*.html
 Doxygen/wiki/
 Doxygen/xml/
+.DS_Store
+*.gcda
+*.gcno
 GPATH
 GRTAGS
 GTAGS
 JsonParserX/JsonParserX.output
-Makefile
+*.la
-Makefile.local
+lib*.a
-QL/parser.output
+lib/BasicsC/local-configuration.h
-UnitTests/HttpInterface/logs
+.libev-build-*
-UnitTests/Jutland/CsvReaderTest.cpp
+.libs
-UnitTests/Jutland/Makefile.am
+*.lo
-UnitTests/Jutland/Makefile.py
-UnitTests/Jutland/Runner.cpp
-UnitTests/Philadelphia/Makefile.am
-UnitTests/Philadelphia/Makefile.py
-UnitTests/Philadelphia/Runner.cpp
-UnitTests/basics_suite
-UnitTests/geo_suite
-VC++
-arangod
-arangoimp
-arangoirb
-arangosh
-autom4te.cache
-build.h
-build.info
-commit.sh
-config.h
-config.log
-config.status
-config/config.guess
-config/config.h
-config/config.sub
-config/revision.sh
-config/version.sh
-libarango.a
-libarangodb.a
 m4/component.engine
 m4/component.files
 m4/component.storage
@@ -101,6 +70,31 @@ m4/configure.standard
 m4/configure.tex
 m4/external.boost-test
 m4/external.libxml2
+Makefile
+Makefile.local
+.mruby-build-*
+/nbproject/private/
+*.o
+*.old
 out
+*.Po
+*.pyc
+QL/parser.output
+.setup-js-directories
+.setup-mr-directories
 stamp-h*
+.svn
+*.swp
 tags
+UnitTests/basics_suite
+UnitTests/geo_suite
+UnitTests/HttpInterface/logs
+UnitTests/Jutland/CsvReaderTest.cpp
+UnitTests/Jutland/Makefile.am
+UnitTests/Jutland/Makefile.py
+UnitTests/Jutland/Runner.cpp
+UnitTests/Philadelphia/Makefile.am
+UnitTests/Philadelphia/Makefile.py
+UnitTests/Philadelphia/Runner.cpp
+.v8-build-*
+VC++

CHANGELOG

@@ -3,6 +3,8 @@
 
 * fixed issue #100: "count" attribute exists in cursor response with "count: false"
 
+* fixed issue #103: Should we cleanup the directory structure
+
 * added new MRuby version (2012-06-02)
 
 * cleanup of command line options:

Doxygen/arango.template

@@ -627,20 +627,20 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = \
-	./Admin \
-	./Ahuacatl \
-	./ApplicationServer \
-	./Basics \
-	./BasicsC \
 	./Doxygen/js \
-	./Logger \
+	./arangod/Ahuacatl \
-	./Rest \
+	./arangod/RestHandler \
-	./RestHandler \
+	./arangod/RestServer \
-	./RestServer \
+	./arangod/VocBase
-	./ShapedJson \
+	./lib/Admin \
-	./UserManager \
+	./lib/ApplicationServer \
-	./V8 \
+	./lib/Basics \
-	./VocBase
+	./lib/BasicsC \
+	./lib/Logger \
+	./lib/Rest \
+	./lib/ShapedJson \
+	./lib/UserManager \
+	./lib/V8 \
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

Doxygen/arango.template.in

@@ -627,20 +627,20 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = \
-	@srcdir@/Admin \
-	@srcdir@/Ahuacatl \
-	@srcdir@/ApplicationServer \
-	@srcdir@/Basics \
-	@srcdir@/BasicsC \
 	@srcdir@/Doxygen/js \
-	@srcdir@/Logger \
+	@srcdir@/arangod/Ahuacatl \
-	@srcdir@/Rest \
+	@srcdir@/arangod/RestHandler \
-	@srcdir@/RestHandler \
+	@srcdir@/arangod/RestServer \
-	@srcdir@/RestServer \
+	@srcdir@/arangod/VocBase
-	@srcdir@/ShapedJson \
+	@srcdir@/lib/Admin \
-	@srcdir@/UserManager \
+	@srcdir@/lib/ApplicationServer \
-	@srcdir@/V8 \
+	@srcdir@/lib/Basics \
-	@srcdir@/VocBase
+	@srcdir@/lib/BasicsC \
+	@srcdir@/lib/Logger \
+	@srcdir@/lib/Rest \
+	@srcdir@/lib/ShapedJson \
+	@srcdir@/lib/UserManager \
+	@srcdir@/lib/V8 \
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

Makefile.am

@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
 	-D_SYSCONFDIR_='"${sysconfdir}"' \
 	-D_PKGDATADIR_='"${pkgdatadir}"' \
 	-D_DATABASEDIR_='"${localstatedir}/${PACKAGE_TARNAME}"' \
+	-I@top_srcdir@/lib \
 	@BOOST_CPPFLAGS@ \
 	@LIBEV_CPPFLAGS@ \
 	@MATH_CPPFLAGS@ \
@@ -27,21 +28,22 @@ LIBS = \
 	@MATH_LIBS@ \
 	@NCURSES_LIBS@ \
 	@OPENSSL_LIBS@ \
-	@READLINE_LIBS@ \
+	@READLINE_LIBS@
-	@V8_LIBS@
 
 BUILT_SOURCES = build.h
 CLEANUP =
 
-noinst_LIBRARIES = libarango.a
+noinst_LIBRARIES = lib/libarango.a lib/libarango_v8.a lib/libarango_fe.a lib/libarango_client.a
-sbin_PROGRAMS = arangod
+sbin_PROGRAMS = bin/arangod
-bin_PROGRAMS = arangosh arangoimp
+bin_PROGRAMS = bin/arangosh bin/arangoimp
 
 if ENABLE_MRUBY
 AM_CPPFLAGS += @MRUBY_CPPFLAGS@
 AM_CPPFLAGS += @MRUBY_LDFLAGS@
 LIBS += @MRUBY_LIBS@
-bin_PROGRAMS += arangoirb
+
+noinst_LIBRARIES += lib/libarango_mruby.a
+bin_PROGRAMS += bin/arangoirb
 endif
 
 nobase_pkgdata_DATA = \
@@ -70,20 +72,29 @@ build.h: configure.ac
 	@echo '#define TRIAGENS_VERSION "@PACKAGE_VERSION@"' > build.h
 
 include Makefile.files
-include Makefile.doxygen
+include lib/Makefile.files
-include Makefile.javascript
+include arangod/Makefile.files
-include Makefile.mruby
+include arangosh/Makefile.files
-include Makefile.unittests
+
--include Makefile.local
+if ENABLE_MRUBY
+include arangoirb/Makefile.files
+include m4/Makefile.mruby
+endif
+
+include m4/Makefile.doxygen
+include m4/Makefile.javascript
 
 if ENABLE_FLEX
-include Makefile.flex
+include m4/Makefile.flex
 endif
 
 if ENABLE_BISON
-include Makefile.bison
+include m4/Makefile.bison
 endif
 
+include Makefile.unittests
+-include Makefile.local
+
 .PHONY: errorfiles
 
 if ENABLE_ERRORS_DEPENDENCY

Makefile.bison

@@ -1,24 +0,0 @@
-# -*- mode: Makefile; -*-
-
-################################################################################
-## BISON
-################################################################################
-
-QL/%.c: @srcdir@/QL/%.y
-	@top_srcdir@/config/bison-c.sh $(BISON) $@ $<
-
-Ahuacatl/%.c: @srcdir@/Ahuacatl/%.y
-	@top_srcdir@/config/bison-c.sh $(BISON) $@ $<
-
-################################################################################
-## BISON++
-################################################################################
-
-JsonParserX/%.cpp: @srcdir@/JsonParserX/%.yy
-	@top_srcdir@/config/bison-c++.sh $(BISON) $@ $<
-
-################################################################################
-## CLEANUP
-################################################################################
-
-CLEANUP += $(BISON_FILES) $(BISONXX_FILES)

Makefile.files

@@ -1,287 +1,14 @@
 # -*- mode: Makefile; -*-
 
-################################################################################
+FLEX_FILES = 
-## --SECTION--                                                           LIBRARY
+FLEXXX_FILES = 
-################################################################################
+BISON_FILES =
-
+BISONXX_FILES = 
-################################################################################
-### @brief library "libarango.a"
-################################################################################
-
-libarango_a_SOURCES = \
-	Basics/ConditionLocker.cpp \
-	Basics/ConditionVariable.cpp \
-	Basics/FileUtils.cpp \
-	Basics/Initialise.cpp \
-	Basics/LibraryLoader.cpp \
-	Basics/Mutex.cpp \
-	Basics/MutexLocker.cpp \
-	Basics/ProgramOptions.cpp \
-	Basics/ProgramOptionsDescription.cpp \
-	Basics/Random.cpp \
-	Basics/ReadLocker.cpp \
-	Basics/ReadUnlocker.cpp \
-	Basics/ReadWriteLock.cpp \
-	Basics/StringUtils.cpp \
-	Basics/Thread.cpp \
-	Basics/Timing.cpp \
-	Basics/WriteLocker.cpp \
-	Basics/WriteUnlocker.cpp \
-	BasicsC/associative-multi.c \
-	BasicsC/associative.c \
-	BasicsC/conversions.c \
-	BasicsC/csv.c \
-	BasicsC/error.c \
-	BasicsC/files.c \
-	BasicsC/hashes.c \
-	BasicsC/init.c \
-	BasicsC/json.c \
-	BasicsC/json-utilities.c \
-	BasicsC/linked-list.c \
-	BasicsC/locks-macos.c \
-	BasicsC/locks-posix.c \
-	BasicsC/logging.c \
-	BasicsC/memory.c \
-	BasicsC/process-utils.c \
-	BasicsC/random.c \
-	BasicsC/socket-utils.c \
-	BasicsC/string-buffer.c \
-	BasicsC/strings.c \
-	BasicsC/structures.c \
-	BasicsC/system-functions.c \
-	BasicsC/terminal-utils-ncurses.c \
-	BasicsC/terminal-utils.c \
-	BasicsC/threads-posix.c \
-	BasicsC/vector.c \
-	BasicsC/voc-errors.c \
-	GeoIndex/GeoIndex.c \
-	JsonParser/json-parser.c \
-	JsonParserX/InputParser.cpp \
-	JsonParserX/JsonParserX.cpp \
-	JsonParserX/JsonParserXDriver.cpp \
-	JsonParserX/JsonScannerX.cpp \
-	Logger/Logger.cpp \
-	Logger/LoggerData.cpp \
-	Logger/LoggerInfo.cpp \
-	Logger/LoggerStream.cpp \
-	Logger/LoggerTiming.cpp \
-	ProgramOptions/program-options.c \
-	Rest/AddressPort.cpp \
-	Rest/AnyServer.cpp \
-	Rest/HttpRequest.cpp \
-	Rest/HttpResponse.cpp \
-	Rest/Initialise.cpp \
-	Rest/JsonContainer.cpp \
-	Rest/SslInterface.cpp \
-	Rest/Url.cpp \
-	ShapedJson/json-shaper.c \
-	ShapedJson/shape-accessor.c \
-	ShapedJson/shaped-json.c \
-	UserManager/ApplicationUserManager.cpp \
-	UserManager/Role.cpp \
-	UserManager/Session.cpp \
-	UserManager/SessionHandler.cpp \
-	UserManager/User.cpp \
-	UserManager/UserHandler.cpp \
-	UserManager/UsersHandler.cpp \
-	Utilities/LineEditor.cpp \
-	Utilities/ScriptLoader.cpp \
-	V8/JSLoader.cpp \
-	V8/V8LineEditor.cpp \
-	V8/v8-conv.cpp \
-	V8/v8-execution.cpp \
-	V8/v8-json.cpp \
-	V8/v8-shell.cpp \
-	V8/v8-utils.cpp \
-	Variant/VariantArray.cpp \
-	Variant/VariantBlob.cpp \
-	Variant/VariantBoolean.cpp \
-	Variant/VariantDate.cpp \
-	Variant/VariantDatetime.cpp \
-	Variant/VariantDouble.cpp \
-	Variant/VariantFloat.cpp \
-	Variant/VariantInt16.cpp \
-	Variant/VariantInt32.cpp \
-	Variant/VariantInt64.cpp \
-	Variant/VariantInt8.cpp \
-	Variant/VariantMatrix2.cpp \
-	Variant/VariantNull.cpp \
-	Variant/VariantObject.cpp \
-	Variant/VariantString.cpp \
-	Variant/VariantUInt16.cpp \
-	Variant/VariantUInt32.cpp \
-	Variant/VariantUInt64.cpp \
-	Variant/VariantUInt8.cpp \
-	Variant/VariantVector.cpp
-
-################################################################################
-### @brief library "libarango.a", MRuby part
-################################################################################
-
-if ENABLE_MRUBY
-libarango_a_SOURCES += \
-	MRuby/MRLoader.cpp \
-	MRuby/MRLineEditor.cpp \
-	MRuby/mr-actions.cpp \
-	MRuby/mr-utils.cpp
-endif
 
 ################################################################################
 ## --SECTION--                                                           PROGRAM
 ################################################################################
 
-################################################################################
-### @brief program "arangod"
-################################################################################
-
-arangod_LDADD = libarango.a $(LIBS)
-
-arangod_SOURCES = \
-	Admin/ApplicationAdminServer.cpp \
-	Admin/RestAdminBaseHandler.cpp \
-	Admin/RestAdminFeConfigurationHandler.cpp \
-	Admin/RestAdminLogHandler.cpp \
-	Admin/RestBaseHandler.cpp \
-	Admin/RestVersionHandler.cpp \
-	ApplicationServer/ApplicationServer.cpp \
-	ApplicationServer/ApplicationServerImpl.cpp \
-	ApplicationServer/ApplicationServerSchedulerImpl.cpp \
-	Dispatcher/ApplicationServerDispatcher.cpp \
-	Dispatcher/ApplicationServerDispatcherImpl.cpp \
-	Dispatcher/DispatcherImpl.cpp \
-	Dispatcher/DispatcherQueue.cpp \
-	Dispatcher/DispatcherThread.cpp \
-	Dispatcher/Job.cpp \
-	GeneralServer/GeneralFigures.cpp \
-	HashIndex/hashindex.c \
-	HashIndex/hasharray.c \
-	HttpServer/ApplicationHttpServer.cpp \
-	HttpServer/ApplicationHttpServerImpl.cpp \
-	HttpServer/HttpCommTask.cpp \
-	HttpServer/HttpHandler.cpp \
-	HttpServer/HttpHandlerFactory.cpp \
-	HttpServer/PathHandler.cpp \
-	HttpServer/RedirectHandler.cpp \
-	HttpServer/ServiceUnavailableHandler.cpp \
-	HttpsServer/ApplicationHttpsServer.cpp \
-	HttpsServer/ApplicationHttpsServerImpl.cpp \
-	HttpsServer/HttpsAsyncCommTask.cpp \
-	HttpsServer/HttpsServer.cpp \
-	HttpsServer/HttpsServerImpl.cpp \
-	PriorityQueue/pqueueindex.c \
-	PriorityQueue/priorityqueue.c \
-        Ahuacatl/ahuacatl-access-optimiser.c \
-        Ahuacatl/ahuacatl-ast-node.c \
-        Ahuacatl/ahuacatl-bind-parameter.c \
-	Ahuacatl/ahuacatl-codegen.c \
-        Ahuacatl/ahuacatl-collections.c \
-        Ahuacatl/ahuacatl-context.c \
-        Ahuacatl/ahuacatl-conversions.c \
-        Ahuacatl/ahuacatl-error.c \
-	Ahuacatl/ahuacatl-functions.c \
-        Ahuacatl/ahuacatl-grammar.c \
-        Ahuacatl/ahuacatl-index.c \
-        Ahuacatl/ahuacatl-optimiser.c \
-        Ahuacatl/ahuacatl-parser.c \
-        Ahuacatl/ahuacatl-parser-functions.c \
-        Ahuacatl/ahuacatl-result.c \
-        Ahuacatl/ahuacatl-scope.c \
-        Ahuacatl/ahuacatl-tokens.c \
-        Ahuacatl/ahuacatl-tree-dump.c \
-        Ahuacatl/ahuacatl-tree-walker.c \
-        Ahuacatl/ahuacatl-variable.c \
-	RestHandler/RestActionHandler.cpp \
-	RestHandler/RestDocumentHandler.cpp \
-	RestHandler/RestEdgeHandler.cpp \
-	RestHandler/RestImportHandler.cpp \
-	RestHandler/RestVocbaseBaseHandler.cpp \
-	RestServer/ActionDispatcherThread.cpp \
-	RestServer/ArangoHttpServer.cpp \
-	RestServer/ArangoServer.cpp \
-	RestServer/arango.cpp \
-	ResultGenerator/HtmlResultGenerator.cpp \
-	ResultGenerator/Initialise.cpp \
-	ResultGenerator/JsonResultGenerator.cpp \
-	ResultGenerator/JsonXResultGenerator.cpp \
-	ResultGenerator/OutputGenerator.cpp \
-	ResultGenerator/PhpResultGenerator.cpp \
-	ResultGenerator/ResultGenerator.cpp \
-	ResultGenerator/XmlResultGenerator.cpp \
-	Scheduler/AsyncTask.cpp \
-	Scheduler/ConnectionTask.cpp \
-	Scheduler/ListenTask.cpp \
-	Scheduler/PeriodicTask.cpp \
-	Scheduler/Scheduler.cpp \
-	Scheduler/SchedulerLibev.cpp \
-	Scheduler/SchedulerThread.cpp \
-	Scheduler/SignalTask.cpp \
-	Scheduler/SocketTask.cpp \
-	Scheduler/Task.cpp \
-	Scheduler/TaskManager.cpp \
-	Scheduler/TimerTask.cpp \
-	SkipLists/sl-operator.c \
-	SkipLists/skiplist.c \
-	SkipLists/skiplistIndex.c \
-	V8/v8-actions.cpp \
-	V8/v8-query.cpp \
-	V8/v8-vocbase.cpp \
-	VocBase/barrier.c \
-	VocBase/blob-collection.c \
-	VocBase/collection.c \
-	VocBase/compactor.c \
-	VocBase/datafile.c \
-	VocBase/document-collection.c \
-	VocBase/general-cursor.c \
-	VocBase/headers.c \
-	VocBase/index.c \
-	VocBase/shadow-data.c \
-	VocBase/simple-collection.c \
-	VocBase/synchroniser.c \
-	VocBase/voc-shaper.c \
-	VocBase/vocbase.c
-
-################################################################################
-### @brief program "arangosh"
-################################################################################
-
-arangosh_LDADD = libarango.a $(LIBS)
-
-arangosh_SOURCES = \
-	SimpleHttpClient/SimpleHttpClient.cpp \
-	SimpleHttpClient/SimpleHttpResult.cpp \
-	V8Client/ImportHelper.cpp \
-	V8Client/V8ClientConnection.cpp \
-	V8Client/arangosh.cpp
-
-################################################################################
-### @brief program "arangoirb"
-################################################################################
-
-if ENABLE_MRUBY
-
-arangoirb_LDADD = libarango.a $(LIBS)
-
-arangoirb_SOURCES = \
-	SimpleHttpClient/SimpleHttpClient.cpp \
-	SimpleHttpClient/SimpleHttpResult.cpp \
-	MRClient/MRubyClientConnection.cpp \
-	MRClient/arangoirb.cpp
-
-endif
-
-################################################################################
-### @brief program "arangoimp"
-################################################################################
-
-arangoimp_LDADD = libarango.a $(LIBS)
-
-arangoimp_SOURCES = \
-	SimpleHttpClient/SimpleHttpClient.cpp \
-	SimpleHttpClient/SimpleHttpResult.cpp \
-	V8Client/ImportHelper.cpp \
-	V8Client/V8ClientConnection.cpp \
-	V8Client/arangoimp.cpp
-
 ################################################################################
 ## --SECTION--                                                        JAVASCRIPT
 ################################################################################
@@ -324,48 +51,6 @@ MRUBY_HEADER = \
 
 BUILT_SOURCES += $(MRUBY_HEADER)
 
-################################################################################
-## --SECTION--                                                  SCANNER & PARSER
-################################################################################
-
-################################################################################
-### @brief flex
-################################################################################
-
-FLEX_FILES = \
-	JsonParser/json-parser.c \
-        Ahuacatl/ahuacatl-tokens.c
-
-BUILT_SOURCES += $(FLEX_FILES)
-
-################################################################################
-### @brief flex++
-################################################################################
-
-FLEXXX_FILES = \
-	V8/v8-json.cpp \
-	JsonParserX/JsonScannerX.cpp
-
-BUILT_SOURCES += $(FLEXXX_FILES)
-
-################################################################################
-### @brief bison
-################################################################################
-
-BISON_FILES = \
-	Ahuacatl/ahuacatl-grammar.c
-
-BUILT_SOURCES += $(BISON_FILES)
-
-################################################################################
-### @brief bison++
-################################################################################
-
-BISONXX_FILES = \
-	JsonParserX/JsonParserX.cpp
-
-BUILT_SOURCES += $(BISONXX_FILES)
-
 ################################################################################
 ## --SECTION--                                                           DOXYGEN
 ################################################################################

Makefile.unittests

@@ -63,7 +63,7 @@ start-server:
 
 	@test -d "$(VOCDIR)"
 
-	($(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") &
+	($(VALGRIND) @builddir@/bin/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") &
 
 	@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2
 	@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2
@@ -167,7 +167,7 @@ unittests-shell-server:
 	@rm -rf "$(VOCDIR)"
 	@mkdir "$(VOCDIR)"
 
-	$(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER) || test "x$(FORCE)" == "x1"
+	$(VALGRIND) @builddir@/bin/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER) || test "x$(FORCE)" == "x1"
 
 	@rm -rf "$(VOCDIR)"
 	@echo
@@ -210,7 +210,7 @@ unittests-shell-server-ahuacatl:
 	@rm -rf "$(VOCDIR)"
 	@mkdir "$(VOCDIR)"
 
-	$(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER_AHUACATL) || test "x$(FORCE)" == "x1"
+	$(VALGRIND) @builddir@/bin/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER_AHUACATL) || test "x$(FORCE)" == "x1"
 
 	@rm -rf "$(VOCDIR)"
 	@echo
@@ -234,7 +234,7 @@ unittests-shell-client:
 	@echo "================================================================================"
 	@echo
 
-	$(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1"
+	$(VALGRIND) @builddir@/bin/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1"
 
 	kill `cat $(PIDFILE)`
 

arangod/Makefile.files

@@ -0,0 +1,104 @@
+# -*- mode: Makefile; -*-
+
+################################################################################
+## --SECTION--                                                           PROGRAM
+################################################################################
+
+################################################################################
+### @brief program "arangod"
+################################################################################
+
+bin_arangod_CPPFLAGS = -I@top_srcdir@/arangod $(AM_CPPFLAGS) 
+bin_arangod_LDADD = lib/libarango_fe.a lib/libarango_v8.a lib/libarango.a $(LIBS)  @V8_LIBS@
+
+if ENABLE_MRUBY
+bin_arangod_LDADD += lib/libarango_mruby.a @MRUBY_LIBS@
+endif
+
+bin_arangod_SOURCES = \
+	arangod/Ahuacatl/ahuacatl-access-optimiser.c \
+	arangod/Ahuacatl/ahuacatl-ast-node.c \
+	arangod/Ahuacatl/ahuacatl-bind-parameter.c \
+	arangod/Ahuacatl/ahuacatl-codegen.c \
+	arangod/Ahuacatl/ahuacatl-collections.c \
+	arangod/Ahuacatl/ahuacatl-context.c \
+	arangod/Ahuacatl/ahuacatl-conversions.c \
+	arangod/Ahuacatl/ahuacatl-error.c \
+	arangod/Ahuacatl/ahuacatl-functions.c \
+	arangod/Ahuacatl/ahuacatl-grammar.c \
+	arangod/Ahuacatl/ahuacatl-index.c \
+	arangod/Ahuacatl/ahuacatl-optimiser.c \
+	arangod/Ahuacatl/ahuacatl-parser-functions.c \
+	arangod/Ahuacatl/ahuacatl-parser.c \
+	arangod/Ahuacatl/ahuacatl-result.c \
+	arangod/Ahuacatl/ahuacatl-scope.c \
+	arangod/Ahuacatl/ahuacatl-tokens.c \
+	arangod/Ahuacatl/ahuacatl-tree-dump.c \
+	arangod/Ahuacatl/ahuacatl-tree-walker.c \
+	arangod/Ahuacatl/ahuacatl-variable.c \
+	arangod/GeoIndex/GeoIndex.c \
+	arangod/HashIndex/hasharray.c \
+	arangod/HashIndex/hashindex.c \
+	arangod/PriorityQueue/pqueueindex.c \
+	arangod/PriorityQueue/priorityqueue.c \
+	arangod/RestHandler/RestActionHandler.cpp \
+	arangod/RestHandler/RestDocumentHandler.cpp \
+	arangod/RestHandler/RestEdgeHandler.cpp \
+	arangod/RestHandler/RestImportHandler.cpp \
+	arangod/RestHandler/RestVocbaseBaseHandler.cpp \
+	arangod/RestServer/ActionDispatcherThread.cpp \
+	arangod/RestServer/ArangoHttpServer.cpp \
+	arangod/RestServer/ArangoServer.cpp \
+	arangod/RestServer/arango.cpp \
+	arangod/SkipLists/skiplist.c \
+	arangod/SkipLists/skiplistIndex.c \
+	arangod/SkipLists/sl-operator.c \
+	arangod/V8Server/v8-actions.cpp \
+	arangod/V8Server/v8-objects.cpp \
+	arangod/V8Server/v8-query.cpp \
+	arangod/V8Server/v8-vocbase.cpp \
+	arangod/VocBase/barrier.c \
+	arangod/VocBase/blob-collection.c \
+	arangod/VocBase/collection.c \
+	arangod/VocBase/compactor.c \
+	arangod/VocBase/datafile.c \
+	arangod/VocBase/document-collection.c \
+	arangod/VocBase/general-cursor.c \
+	arangod/VocBase/headers.c \
+	arangod/VocBase/index.c \
+	arangod/VocBase/shadow-data.c \
+	arangod/VocBase/simple-collection.c \
+	arangod/VocBase/synchroniser.c \
+	arangod/VocBase/voc-shaper.c \
+	arangod/VocBase/vocbase.c
+
+################################################################################
+## --SECTION--                                                  SCANNER & PARSER
+################################################################################
+
+################################################################################
+### @brief flex
+################################################################################
+
+FLEX_FILES += \
+        arangod/Ahuacatl/ahuacatl-tokens.c
+
+BUILT_SOURCES += $(FLEX_FILES)
+
+################################################################################
+### @brief bison
+################################################################################
+
+BISON_FILES += \
+	arangod/Ahuacatl/ahuacatl-grammar.c
+
+BUILT_SOURCES += $(BISON_FILES)
+
+################################################################################
+## --SECTION--                                                       END-OF-FILE
+################################################################################
+
+## Local Variables:
+## mode: outline-minor
+## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)"
+## End:

arangod/RestHandler/RestActionHandler.h

@@ -30,7 +30,7 @@
 
 #include "RestHandler/RestVocbaseBaseHandler.h"
 
-#include "V8/v8-actions.h"
+#include "V8Server/v8-actions.h"
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 RestActionHandler

arangod/RestServer/ActionDispatcherThread.cpp

@@ -31,13 +31,13 @@
 #include "BasicsC/strings.h"
 #include "Logger/Logger.h"
 #include "Rest/Initialise.h"
-#include "V8/v8-actions.h"
 #include "V8/v8-conv.h"
 #include "V8/v8-globals.h"
-#include "V8/v8-query.h"
 #include "V8/v8-shell.h"
 #include "V8/v8-utils.h"
-#include "V8/v8-vocbase.h"
+#include "V8Server/v8-actions.h"
+#include "V8Server/v8-query.h"
+#include "V8Server/v8-vocbase.h"
 
 using namespace std;
 using namespace triagens::basics;

arangod/RestServer/ArangoServer.cpp

@@ -63,13 +63,13 @@
 #include "UserManager/ApplicationUserManager.h"
 #include "V8/JSLoader.h"
 #include "V8/V8LineEditor.h"
-#include "V8/v8-actions.h"
 #include "V8/v8-conv.h"
 #include "V8/v8-globals.h"
 #include "V8/v8-shell.h"
 #include "V8/v8-utils.h"
-#include "V8/v8-query.h"
+#include "V8Server/v8-actions.h"
-#include "V8/v8-vocbase.h"
+#include "V8Server/v8-query.h"
+#include "V8Server/v8-vocbase.h"
 
 using namespace std;
 using namespace triagens::basics;
@@ -355,14 +355,14 @@ ArangoServer::ArangoServer (int argc, char** argv)
 #ifdef TRI_SYSTEM_ACTION_PATH
     _actionPathJS = TRI_SYSTEM_ACTION_PATH;
 #else
-    _actionPathJS = _binaryPath + "/js/actions/system";
+    _actionPathJS = _binaryPath + "/../js/actions/system";
 #endif
 
 #ifdef TRI_STARTUP_MODULES_PATH
     _startupModulesJS = TRI_STARTUP_MODULES_PATH;
 #else
-    _startupModulesJS = _binaryPath + "/js/server/modules"
+    _startupModulesJS = _binaryPath + "/../js/server/modules"
-              + ";" + _binaryPath + "/js/common/modules";
+              + ";" + _binaryPath + "/../js/common/modules";
 #endif
 
 #else
@@ -481,7 +481,7 @@ void ArangoServer::buildApplicationServer () {
 #ifdef TRI_HTML_ADMIN_PATH
   _applicationAdminServer->allowAdminDirectory(TRI_HTML_ADMIN_PATH);
 #else
-  _applicationAdminServer->allowAdminDirectory(_binaryPath + "/html/admin");
+  _applicationAdminServer->allowAdminDirectory(_binaryPath + "/../html/admin");
 #endif
 
 #else