1
0
Fork 0
Commit Graph

143 Commits

Author SHA1 Message Date
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Frank Celler d26b082ef6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.in
	UnitTests/Makefile.files
2012-08-24 09:59:16 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
2012-08-18 09:00:43 +02:00
Jan Steemann b29d303488 fixed sporadically failing test 2012-08-15 12:43:20 +02:00
Jan Steemann 43b7ea951a issue #147: added --database.force-sync-shapes option 2012-08-09 19:25:39 +02:00
Jan Steemann 63524e0bae fixed documentation error 2012-08-09 17:50:01 +02:00
Jan Steemann 590855f633 made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
Jan Steemann 5c24872306 moved endpoint option parsing into ApplicationEndpointServer class 2012-07-30 15:50:34 +02:00
Jan Steemann 9d87988bf5 renamed ApplicationHttpServer to ApplicationEndpointServer 2012-07-30 08:26:16 +02:00
Jan Steemann 243aa0242c removed ApplicationHttpsServer 2012-07-27 15:59:58 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann daa6ca8b5e added documentation for ssl options 2012-07-26 13:39:21 +02:00
Jan Steemann 1f62715e87 fixed documentation 2012-07-26 12:49:25 +02:00
Jan Steemann cc9952f460 fixed documentation 2012-07-26 09:22:52 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Jan Steemann 4f2229124f added --server.disable-authentication option 2012-07-26 08:49:56 +02:00
Jan Steemann ae47eb4da8 added documentation 2012-07-25 17:52:21 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
2012-07-24 22:56:03 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
2012-07-24 22:19:46 +02:00
Jan Steemann a8cf75b245 minor cleanup 2012-07-24 08:43:38 +02:00
Jan Steemann 33839809ab ssl 2012-07-23 18:17:45 +02:00
Jan Steemann abc516f429 removed dead member variable 2012-07-23 16:00:12 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Jan Steemann 53e8581b99 added ifdef around zeromq stuff 2012-07-20 15:07:53 +02:00
Jan Steemann 8cfba96f28 removed option --server.admin-port 2012-07-20 15:05:18 +02:00
Frank Celler f7e1388e93 updated documentation 2012-07-15 17:31:59 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script
renamed --unit-tests to --javascript.unit-tests
2012-07-15 00:50:05 +02:00
Frank Celler e455348032 added --database.wait-for-sync 2012-07-10 16:34:06 +02:00
Frank Celler d3c17ee43f fixed ruby console and actions, now using now ApplicationMR class 2012-06-22 11:00:21 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
2012-06-21 23:17:48 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Jan Steemann 6a55a942fe potential fix for issue #111 (crash during make unittests) 2012-06-21 17:26:00 +02:00
Jan Steemann a0240aef31 renamed "shell" to "console" internally (as suggested by moonglum) 2012-06-21 16:39:22 +02:00
Frank Celler ea1243d3ce feature V8 2012-06-21 00:44:25 +02:00
Frank Celler 54826adb83 cleanup HttpRequest as prep for ZeroMQ 2012-06-13 21:51:27 +02:00
Frank Celler 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler dd7fa848c0 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:28:53 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
2012-06-08 15:57:33 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00