Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moved files from HttpsServer to HttpServer directory

This commit is contained in:
Jan Steemann 2012-07-30 08:32:53 +02:00
parent 9d87988bf5
commit 404a80bc84
7 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Makefile.in
View File

@ -527,8 +527,8 @@ am_lib_libarango_fe_a_OBJECTS = \
lib/HttpServer/PathHandler.$(OBJEXT) \
lib/HttpServer/RedirectHandler.$(OBJEXT) \
lib/HttpServer/ServiceUnavailableHandler.$(OBJEXT) \
lib/HttpsServer/HttpsAsyncCommTask.$(OBJEXT) \
lib/HttpsServer/HttpsServer.$(OBJEXT) \
lib/HttpServer/HttpsAsyncCommTask.$(OBJEXT) \
lib/HttpServer/HttpsServer.$(OBJEXT) \
lib/ResultGenerator/HtmlResultGenerator.$(OBJEXT) \
lib/ResultGenerator/Initialise.$(OBJEXT) \
lib/ResultGenerator/JsonResultGenerator.$(OBJEXT) \
@ -1383,8 +1383,8 @@ lib_libarango_fe_a_SOURCES = \
lib/HttpServer/PathHandler.cpp \
lib/HttpServer/RedirectHandler.cpp \
lib/HttpServer/ServiceUnavailableHandler.cpp \
lib/HttpsServer/HttpsAsyncCommTask.cpp \
lib/HttpsServer/HttpsServer.cpp \
lib/HttpServer/HttpsAsyncCommTask.cpp \
lib/HttpServer/HttpsServer.cpp \
lib/ResultGenerator/HtmlResultGenerator.cpp \
lib/ResultGenerator/Initialise.cpp \
lib/ResultGenerator/JsonResultGenerator.cpp \
@ -2174,18 +2174,11 @@ lib/HttpServer/RedirectHandler.$(OBJEXT): \
lib/HttpServer/ServiceUnavailableHandler.$(OBJEXT): \
lib/HttpServer/$(am__dirstamp) \
lib/HttpServer/$(DEPDIR)/$(am__dirstamp)
lib/HttpsServer/$(am__dirstamp):
@$(MKDIR_P) lib/HttpsServer
@: > lib/HttpsServer/$(am__dirstamp)
lib/HttpsServer/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) lib/HttpsServer/$(DEPDIR)
@: > lib/HttpsServer/$(DEPDIR)/$(am__dirstamp)
lib/HttpsServer/HttpsAsyncCommTask.$(OBJEXT): \
lib/HttpsServer/$(am__dirstamp) \
lib/HttpsServer/$(DEPDIR)/$(am__dirstamp)
lib/HttpsServer/HttpsServer.$(OBJEXT): \
lib/HttpsServer/$(am__dirstamp) \
lib/HttpsServer/$(DEPDIR)/$(am__dirstamp)
lib/HttpServer/HttpsAsyncCommTask.$(OBJEXT): \
lib/HttpServer/$(am__dirstamp) \
lib/HttpServer/$(DEPDIR)/$(am__dirstamp)
lib/HttpServer/HttpsServer.$(OBJEXT): lib/HttpServer/$(am__dirstamp) \
lib/HttpServer/$(DEPDIR)/$(am__dirstamp)
lib/ResultGenerator/$(am__dirstamp):
@$(MKDIR_P) lib/ResultGenerator
@: > lib/ResultGenerator/$(am__dirstamp)
@ -3003,11 +2996,11 @@ mostlyclean-compile:
-rm -f lib/HttpServer/HttpHandler.$(OBJEXT)
-rm -f lib/HttpServer/HttpHandlerFactory.$(OBJEXT)
-rm -f lib/HttpServer/HttpServer.$(OBJEXT)
-rm -f lib/HttpServer/HttpsAsyncCommTask.$(OBJEXT)
-rm -f lib/HttpServer/HttpsServer.$(OBJEXT)
-rm -f lib/HttpServer/PathHandler.$(OBJEXT)
-rm -f lib/HttpServer/RedirectHandler.$(OBJEXT)
-rm -f lib/HttpServer/ServiceUnavailableHandler.$(OBJEXT)
-rm -f lib/HttpsServer/HttpsAsyncCommTask.$(OBJEXT)
-rm -f lib/HttpsServer/HttpsServer.$(OBJEXT)
-rm -f lib/JsonParser/json-parser.$(OBJEXT)
-rm -f lib/JsonParserX/InputParser.$(OBJEXT)
-rm -f lib/JsonParserX/JsonParserX.$(OBJEXT)
@ -3272,11 +3265,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/HttpHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/HttpHandlerFactory.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/HttpServer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/HttpsAsyncCommTask.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/HttpsServer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/PathHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/RedirectHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpServer/$(DEPDIR)/ServiceUnavailableHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpsServer/$(DEPDIR)/HttpsAsyncCommTask.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/HttpsServer/$(DEPDIR)/HttpsServer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/JsonParser/$(DEPDIR)/json-parser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/JsonParserX/$(DEPDIR)/InputParser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@lib/JsonParserX/$(DEPDIR)/JsonParserX.Po@am__quote@
@ -5101,8 +5094,6 @@ distclean-generic:
-rm -f lib/Dispatcher/$(am__dirstamp)
-rm -f lib/HttpServer/$(DEPDIR)/$(am__dirstamp)
-rm -f lib/HttpServer/$(am__dirstamp)
-rm -f lib/HttpsServer/$(DEPDIR)/$(am__dirstamp)
-rm -f lib/HttpsServer/$(am__dirstamp)
-rm -f lib/JsonParser/$(DEPDIR)/$(am__dirstamp)
-rm -f lib/JsonParser/$(am__dirstamp)
-rm -f lib/JsonParserX/$(DEPDIR)/$(am__dirstamp)
@ -5151,7 +5142,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-local \
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/HttpsServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR)
-rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
@ -5200,7 +5191,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/HttpsServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR)
-rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

2
lib/HttpServer/ApplicationEndpointServer.cpp
View File

@ -36,7 +36,7 @@
#include "HttpServer/HttpHandlerFactory.h"
#include "HttpServer/HttpHandler.h"
#include "HttpServer/HttpServer.h"
#include "HttpsServer/HttpsServer.h"
#include "HttpServer/HttpsServer.h"
#include "Logger/Logger.h"
#include "Scheduler/ApplicationScheduler.h"

0
lib/HttpsServer/HttpsAsyncCommTask.cpp → lib/HttpServer/HttpsAsyncCommTask.cpp
View File

0
lib/HttpsServer/HttpsAsyncCommTask.h → lib/HttpServer/HttpsAsyncCommTask.h
View File

2
lib/HttpsServer/HttpsServer.cpp → lib/HttpServer/HttpsServer.cpp
View File

@ -35,7 +35,7 @@
#include "Basics/MutexLocker.h"
#include "HttpServer/HttpHandler.h"
#include "HttpsServer/HttpsAsyncCommTask.h"
#include "HttpServer/HttpsAsyncCommTask.h"
#include "Scheduler/Scheduler.h"
using namespace triagens::basics;

0
lib/HttpsServer/HttpsServer.h → lib/HttpServer/HttpsServer.h
View File

4
lib/Makefile.files
View File

@ -154,8 +154,8 @@ lib_libarango_fe_a_SOURCES = \
lib/HttpServer/PathHandler.cpp \
lib/HttpServer/RedirectHandler.cpp \
lib/HttpServer/ServiceUnavailableHandler.cpp \
lib/HttpsServer/HttpsAsyncCommTask.cpp \
lib/HttpsServer/HttpsServer.cpp \
lib/HttpServer/HttpsAsyncCommTask.cpp \
lib/HttpServer/HttpsServer.cpp \
lib/ResultGenerator/HtmlResultGenerator.cpp \
lib/ResultGenerator/Initialise.cpp \
lib/ResultGenerator/JsonResultGenerator.cpp \