diff options
| -rw-r--r-- | src/Common/Logger.cpp | 3 | ||||
| -rw-r--r-- | src/Common/Logger.h | 4 | ||||
| -rw-r--r-- | src/Common/Makefile.am | 7 | ||||
| -rw-r--r-- | src/Common/Makefile.in | 30 |
4 files changed, 29 insertions, 15 deletions
diff --git a/src/Common/Logger.cpp b/src/Common/Logger.cpp index 6a86d23..66fffd6 100644 --- a/src/Common/Logger.cpp +++ b/src/Common/Logger.cpp @@ -11,7 +11,7 @@ namespace Mad { namespace Common { -void Logger::printMessage(int typeOfMessage, std::string message) { +void Logger::printMessage(MessageType typeOfMessage, std::string message) { switch(typeOfMessage) { case CRITICAL: std::cout << "CRITICAL: " << message << std::endl; @@ -36,6 +36,7 @@ void Logger::printMessage(int typeOfMessage, std::string message) { Logger::Logger(int type) { this->loggingType = type; } + Logger::~Logger() { // TODO Auto-generated destructor stub } diff --git a/src/Common/Logger.h b/src/Common/Logger.h index cbfe4dd..928e65c 100644 --- a/src/Common/Logger.h +++ b/src/Common/Logger.h @@ -18,10 +18,10 @@ class Logger { private: int loggingType; public: - enum messageType { + enum MessageType { CRITICAL, ERROR, WARNING, DEFAULT, VERBOSE, DEBUG }; - void printMessage(messageType typeOfMessage, std::string message); + void printMessage(MessageType typeOfMessage, std::string message); Logger(int type); virtual ~Logger(); }; diff --git a/src/Common/Makefile.am b/src/Common/Makefile.am index f04f3db..88126c4 100644 --- a/src/Common/Makefile.am +++ b/src/Common/Makefile.am @@ -1,6 +1,7 @@ -SUBDIRS = Request +SUBDIRS = Backends Requests RequestHandlers noinst_LTLIBRARIES = libcommon.la -libcommon_la_SOURCES = ConfigManager.cpp RequestManager.cpp +libcommon_la_SOURCES = ConfigManager.cpp Exception.cpp Logger.cpp RequestManager.cpp SystemBackend.cpp Util.cpp +libcommon_la_LIBADD = Backends/libbackends.la Requests/librequests.la RequestHandlers/librequesthandlers.la -noinst_HEADERS = ConfigManager.h RequestHandler.h RequestManager.h Util.h +noinst_HEADERS = ConfigManager.h Exception.h Logger.h Request.h RequestBase.h RequestHandler.h RequestManager.h SystemBackend.h Util.h diff --git a/src/Common/Makefile.in b/src/Common/Makefile.in index 75088dc..9f655ee 100644 --- a/src/Common/Makefile.in +++ b/src/Common/Makefile.in @@ -44,8 +44,10 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libcommon_la_LIBADD = -am_libcommon_la_OBJECTS = ConfigManager.lo RequestManager.lo +libcommon_la_DEPENDENCIES = Backends/libbackends.la \ + Requests/librequests.la RequestHandlers/librequesthandlers.la +am_libcommon_la_OBJECTS = ConfigManager.lo Exception.lo Logger.lo \ + RequestManager.lo SystemBackend.lo Util.lo libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -95,15 +97,15 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ +GSSAPI_LIBS = @GSSAPI_LIBS@ GnuTLS_CFLAGS = @GnuTLS_CFLAGS@ GnuTLS_LIBS = @GnuTLS_LIBS@ INSTALL = @INSTALL@ @@ -111,6 +113,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -120,6 +123,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -129,8 +133,11 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PCRECPP_CFLAGS = @PCRECPP_CFLAGS@ +PCRECPP_LIBS = @PCRECPP_LIBS@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -142,7 +149,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -173,6 +180,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -189,10 +197,11 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = Request +SUBDIRS = Backends Requests RequestHandlers noinst_LTLIBRARIES = libcommon.la -libcommon_la_SOURCES = ConfigManager.cpp RequestManager.cpp Logger.cpp -noinst_HEADERS = ConfigManager.h RequestHandler.h RequestManager.h Util.h Logger.h +libcommon_la_SOURCES = ConfigManager.cpp Exception.cpp Logger.cpp RequestManager.cpp SystemBackend.cpp Util.cpp +libcommon_la_LIBADD = Backends/libbackends.la Requests/librequests.la RequestHandlers/librequesthandlers.la +noinst_HEADERS = ConfigManager.h Exception.h Logger.h Request.h RequestBase.h RequestHandler.h RequestManager.h SystemBackend.h Util.h all: all-recursive .SUFFIXES: @@ -245,8 +254,11 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigManager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Logger.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestManager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SystemBackend.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |