Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

.gitignore

@@ -3,7 +3,7 @@
 3rdParty/czmq-1.1.0/src/czmq_selftest
 3rdParty/czmq-1.1.0/src/libczmq.pc
 3rdParty/czmq-1.1.0/src/platform.h
-3rdParty/libev/ARCH.x64
+3rdParty/libev/BUILD
 3rdParty/libev/libtool
 3rdParty/mruby/bin/mrbc
 3rdParty/mruby/bin/mruby
@@ -88,18 +88,19 @@ config.status
 configure
 config/version.sh
 COVERAGE
-.czmq-build-64
+.czmq-build-*
 .deps
 .dirstamp
-Doxygen/arango.doxy
-Doxygen/html/
-Doxygen/js
-Doxygen/latex/
-Doxygen/manuals
-Doxygen/.setup-directories
-Doxygen/web/*.html
-Doxygen/wiki/
-Doxygen/xml/
+Documentation/arango.template
+Documentation/arango.doxy
+Documentation/html/
+Documentation/js
+Documentation/latex/
+Documentation/manuals
+Documentation/.setup-directories
+Documentation/web/*.html
+Documentation/wiki/
+Documentation/xml/
 .DS_Store
 *.gcda
 *.gcno
@@ -140,7 +141,7 @@ Makefile.local
 *.old
 out
 *.Po
-.protobuf-build-64
+.protobuf-build-*
 *.pyc
 .setup-js-directories
 .setup-mr-directories
@@ -162,4 +163,5 @@ UnitTests/Philadelphia/Makefile.py
 UnitTests/Philadelphia/Runner.cpp
 .v8-build-*
 VC++
-.zeromq-build-64
+.zeromq-build-*
+etc/arangodb/*.conf

3rdParty/Makefile.all-in-one-libev

@@ -0,0 +1,41 @@
+# -*- mode: Makefile; -*-
+
+## -----------------------------------------------------------------------------
+## --SECTION--                                                           LIBRARY
+## -----------------------------------------------------------------------------
+
+################################################################################
+### @brief libev
+################################################################################
+
+BUILT_SOURCES += @LIBEV_LIBS@
+
+@LIBEV_LIBS@: @srcdir@/.libev-build-@TRI_BITS@
+
+@srcdir@/.libev-build-@TRI_BITS@:
+	@echo
+	@echo "--------------------------------------------------------------------------------"
+	@echo "BUILDING LIBEV"
+	@echo "--------------------------------------------------------------------------------"
+	@echo
+
+	mkdir @top_srcdir@/3rdParty/libev/BUILD || true
+	cd @top_srcdir@/3rdParty/libev/BUILD && ../configure --disable-shared
+	cd @top_srcdir@/3rdParty/libev/BUILD && $(MAKE)
+
+	touch @srcdir@/.libev-build-@TRI_BITS@
+
+	@echo
+	@echo "--------------------------------------------------------------------------------"
+	@echo "BUILD LIBEV FINISHED"
+	@echo "--------------------------------------------------------------------------------"
+	@echo
+
+## -----------------------------------------------------------------------------
+## --SECTION--                                                       END-OF-FILE
+## -----------------------------------------------------------------------------
+
+## Local Variables:
+## mode: outline-minor
+## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)"
+## End:

3rdParty/Makefile.all-in-one-mruby

@@ -1,8 +1,8 @@
 # -*- mode: Makefile; -*-
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                           LIBRARY
-################################################################################
+## -----------------------------------------------------------------------------
 
 ################################################################################
 ### @brief mruby
@@ -10,9 +10,9 @@
 
 BUILT_SOURCES += @MRUBY_LIBS@
 
-@MRUBY_LIBS@: .mruby-build-@TRI_BITS@
+@MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@
 
-.mruby-build-@TRI_BITS@:
+@srcdir@/.mruby-build-@TRI_BITS@:
 	@echo
 	@echo "--------------------------------------------------------------------------------"
 	@echo "BUILDING LIBEV"
@@ -21,7 +21,7 @@ BUILT_SOURCES += @MRUBY_LIBS@
 
 	cd @top_srcdir@/3rdParty/mruby && $(MAKE) -j1
 
-	touch .mruby-build-@TRI_BITS@
+	touch @srcdir@/.mruby-build-@TRI_BITS@
 
 	@echo
 	@echo "--------------------------------------------------------------------------------"
@@ -29,9 +29,9 @@ BUILT_SOURCES += @MRUBY_LIBS@
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                       END-OF-FILE
-################################################################################
+## -----------------------------------------------------------------------------
 
 ## Local Variables:
 ## mode: outline-minor

3rdParty/Makefile.all-in-one-protobuf

@@ -1,8 +1,8 @@
 # -*- mode: Makefile; -*-
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                           LIBRARY
-################################################################################
+## -----------------------------------------------------------------------------
 
 ################################################################################
 ### @brief Protobuf
@@ -11,9 +11,9 @@
 BUILT_SOURCES += @PROTOBUF_LIBS@
 PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
 
-@PROTOBUF_LIBS@: .protobuf-build-@TRI_BITS@
+@PROTOBUF_LIBS@: @srcdir@/.protobuf-build-@TRI_BITS@
 
-.protobuf-build-@TRI_BITS@:
+@srcdir@/.protobuf-build-@TRI_BITS@:
 	@echo
 	@echo "--------------------------------------------------------------------------------"
 	@echo "BUILDING Protocol Buffers"
@@ -28,7 +28,7 @@ PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
 			--libdir=$(PROTOBUFDIR)/lib@TRI_BITS@
 	cd @top_srcdir@/3rdParty/protobuf-2.4.1 && $(MAKE) install
 
-	touch .protobuf-build-@TRI_BITS@
+	touch @srcdir@/.protobuf-build-@TRI_BITS@
 
 	@echo
 	@echo "--------------------------------------------------------------------------------"
@@ -36,9 +36,9 @@ PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                       END-OF-FILE
-################################################################################
+## -----------------------------------------------------------------------------
 
 ## Local Variables:
 ## mode: outline-minor

3rdParty/Makefile.all-in-one-v8

@@ -1,8 +1,8 @@
 # -*- mode: Makefile; -*-
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                           LIBRARY
-################################################################################
+## -----------------------------------------------------------------------------
 
 ################################################################################
 ### @brief V8
@@ -10,9 +10,9 @@
 
 BUILT_SOURCES += @V8_LIBS@
 
-@V8_LIBS@: .v8-build-@TRI_BITS@
+@V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@
 
-.v8-build-@TRI_BITS@:
+@srcdir@/.v8-build-@TRI_BITS@:
 	@echo
 	@echo "--------------------------------------------------------------------------------"
 	@echo "BUILDING V8"
@@ -21,7 +21,7 @@ BUILT_SOURCES += @V8_LIBS@
 
 	cd @top_srcdir@/3rdParty/V8 && $(MAKE) library=static snapshot=off @V8_TARGET@
 
-	touch .v8-build-@TRI_BITS@
+	touch @srcdir@/.v8-build-@TRI_BITS@
 
 	@echo
 	@echo "--------------------------------------------------------------------------------"
@@ -29,9 +29,9 @@ BUILT_SOURCES += @V8_LIBS@
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                       END-OF-FILE
-################################################################################
+## -----------------------------------------------------------------------------
 
 ## Local Variables:
 ## mode: outline-minor

3rdParty/Makefile.all-in-one-zeromq

@@ -1,8 +1,8 @@
 # -*- mode: Makefile; -*-
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                           LIBRARY
-################################################################################
+## -----------------------------------------------------------------------------
 
 ################################################################################
 ### @brief ZeroMQ
@@ -11,9 +11,9 @@
 BUILT_SOURCES += @ZEROMQ_LIBS@
 ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
 
-@ZEROMQ_LIBS@: .zeromq-build-@TRI_BITS@ .czmq-build-@TRI_BITS@
+@ZEROMQ_LIBS@: @srcdir@/.zeromq-build-@TRI_BITS@ @srcdir@/.czmq-build-@TRI_BITS@
 
-.zeromq-build-@TRI_BITS@:
+@srcdir@/.zeromq-build-@TRI_BITS@:
 	@echo
 	@echo "--------------------------------------------------------------------------------"
 	@echo "BUILDING ZEROMQ"
@@ -28,7 +28,7 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
 			--libdir=$(ZMQDIR)/lib@TRI_BITS@
 	cd @top_srcdir@/3rdParty/zeromq-2.2.0 && $(MAKE) install
 
-	touch .zeromq-build-@TRI_BITS@
+	touch @srcdir@/.zeromq-build-@TRI_BITS@
 
 	@echo
 	@echo "--------------------------------------------------------------------------------"
@@ -36,7 +36,7 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
-.czmq-build-@TRI_BITS@: .zeromq-build-@TRI_BITS@
+@srcdir@/.czmq-build-@TRI_BITS@: .zeromq-build-@TRI_BITS@
 	@echo
 	@echo "--------------------------------------------------------------------------------"
 	@echo "BUILDING CZMQ"
@@ -54,7 +54,7 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
 			LIBS="-luuid -lrt -lstdc++"
 	cd @top_srcdir@/3rdParty/czmq-1.1.0 && $(MAKE) install
 
-	touch .czmq-build-@TRI_BITS@
+	touch @srcdir@/.czmq-build-@TRI_BITS@
 
 	@echo
 	@echo "--------------------------------------------------------------------------------"
@@ -62,9 +62,9 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
 	@echo "--------------------------------------------------------------------------------"
 	@echo
 
-################################################################################
+## -----------------------------------------------------------------------------
 ## --SECTION--                                                       END-OF-FILE
-################################################################################
+## -----------------------------------------------------------------------------
 
 ## Local Variables:
 ## mode: outline-minor

CHANGELOG

@@ -28,6 +28,11 @@ not released yet
   as before. The Javascript API in the shell also offers a new update() method in extension to
   the previously existing replace() method.
 
+v1.0.1 (2012-XX-XX)
+-------------------
+
+* fix for issue #163: server cannot create collection because of abandoned files
+
 v1.0.0 (2012-08-17)
 -------------------