From 73670d88b9e192a8c21d9b59ead93a46f68b5a08 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Tue, 6 Dec 2011 12:57:45 +0100 Subject: [PATCH 1/2] added -ldl for OpenSUSE --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 960fdfc42212..0fa42b5f7a4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = AM_CPPFLAGS = @BOOST_CPPFLAGS@ @LIBEV_CPPFLAGS@ @OPENSSL_CPPFLAGS@ @V8_CPPFLAGS@ AM_LDFLAGS = @BOOST_LDFLAGS@ @LIBEV_LDFLAGS@ @OPENSSL_LDFLAGS@ @V8_LDFLAGS@ BUILT_SOURCES = -LIBS = @BOOST_LIBS@ @LIBEV_LIBS@ @OPENSSL_LIBS@ @V8_LIBS@ -lreadline +LIBS = @BOOST_LIBS@ @LIBEV_LIBS@ @OPENSSL_LIBS@ @V8_LIBS@ -lreadline -ldl BUILD_H = $(top_srcdir)/build.h ################################################################################ From c2375cda3c68ca8af181be6bd09003f5c2a00204 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Tue, 6 Dec 2011 13:08:22 +0100 Subject: [PATCH 2/2] added actions to admin --- RestServer/AvocadoServer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RestServer/AvocadoServer.cpp b/RestServer/AvocadoServer.cpp index 8934ef7b321b..874e9cecc374 100644 --- a/RestServer/AvocadoServer.cpp +++ b/RestServer/AvocadoServer.cpp @@ -427,7 +427,10 @@ int AvocadoServer::startupServer () { _applicationAdminServer->addBasicHandlers(adminFactory); _applicationAdminServer->addHandlers(adminFactory, "/admin"); - _adminHttpServer = _applicationHttpServer->buildServer(adminFactory, adminPorts); + adminFactory->addPrefixHandler(RestVocbaseBaseHandler::DOCUMENT_PATH, RestHandlerCreator::createData, _vocbase); + adminFactory->addPrefixHandler(RestVocbaseBaseHandler::ACTION_PATH, RestHandlerCreator::createData, _vocbase); + + _adminHttpServer = _applicationHttpServer->buildServer(new AvocadoHttpServer(scheduler, dispatcher), adminFactory, adminPorts); } // .............................................................................