XmlRequest{,Handler} in Request{,Handler} umbenannt

14 files changed, 35 insertions, 35 deletions

diff --git a/src/Core/ConnectionManager.cpp b/src/Core/ConnectionManager.cpp
index f70f640..a6d80d0 100644
--- a/src/Core/ConnectionManager.cpp
+++ b/src/Core/ConnectionManager.cpp
@@ -50,7 +50,7 @@ void ConnectionManager::updateState(const std::string &name, Common::HostInfo::S
   daemonInfo[name].setState(state);
 
   for(std::list<Net::ServerConnection*>::iterator con = clientConnections.begin(); con != clientConnections.end(); ++con) {
-    Common::RequestManager::get()->sendRequest(*con, std::auto_ptr<Common::XmlRequest>(
+    Common::RequestManager::get()->sendRequest(*con, std::auto_ptr<Common::Request>(
         new Requests::DaemonStateUpdateRequest(name, state)
     ));
   }
diff --git a/src/Core/RequestHandlers/DaemonCommandRequestHandler.cpp b/src/Core/RequestHandlers/DaemonCommandRequestHandler.cpp
index 97a1bdc..1bfe3e4 100644
--- a/src/Core/RequestHandlers/DaemonCommandRequestHandler.cpp
+++ b/src/Core/RequestHandlers/DaemonCommandRequestHandler.cpp
@@ -49,7 +49,7 @@ void DaemonCommandRequestHandler::handlePacket(Net::Connection *connection, uint
 
   try {
     Net::Connection *daemonCon = ConnectionManager::get()->getDaemonConnection(packet["daemon"]);
-    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::XmlRequest>(
+    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::Request>(
         new Requests::CommandRequest(command == "reboot", sigc::mem_fun(this, &DaemonCommandRequestHandler::requestFinished))
     ));
   }
@@ -65,7 +65,7 @@ void DaemonCommandRequestHandler::handlePacket(Net::Connection *connection, uint
   }
 }
 
-void DaemonCommandRequestHandler::requestFinished(const Common::XmlRequest &request) {
+void DaemonCommandRequestHandler::requestFinished(const Common::Request &request) {
   try {
     const Common::XmlPacket &packet = request.getResult();
 
diff --git a/src/Core/RequestHandlers/DaemonCommandRequestHandler.h b/src/Core/RequestHandlers/DaemonCommandRequestHandler.h
index 9570528..4ab7a3f 100644
--- a/src/Core/RequestHandlers/DaemonCommandRequestHandler.h
+++ b/src/Core/RequestHandlers/DaemonCommandRequestHandler.h
@@ -20,20 +20,20 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_DAEMONCOMMANDREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_DAEMONCOMMANDREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
-#include <Common/XmlRequest.h>
+#include <Common/RequestHandler.h>
+#include <Common/Request.h>
 #include <stdint.h>
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-class DaemonCommandRequestHandler : public Common::XmlRequestHandler {
+class DaemonCommandRequestHandler : public Common::RequestHandler {
   private:
     Net::Connection *con;
     uint16_t requestId;
 
-    void requestFinished(const Common::XmlRequest &request);
+    void requestFinished(const Common::Request &request);
 
   protected:
     virtual void handlePacket(Net::Connection *connection, uint16_t rid, const Common::XmlPacket &packet);
diff --git a/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp b/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp
index c0e4b9f..b9dc030 100644
--- a/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp
+++ b/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp
@@ -48,7 +48,7 @@ void DaemonFSInfoRequestHandler::handlePacket(Net::Connection *connection, uint1
 
   try {
     Net::Connection *daemonCon = ConnectionManager::get()->getDaemonConnection(packet["daemon"]);
-    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::XmlRequest>(new Common::Requests::FSInfoRequest(sigc::mem_fun(this, &DaemonFSInfoRequestHandler::requestFinished))));
+    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::Request>(new Common::Requests::FSInfoRequest(sigc::mem_fun(this, &DaemonFSInfoRequestHandler::requestFinished))));
   }
   catch(Common::Exception &e) {
     Common::XmlPacket ret;
@@ -62,7 +62,7 @@ void DaemonFSInfoRequestHandler::handlePacket(Net::Connection *connection, uint1
   }
 }
 
-void DaemonFSInfoRequestHandler::requestFinished(const Common::XmlRequest &request) {
+void DaemonFSInfoRequestHandler::requestFinished(const Common::Request &request) {
   try {
     const Common::XmlPacket &packet = request.getResult();
     con->send(packet.encode(requestId));
diff --git a/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.h b/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.h
index 68b8760..820ef69 100644
--- a/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.h
+++ b/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.h
@@ -20,8 +20,8 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_DAEMONFSINFOREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_DAEMONFSINFOREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
-#include <Common/XmlRequest.h>
+#include <Common/RequestHandler.h>
+#include <Common/Request.h>
 #include <stdint.h>
 
 namespace Mad {
@@ -35,12 +35,12 @@ class FSInfoPacket;
 namespace Core {
 namespace RequestHandlers {
 
-class DaemonFSInfoRequestHandler : public Common::XmlRequestHandler {
+class DaemonFSInfoRequestHandler : public Common::RequestHandler {
   private:
     Net::Connection *con;
     uint16_t requestId;
 
-    void requestFinished(const Common::XmlRequest &request);
+    void requestFinished(const Common::Request &request);
 
   protected:
     virtual void handlePacket(Net::Connection *connection, uint16_t rid, const Common::XmlPacket &packet);
diff --git a/src/Core/RequestHandlers/DaemonListRequestHandler.h b/src/Core/RequestHandlers/DaemonListRequestHandler.h
index 6fe2517..26c46f8 100644
--- a/src/Core/RequestHandlers/DaemonListRequestHandler.h
+++ b/src/Core/RequestHandlers/DaemonListRequestHandler.h
@@ -20,13 +20,13 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_DAEMONLISTREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_DAEMONLISTREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
+#include <Common/RequestHandler.h>
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-class DaemonListRequestHandler : public Common::XmlRequestHandler {
+class DaemonListRequestHandler : public Common::RequestHandler {
   protected:
     virtual void handlePacket(Net::Connection *connection, uint16_t requestId, const Common::XmlPacket &packet);
 
diff --git a/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp b/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp
index 11c9eb9..35daae4 100644
--- a/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp
+++ b/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp
@@ -50,7 +50,7 @@ void DaemonStatusRequestHandler::handlePacket(Net::Connection *connection, uint1
 
   try {
     Net::Connection *daemonCon = ConnectionManager::get()->getDaemonConnection(daemonName);
-    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::XmlRequest>(new Common::Requests::StatusRequest(sigc::mem_fun(this, &DaemonStatusRequestHandler::requestFinished))));
+    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::Request>(new Common::Requests::StatusRequest(sigc::mem_fun(this, &DaemonStatusRequestHandler::requestFinished))));
   }
   catch(Common::Exception &e) {
     Common::XmlPacket ret;
@@ -64,7 +64,7 @@ void DaemonStatusRequestHandler::handlePacket(Net::Connection *connection, uint1
   }
 }
 
-void DaemonStatusRequestHandler::requestFinished(const Common::XmlRequest &request) {
+void DaemonStatusRequestHandler::requestFinished(const Common::Request &request) {
   try {
     const Common::XmlPacket &packet = request.getResult();
     con->send(packet.encode(rid));
diff --git a/src/Core/RequestHandlers/DaemonStatusRequestHandler.h b/src/Core/RequestHandlers/DaemonStatusRequestHandler.h
index 30b2ae1..92dac2f 100644
--- a/src/Core/RequestHandlers/DaemonStatusRequestHandler.h
+++ b/src/Core/RequestHandlers/DaemonStatusRequestHandler.h
@@ -20,8 +20,8 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_DAEMONSTATUSREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_DAEMONSTATUSREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
-#include <Common/XmlRequest.h>
+#include <Common/RequestHandler.h>
+#include <Common/Request.h>
 #include <stdint.h>
 
 namespace Mad {
@@ -35,12 +35,12 @@ class HostStatusPacket;
 namespace Core {
 namespace RequestHandlers {
 
-class DaemonStatusRequestHandler : public Common::XmlRequestHandler {
+class DaemonStatusRequestHandler : public Common::RequestHandler {
   private:
     Net::Connection *con;
     uint16_t rid;
 
-    void requestFinished(const Common::XmlRequest &request);
+    void requestFinished(const Common::Request &request);
 
   protected:
     virtual void handlePacket(Net::Connection *connection, uint16_t requestId, const Common::XmlPacket &packet);
diff --git a/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.h b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.h
index 7f8ce3b..7f29804 100644
--- a/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.h
+++ b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.h
@@ -20,14 +20,14 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_GSSAPIAUTHREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_GSSAPIAUTHREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
+#include <Common/RequestHandler.h>
 #include <gssapi/gssapi.h>
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-class GSSAPIAuthRequestHandler : public Common::XmlRequestHandler {
+class GSSAPIAuthRequestHandler : public Common::RequestHandler {
   private:
     gss_ctx_id_t gssContext;
 
diff --git a/src/Core/RequestHandlers/IdentifyRequestHandler.h b/src/Core/RequestHandlers/IdentifyRequestHandler.h
index 877ebf2..7bc5d7c 100644
--- a/src/Core/RequestHandlers/IdentifyRequestHandler.h
+++ b/src/Core/RequestHandlers/IdentifyRequestHandler.h
@@ -20,13 +20,13 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_IDENTIFYREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_IDENTIFYREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
+#include <Common/RequestHandler.h>
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-class IdentifyRequestHandler : public Common::XmlRequestHandler {
+class IdentifyRequestHandler : public Common::RequestHandler {
   protected:
     virtual void handlePacket(Net::Connection *connection, uint16_t requestId, const Common::XmlPacket &packet);
 
diff --git a/src/Core/RequestHandlers/LogRequestHandler.h b/src/Core/RequestHandlers/LogRequestHandler.h
index 1c84248..4a0f9cb 100644
--- a/src/Core/RequestHandlers/LogRequestHandler.h
+++ b/src/Core/RequestHandlers/LogRequestHandler.h
@@ -20,13 +20,13 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_LOGREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_LOGREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
+#include <Common/RequestHandler.h>
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-class LogRequestHandler : public Common::XmlRequestHandler {
+class LogRequestHandler : public Common::RequestHandler {
   protected:
     virtual void handlePacket(Net::Connection *connection, uint16_t requestId, const Common::XmlPacket &packet);
 
diff --git a/src/Core/RequestHandlers/UserListRequestHandler.h b/src/Core/RequestHandlers/UserListRequestHandler.h
index 7739809..a9c8ac6 100644
--- a/src/Core/RequestHandlers/UserListRequestHandler.h
+++ b/src/Core/RequestHandlers/UserListRequestHandler.h
@@ -20,7 +20,7 @@
 #ifndef MAD_CORE_REQUESTHANDLERS_USERLISTREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLERS_USERLISTREQUESTHANDLER_H_
 
-#include <Common/XmlRequestHandler.h>
+#include <Common/RequestHandler.h>
 #include <Common/UserInfo.h>
 
 #include <map>
@@ -30,7 +30,7 @@ namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-class UserListRequestHandler : public Common::XmlRequestHandler {
+class UserListRequestHandler : public Common::RequestHandler {
   private:
       Net::Connection *connection;
       uint16_t rid;
diff --git a/src/Core/Requests/CommandRequest.h b/src/Core/Requests/CommandRequest.h
index 534fcef..9c6c70d 100644
--- a/src/Core/Requests/CommandRequest.h
+++ b/src/Core/Requests/CommandRequest.h
@@ -20,13 +20,13 @@
 #ifndef MAD_CORE_REQUESTS_COMMANDREQUEST_H_
 #define MAD_CORE_REQUESTS_COMMANDREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 
 namespace Mad {
 namespace Core {
 namespace Requests {
 
-class CommandRequest : public Common::XmlRequest {
+class CommandRequest : public Common::Request {
   private:
     bool reboot;
 
@@ -35,7 +35,7 @@ class CommandRequest : public Common::XmlRequest {
     virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
   public:
-    CommandRequest(bool reboot0, slot_type slot) : Common::XmlRequest(slot), reboot(reboot0) {}
+    CommandRequest(bool reboot0, slot_type slot) : Common::Request(slot), reboot(reboot0) {}
 };
 
 }
diff --git a/src/Core/Requests/DaemonStateUpdateRequest.h b/src/Core/Requests/DaemonStateUpdateRequest.h
index 84c23e8..f1466b2 100644
--- a/src/Core/Requests/DaemonStateUpdateRequest.h
+++ b/src/Core/Requests/DaemonStateUpdateRequest.h
@@ -20,14 +20,14 @@
 #ifndef MAD_CORE_REQUESTS_DAEMONSTATEUPDATEREQUEST_H_
 #define MAD_CORE_REQUESTS_DAEMONSTATEUPDATEREQUEST_H_
 
-#include <Common/XmlRequest.h>
+#include <Common/Request.h>
 #include <Common/HostInfo.h>
 
 namespace Mad {
 namespace Core {
 namespace Requests {
 
-class DaemonStateUpdateRequest : public Common::XmlRequest {
+class DaemonStateUpdateRequest : public Common::Request {
   private:
     std::string name;
     Common::HostInfo::State state;
@@ -37,7 +37,7 @@ class DaemonStateUpdateRequest : public Common::XmlRequest {
     virtual void handlePacket(Net::Connection*, uint16_t, const Common::XmlPacket &packet);
 
   public:
-    DaemonStateUpdateRequest(const std::string &name0, Common::HostInfo::State state0) : Common::XmlRequest(slot_type()), name(name0), state(state0) {}
+    DaemonStateUpdateRequest(const std::string &name0, Common::HostInfo::State state0) : Common::Request(slot_type()), name(name0), state(state0) {}
 };
 
 }