modified: src/CMakeLists.txt

modified:   src/api/CMakeLists.txt
	modified:   src/core/CMakeLists.txt
	modified:   src/dhcp/CMakeLists.txt
	renamed:    src/core/dns/CMakeLists.txt -> src/dns/CMakeLists.txt
	renamed:    src/core/dns/ResourceRecord.cpp -> src/dns/ResourceRecord.cpp
	renamed:    src/core/dns/Zone.cpp -> src/dns/Zone.cpp
	renamed:    src/core/dns/include/DNS.hpp -> src/dns/include/DNS.hpp
	renamed:    src/core/include/Resource.hpp -> src/dns/include/Resource.hpp
	renamed:    src/core/dns/include/ResourceRecord.hpp -> src/dns/include/ResourceRecord.hpp
	renamed:    src/core/dns/include/Zone.hpp -> src/dns/include/Zone.hpp
	modified:   src/resolver/include/Message.hpp
	renamed:    src/core/storage/CMakeLists.txt -> src/storage/CMakeLists.txt
	renamed:    src/core/storage/Storage.cpp -> src/storage/Storage.cpp
	renamed:    src/core/storage/include/Storage.hpp -> src/storage/include/Storage.hpp
	renamed:    src/core/tests/.keep -> tests/.keep
	renamed:    src/core/tests/CMakeLists.txt -> tests/CMakeLists.txt
	renamed:    src/core/tests/main.cpp -> tests/main.cpp
1. Moved dns and storage modules out of Core.
2. Fixed the MakeFiles for api and dhcp modules which were reversed.

src/CMakeLists.txt

@@ -4,5 +4,7 @@ add_subdirectory(dhcp)
 add_subdirectory(api)
 add_subdirectory(cluster)
 add_subdirectory(ui)
+add_subdirectory(dns)
+add_subdirectory(storage)
 
 

src/api/CMakeLists.txt

@@ -1,5 +1,5 @@
-add_library(DHCP OBJECT Server.cpp)
+add_library(API OBJECT Server.cpp)
 
-target_include_directories(DHCP PUBLIC include)
+target_include_directories(API PUBLIC include)
 
-target_link_libraries(DHCP PRIVATE Core)
+target_link_libraries(API PRIVATE Core)

src/core/CMakeLists.txt

@@ -3,9 +3,9 @@ add_library(Core OBJECT EventBus.cpp ConfigManager.cpp Logger.cpp Exception.cpp)
 
 target_include_directories(Core PUBLIC include)
 
-add_subdirectory(dns)
-add_subdirectory(storage)
-add_subdirectory(tests)
+#add_subdirectory(dns)
+#add_subdirectory(storage)
+#add_subdirectory(tests)
 
 # Build Executable:
 add_executable(Plains main.cpp)

src/dhcp/CMakeLists.txt

@@ -1,5 +1,5 @@
-add_library(API OBJECT Server.cpp)
+add_library(DHCP OBJECT Server.cpp)
 
-target_include_directories(API PUBLIC include)
+target_include_directories(DHCP PUBLIC include)
 
-target_link_libraries(API PRIVATE Core)
+target_link_libraries(DHCP PRIVATE Core)

src/dns/CMakeLists.txt

@@ -2,5 +2,6 @@
 add_library(DNS OBJECT ResourceRecord.cpp)
 
 target_include_directories(DNS PUBLIC include)
+#target_include_directories(Core PRIVATE include)
 
 target_link_libraries(DNS PRIVATE Core)

src/dns/ResourceRecord.cpp

@@ -2,7 +2,6 @@
 
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 
@@ -69,4 +68,4 @@ HTTPSRecord::HTTPSRecord() : ResourceRecord(65) {}
 
 
 
-}}}
+}}

src/dns/Zone.cpp

@@ -1,7 +1,6 @@
 #include "Zone.hpp"
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 
@@ -9,4 +8,4 @@ string Zone::serialize() {
     return "Nothing implemented";
 }
 
-}}}
+}}

src/dns/include/Resource.hpp

@@ -3,7 +3,9 @@
 
 #include "Serializable.hpp"
 namespace Plains {
-namespace Core {
+namespace DNS {
+
+using Core::Serializable;
 
 // Provides an abstract class for resources that may be stored in the ledger
 class Resource : public Serializable {};

src/dns/include/ResourceRecord.hpp

@@ -7,7 +7,6 @@
 #include <memory>
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 using std::ostream;
@@ -77,5 +76,5 @@ class SVCBRecord : public ResourceRecord { SVCBRecord(); };
 class HTTPSRecord : public ResourceRecord { HTTPSRecord(); };
 
 
-}}}
+}}
 #endif

src/dns/include/Zone.hpp

@@ -5,7 +5,6 @@
 #include "Resource.hpp"
 
 namespace Plains {
-namespace Core {
 namespace DNS {
 
 using std::string;
@@ -17,5 +16,5 @@ class Zone : public Resource
     string serialize();
 };
 
-}}}
+}}
 #endif

src/resolver/include/Message.hpp

@@ -10,7 +10,7 @@ namespace Resolver {
 
 using std::size_t;
 using std::unique_ptr;
-using Core::DNS::ResourceRecord;
+using DNS::ResourceRecord;
 
 class Message
 {