summaryrefslogtreecommitdiffstats
path: root/src/Core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Core')
-rw-r--r--src/Core/ConnectionManager.cpp8
-rw-r--r--src/Core/Makefile.am4
-rw-r--r--src/Core/Makefile.in6
-rw-r--r--src/Core/RequestHandler/Makefile.am4
-rw-r--r--src/Core/RequestHandlers/CoreStatusRequestHandler.cpp (renamed from src/Core/RequestHandler/CoreStatusRequestHandler.cpp)2
-rw-r--r--src/Core/RequestHandlers/CoreStatusRequestHandler.h (renamed from src/Core/RequestHandler/CoreStatusRequestHandler.h)6
-rw-r--r--src/Core/RequestHandlers/GSSAPIAuthRequestHandler.cpp (renamed from src/Core/RequestHandler/GSSAPIAuthRequestHandler.cpp)2
-rw-r--r--src/Core/RequestHandlers/GSSAPIAuthRequestHandler.h (renamed from src/Core/RequestHandler/GSSAPIAuthRequestHandler.h)6
-rw-r--r--src/Core/RequestHandlers/Makefile.am4
-rw-r--r--src/Core/RequestHandlers/Makefile.in (renamed from src/Core/RequestHandler/Makefile.in)24
10 files changed, 33 insertions, 33 deletions
diff --git a/src/Core/ConnectionManager.cpp b/src/Core/ConnectionManager.cpp
index 39c6705..98288ba 100644
--- a/src/Core/ConnectionManager.cpp
+++ b/src/Core/ConnectionManager.cpp
@@ -19,8 +19,8 @@
#include "ConnectionManager.h"
#include "ConfigManager.h"
-#include "RequestHandler/CoreStatusRequestHandler.h"
-#include "RequestHandler/GSSAPIAuthRequestHandler.h"
+#include "RequestHandlers/CoreStatusRequestHandler.h"
+#include "RequestHandlers/GSSAPIAuthRequestHandler.h"
#include <Net/ServerConnection.h>
#include <Net/Packet.h>
#include <Net/Listener.h>
@@ -54,8 +54,8 @@ void ConnectionManager::refreshPollfds() {
}
ConnectionManager::ConnectionManager(const ConfigManager& configManager) : requestManager(true) {
- requestManager.registerPacketType<RequestHandler::CoreStatusRequestHandler>(Net::Packet::CORE_STATUS);
- requestManager.registerPacketType<RequestHandler::GSSAPIAuthRequestHandler>(Net::Packet::GSSAPI_AUTH);
+ requestManager.registerPacketType<RequestHandlers::CoreStatusRequestHandler>(Net::Packet::CORE_STATUS);
+ requestManager.registerPacketType<RequestHandlers::GSSAPIAuthRequestHandler>(Net::Packet::GSSAPI_AUTH);
const std::vector<Net::IPAddress> &listenerAddresses = configManager.getListenerAddresses();
diff --git a/src/Core/Makefile.am b/src/Core/Makefile.am
index 3051814..fcbcd60 100644
--- a/src/Core/Makefile.am
+++ b/src/Core/Makefile.am
@@ -1,8 +1,8 @@
-SUBDIRS = RequestHandler
+SUBDIRS = RequestHandlers
noinst_LTLIBRARIES = libcore.la
libcore_la_SOURCES = ConfigManager.cpp ConnectionManager.cpp
-libcore_la_LIBADD = RequestHandler/librequesthandler.la
+libcore_la_LIBADD = RequestHandlers/librequesthandlers.la
noinst_HEADERS = ConfigManager.h ConnectionManager.h
diff --git a/src/Core/Makefile.in b/src/Core/Makefile.in
index e274531..9531b06 100644
--- a/src/Core/Makefile.in
+++ b/src/Core/Makefile.in
@@ -44,7 +44,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libcore_la_DEPENDENCIES = RequestHandler/librequesthandler.la
+libcore_la_DEPENDENCIES = RequestHandlers/librequesthandlers.la
am_libcore_la_OBJECTS = ConfigManager.lo ConnectionManager.lo
libcore_la_OBJECTS = $(am_libcore_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
@@ -191,10 +191,10 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = RequestHandler
+SUBDIRS = RequestHandlers
noinst_LTLIBRARIES = libcore.la
libcore_la_SOURCES = ConfigManager.cpp ConnectionManager.cpp
-libcore_la_LIBADD = RequestHandler/librequesthandler.la
+libcore_la_LIBADD = RequestHandlers/librequesthandlers.la
noinst_HEADERS = ConfigManager.h ConnectionManager.h
all: all-recursive
diff --git a/src/Core/RequestHandler/Makefile.am b/src/Core/RequestHandler/Makefile.am
deleted file mode 100644
index 3754a22..0000000
--- a/src/Core/RequestHandler/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-noinst_LTLIBRARIES = librequesthandler.la
-librequesthandler_la_SOURCES = CoreStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp
-
-noinst_HEADERS = CoreStatusRequestHandler.h GSSAPIAuthRequestHandler.h
diff --git a/src/Core/RequestHandler/CoreStatusRequestHandler.cpp b/src/Core/RequestHandlers/CoreStatusRequestHandler.cpp
index 9d923f5..352de86 100644
--- a/src/Core/RequestHandler/CoreStatusRequestHandler.cpp
+++ b/src/Core/RequestHandlers/CoreStatusRequestHandler.cpp
@@ -24,7 +24,7 @@
namespace Mad {
namespace Core {
-namespace RequestHandler {
+namespace RequestHandlers {
bool CoreStatusRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) {
if(isFinished())
diff --git a/src/Core/RequestHandler/CoreStatusRequestHandler.h b/src/Core/RequestHandlers/CoreStatusRequestHandler.h
index dc822cb..c6c0da3 100644
--- a/src/Core/RequestHandler/CoreStatusRequestHandler.h
+++ b/src/Core/RequestHandlers/CoreStatusRequestHandler.h
@@ -20,13 +20,13 @@
#ifndef MAD_CORE_REQUESTHANDLER_CORESTATUSREQUESTHANDLER_H_
#define MAD_CORE_REQUESTHANDLER_CORESTATUSREQUESTHANDLER_H_
-#include <Common/RequestHandler/RequestHandler.h>
+#include <Common/RequestHandler.h>
namespace Mad {
namespace Core {
-namespace RequestHandler {
+namespace RequestHandlers {
-class CoreStatusRequestHandler : public Common::RequestHandler::RequestHandler {
+class CoreStatusRequestHandler : public Common::RequestHandler {
public:
CoreStatusRequestHandler() {}
diff --git a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.cpp b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.cpp
index 08c4751..c1b7e7c 100644
--- a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.cpp
+++ b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.cpp
@@ -26,7 +26,7 @@
namespace Mad {
namespace Core {
-namespace RequestHandler {
+namespace RequestHandlers {
// TODO Error handling
diff --git a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.h
index 590919f..a88969b 100644
--- a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h
+++ b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.h
@@ -20,14 +20,14 @@
#ifndef MAD_CORE_REQUESTHANDLER_GSSAPIAUTHREQUESTHANDLER_H_
#define MAD_CORE_REQUESTHANDLER_GSSAPIAUTHREQUESTHANDLER_H_
-#include <Common/RequestHandler/RequestHandler.h>
+#include <Common/RequestHandler.h>
#include <gssapi/gssapi.h>
namespace Mad {
namespace Core {
-namespace RequestHandler {
+namespace RequestHandlers {
-class GSSAPIAuthRequestHandler : public Common::RequestHandler::RequestHandler {
+class GSSAPIAuthRequestHandler : public Common::RequestHandler {
private:
gss_ctx_id_t gssContext;
diff --git a/src/Core/RequestHandlers/Makefile.am b/src/Core/RequestHandlers/Makefile.am
new file mode 100644
index 0000000..d556af6
--- /dev/null
+++ b/src/Core/RequestHandlers/Makefile.am
@@ -0,0 +1,4 @@
+noinst_LTLIBRARIES = librequesthandlers.la
+librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp
+
+noinst_HEADERS = CoreStatusRequestHandler.h GSSAPIAuthRequestHandler.h
diff --git a/src/Core/RequestHandler/Makefile.in b/src/Core/RequestHandlers/Makefile.in
index 8b20b23..c6a8848 100644
--- a/src/Core/RequestHandler/Makefile.in
+++ b/src/Core/RequestHandlers/Makefile.in
@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = src/Core/RequestHandler
+subdir = src/Core/RequestHandlers
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -44,10 +44,10 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-librequesthandler_la_LIBADD =
-am_librequesthandler_la_OBJECTS = CoreStatusRequestHandler.lo \
+librequesthandlers_la_LIBADD =
+am_librequesthandlers_la_OBJECTS = CoreStatusRequestHandler.lo \
GSSAPIAuthRequestHandler.lo
-librequesthandler_la_OBJECTS = $(am_librequesthandler_la_OBJECTS)
+librequesthandlers_la_OBJECTS = $(am_librequesthandlers_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -60,8 +60,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(librequesthandler_la_SOURCES)
-DIST_SOURCES = $(librequesthandler_la_SOURCES)
+SOURCES = $(librequesthandlers_la_SOURCES)
+DIST_SOURCES = $(librequesthandlers_la_SOURCES)
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -182,8 +182,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = librequesthandler.la
-librequesthandler_la_SOURCES = CoreStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp
+noinst_LTLIBRARIES = librequesthandlers.la
+librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp
noinst_HEADERS = CoreStatusRequestHandler.h GSSAPIAuthRequestHandler.h
all: all-am
@@ -198,9 +198,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Core/RequestHandler/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Core/RequestHandlers/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Core/RequestHandler/Makefile
+ $(AUTOMAKE) --gnu src/Core/RequestHandlers/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -227,8 +227,8 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-librequesthandler.la: $(librequesthandler_la_OBJECTS) $(librequesthandler_la_DEPENDENCIES)
- $(CXXLINK) $(librequesthandler_la_OBJECTS) $(librequesthandler_la_LIBADD) $(LIBS)
+librequesthandlers.la: $(librequesthandlers_la_OBJECTS) $(librequesthandlers_la_DEPENDENCIES)
+ $(CXXLINK) $(librequesthandlers_la_OBJECTS) $(librequesthandlers_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)