Bug 1167: Cleaned up MAC layers. There are less dependancies between the packages now.

MAC/APL/CURTDBDaemons/configure.in

@@ -57,11 +57,10 @@ lofar_COMPILETOOLS
 lofar_PVSS(1)
 lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol",)
 lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
 lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
 lofar_INTERNAL(MAC/GCF/RTDB, rtdb, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
-lofar_INTERNAL(MAC/APL/APLProtocol, , , 1, APL/APLProtocol/LOG_Protocol.ph,,)
 
 dnl
 dnl Output Makefiles

MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc

@@ -23,16 +23,17 @@
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
 #include <APS/ParameterSet.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/GCF_Event.h>
+#include <MACIO/MACServiceInfo.h>
+#include <MACIO/KVT_Protocol.ph>
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <GCF/PVSS/PVSSresult.h>
 #include <GCF/RTDB/DP_Protocol.ph>
-#include <APL/APLProtocol/KVT_Protocol.ph>
 #include "KeyValueLogger.h"
 
 namespace LOFAR {
+  using namespace MACIO;
   namespace GCF {
-    using namespace Common;
     using namespace TM;
     using namespace PVSS;
     using namespace RTDB;

MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h

@@ -31,6 +31,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/lofar_map.h>
 #include <Common/lofar_list.h>
+#include <MACIO/GCF_Event.h>
 #include <GCF/TM/GCF_Control.h>
 #include <GCF/RTDB/DPservice.h>
 #include <log4cplus/helpers/socketbuffer.h>
@@ -38,6 +39,7 @@
 // Avoid 'using namespace' in headerfiles
 
 namespace LOFAR {
+  using namespace MACIO;
   namespace GCF {  
     namespace RTDBDaemons {
 
@@ -59,8 +61,8 @@ private:
 	};
 
 	// state methods
-	TM::GCFEvent::TResult initial     (TM::GCFEvent& e, TM::GCFPortInterface& p);
-	TM::GCFEvent::TResult operational (TM::GCFEvent& e, TM::GCFPortInterface& p);
+	GCFEvent::TResult initial     (GCFEvent& e, TM::GCFPortInterface& p);
+	GCFEvent::TResult operational (GCFEvent& e, TM::GCFPortInterface& p);
 
 	// helper methods
 	void	_registerClient(GCFPortInterface&	port,

MAC/APL/CURTDBDaemons/src/LoggingProcessor/LoggingProcessor.cc

@@ -23,9 +23,10 @@
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
 #include <GCF/PVSS/GCF_PVTypes.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/GCF_Event.h>
+#include <MACIO/MACServiceInfo.h>
+#include <MACIO/LOG_Protocol.ph>
 #include <GCF/PVSS/PVSSresult.h>
-#include <APL/APLProtocol/LOG_Protocol.ph>
 #include <GCF/RTDB/DP_Protocol.ph>
 #include <log4cplus/socketappender.h>
 #include "LoggingProcessor.h"
@@ -33,8 +34,8 @@
 using namespace log4cplus;
 using namespace log4cplus::helpers;
 namespace LOFAR {
+  using namespace MACIO;
   namespace GCF {
-    using namespace Common;
     using namespace TM;
     using namespace PVSS;
     using namespace RTDB;

MAC/APL/CURTDBDaemons/src/LoggingProcessor/LoggingProcessor.h

@@ -31,6 +31,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/lofar_map.h>
 #include <Common/lofar_list.h>
+#include <MACIO/GCF_Event.h>
 #include <GCF/TM/GCF_Control.h>
 #include <GCF/RTDB/DPservice.h>
 #include <log4cplus/helpers/socketbuffer.h>
@@ -38,6 +39,7 @@
 // Avoid 'using namespace' in headerfiles
 
 namespace LOFAR {
+  using namespace MACIO;
   namespace GCF {  
     namespace RTDBDaemons {
 
@@ -49,8 +51,8 @@ public:
 
 private: 
 	// state methods
-	TM::GCFEvent::TResult initial     (TM::GCFEvent& e, TM::GCFPortInterface& p);
-	TM::GCFEvent::TResult operational (TM::GCFEvent& e, TM::GCFPortInterface& p);
+	GCFEvent::TResult initial     (GCFEvent& e, TM::GCFPortInterface& p);
+	GCFEvent::TResult operational (GCFEvent& e, TM::GCFPortInterface& p);
 
 	// helper methods
 	bool _readFromPortData(TM::GCFPortInterface& 				port, 

MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc

@@ -26,9 +26,9 @@
 //# Includes
 #include <Common/LofarLogger.h>
 #include <Common/lofar_string.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
+#include <MACIO/KVT_Protocol.ph>
 #include <GCF/TM/EventPort.h>
-#include <APL/APLProtocol/KVT_Protocol.ph>
 
 using namespace LOFAR;
 using namespace LOFAR::GCF::TM;