Factored out http server related code into zenhttp module since it feels out of place in zencore

15 files changed, 22 insertions, 13 deletions

diff --git a/zenserver/admin/admin.h b/zenserver/admin/admin.h
index 3bb8a9158..f90ad4537 100644
--- a/zenserver/admin/admin.h
+++ b/zenserver/admin/admin.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 
 class HttpAdminService : public zen::HttpService
 {
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 0e235a9be..46f7cf86a 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -4,7 +4,7 @@
 #include <zencore/compactbinaryvalidation.h>
 #include <zencore/compress.h>
 #include <zencore/fmtutils.h>
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 #include <zencore/timer.h>
 
 #include "structuredcache.h"
diff --git a/zenserver/cache/structuredcache.h b/zenserver/cache/structuredcache.h
index b90301d84..d4bb94c52 100644
--- a/zenserver/cache/structuredcache.h
+++ b/zenserver/cache/structuredcache.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 
 #include <spdlog/spdlog.h>
 #include <memory>
diff --git a/zenserver/casstore.h b/zenserver/casstore.h
index 7166f796e..4ca6908b5 100644
--- a/zenserver/casstore.h
+++ b/zenserver/casstore.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 #include <zenstore/cas.h>
 
 namespace zen {
diff --git a/zenserver/compute/apply.h b/zenserver/compute/apply.h
index 20a58507b..d377e4735 100644
--- a/zenserver/compute/apply.h
+++ b/zenserver/compute/apply.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <zencore/compactbinary.h>
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 #include <zencore/iohash.h>
 #include <zencore/logging.h>
 
diff --git a/zenserver/diag/diagsvcs.h b/zenserver/diag/diagsvcs.h
index 84f8d22ee..6d2b3a19d 100644
--- a/zenserver/diag/diagsvcs.h
+++ b/zenserver/diag/diagsvcs.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 #include <zencore/iobuffer.h>
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h
index 33bacfdaa..3a8e5f8f8 100644
--- a/zenserver/projectstore.h
+++ b/zenserver/projectstore.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 #include <zencore/uid.h>
 #include <zencore/xxhash.h>
 #include <zenstore/cas.h>
diff --git a/zenserver/sos/sos.h b/zenserver/sos/sos.h
index 283735cbd..da9064262 100644
--- a/zenserver/sos/sos.h
+++ b/zenserver/sos/sos.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 
 #include <spdlog/spdlog.h>
 
diff --git a/zenserver/testing/httptest.h b/zenserver/testing/httptest.h
index 236d17ce7..696543616 100644
--- a/zenserver/testing/httptest.h
+++ b/zenserver/testing/httptest.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 
 #include <spdlog/spdlog.h>
 
diff --git a/zenserver/testing/launch.h b/zenserver/testing/launch.h
index 00f322624..a6eb137d2 100644
--- a/zenserver/testing/launch.h
+++ b/zenserver/testing/launch.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 
 #include <spdlog/spdlog.h>
 #include <filesystem>
diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h
index efe9d07ba..7595fe786 100644
--- a/zenserver/upstream/jupiter.h
+++ b/zenserver/upstream/jupiter.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 #include <zencore/refcount.h>
 #include <zencore/thread.h>
 
diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua
index cbe021f90..293743c94 100644
--- a/zenserver/xmake.lua
+++ b/zenserver/xmake.lua
@@ -1,7 +1,7 @@
 target("zenserver")
     set_kind("binary")
     add_files("**.cpp")
-    add_deps("zencore", "zenstore", "zenutil")
+    add_deps("zencore", "zenhttp", "zenstore", "zenutil")
     add_includedirs(".")
     set_symbols("debug")
 
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 1c9f1fab9..e52f6aa60 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -2,7 +2,7 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 #include <zencore/iobuffer.h>
 #include <zencore/refcount.h>
 #include <zencore/scopeguard.h>
diff --git a/zenserver/zenserver.vcxproj b/zenserver/zenserver.vcxproj
index 3c907e2fb..aa9d538a5 100644
--- a/zenserver/zenserver.vcxproj
+++ b/zenserver/zenserver.vcxproj
@@ -148,6 +148,9 @@
     <ProjectReference Include="..\zencore\zencore.vcxproj">
       <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\zenhttp\zenhttp.vcxproj">
+      <Project>{8eeb3be5-7001-46bf-aafd-edb7558ac012}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\zenstore\zenstore.vcxproj">
       <Project>{26cbbaeb-14c1-4efc-877d-80f48215651c}</Project>
     </ProjectReference>
@@ -155,6 +158,9 @@
       <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="xmake.lua" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/zenserver/zenserver.vcxproj.filters b/zenserver/zenserver.vcxproj.filters
index 3a17cbb07..a86a6d96d 100644
--- a/zenserver/zenserver.vcxproj.filters
+++ b/zenserver/zenserver.vcxproj.filters
@@ -91,4 +91,7 @@
       <UniqueIdentifier>{303c28c2-3607-4ef4-89bd-e3618fe37e74}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="xmake.lua" />
+  </ItemGroup>
 </Project>
\ No newline at end of file